接入feat(cross-checking): 整合组织架构数据并优化意见列表功能

- 更新 API 配置,使用新的后端服务地址- 移除前端模拟数据,改为从后端获取真实数据- 优化意见列表接口,支持分页和用户身份验证
- 调整前端界面,适应新的数据结构和功能需求
This commit is contained in:
2025-07-20 21:29:42 +08:00
parent e4ce41cebe
commit 4d5ec6cdb7
7 changed files with 758 additions and 597 deletions
+106 -191
View File
@@ -1,5 +1,4 @@
// import { postgrestPost } from "../postgrest-client";
import { API_BASE_URL } from "../../config/api-config";
/**
* 提出意见的请求参数接口
@@ -29,20 +28,32 @@ export interface SubmitOpinionResponse {
* 交叉评查意见数据接口
*/
export interface CrossCheckingOpinion {
id: string | number;
evaluation_point_id: string | number;
document_id: string | number;
audit_point: string;
found_issue: string;
audit_opinion: string;
deduction_score: number;
status: string;
created_at: string;
proposal_id: string | number;
evaluation_point_name: string;
proposed_score: number;
reason: string;
proposer: string;
votes: Array<{ voter: string; vote_type: string }>;
agree_voters: string[];
disagree_voters: string[];
pending_voters: string[];
can_vote: boolean;
problem_message: string;
// 兼容旧字段
id?: string | number;
evaluation_point_id?: string | number;
document_id?: string | number;
audit_point?: string;
found_issue?: string;
audit_opinion?: string;
deduction_score?: number;
status?: string;
created_at?: string;
updated_at?: string;
is_vote: boolean; // 当前用户是否已投票
voter_count: number; // 投票人数
proposer_name: string; // 意见发起人姓名
current_user_is_proposer: boolean; // 当前用户是否为意见发起人
is_vote?: boolean;
voter_count?: number;
proposer_name?: string;
current_user_is_proposer?: boolean;
}
/**
@@ -110,191 +121,95 @@ export async function submitCrossCheckingOpinion(
* @param pageSize 每页大小
* @returns 意见列表和总数
*/
import { API_BASE_URL } from '../../config/api-config';
export async function getCrossCheckingOpinions(
documentId: string | number,
page: number = 1,
pageSize: number = 10
pageSize: number = 10,
userId?: number // 可选,便于后端接口对接
): Promise<ApiResponse<{ opinions: CrossCheckingOpinion[], total: number }>> {
try {
// 模拟数据 - 后续替换为真实API调用
const mockOpinions: CrossCheckingOpinion[] = [
{
id: 1,
evaluation_point_id: 101,
document_id: documentId,
audit_point: "合同主体信息核查",
found_issue: "合同签署方信息不完整",
audit_opinion: "合同中缺少乙方的详细联系方式,建议补充完整的地址和联系电话",
deduction_score: -2,
status: "pending",
created_at: "2024-01-15 10:30:00",
is_vote: false,
voter_count: 3,
proposer_name: "张三",
current_user_is_proposer: false
// 如果没传userId,默认用1
const realUserId = userId ?? 1;
// 实际后端API调用,拼接API_BASE_URL
const response = await fetch(`${API_BASE_URL}/admin/cross_review/proposals/details`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
{
id: 2,
evaluation_point_id: 102,
document_id: documentId,
audit_point: "合同金额核查",
found_issue: "合同金额与预算不符",
audit_opinion: "合同总金额超出预算范围,需要重新评估或调整预算",
deduction_score: -5,
status: "approved",
created_at: "2024-01-14 14:20:00",
is_vote: true,
voter_count: 5,
proposer_name: "李四",
current_user_is_proposer: true
},
{
id: 3,
evaluation_point_id: 103,
document_id: documentId,
audit_point: "合同条款审查",
found_issue: "违约责任条款不明确",
audit_opinion: "合同中违约责任的具体计算方式和赔偿标准需要进一步明确",
deduction_score: -3,
status: "rejected",
created_at: "2024-01-13 09:15:00",
is_vote: false,
voter_count: 2,
proposer_name: "王五",
current_user_is_proposer: false
},
{
id: 4,
evaluation_point_id: 103,
document_id: documentId,
audit_point: "合同条款审查",
found_issue: "违约责任条款不明确",
audit_opinion: "合同中违约责任的具体计算方式和赔偿标准需要进一步明确",
deduction_score: -3,
status: "rejected",
created_at: "2024-01-13 09:15:00",
is_vote: false,
voter_count: 2,
proposer_name: "王五",
current_user_is_proposer: false
},
{
id: 5,
evaluation_point_id: 103,
document_id: documentId,
audit_point: "合同条款审查",
found_issue: "违约责任条款不明确",
audit_opinion: "合同中违约责任的具体计算方式和赔偿标准需要进一步明确",
deduction_score: -3,
status: "rejected",
created_at: "2024-01-13 09:15:00",
is_vote: false,
voter_count: 2,
proposer_name: "王五",
current_user_is_proposer: false
},
{
id: 6,
evaluation_point_id: 103,
document_id: documentId,
audit_point: "合同条款审查",
found_issue: "违约责任条款不明确",
audit_opinion: "合同中违约责任的具体计算方式和赔偿标准需要进一步明确",
deduction_score: -3,
status: "rejected",
created_at: "2024-01-13 09:15:00",
is_vote: false,
voter_count: 2,
proposer_name: "王五",
current_user_is_proposer: false
},
{
id: 7,
evaluation_point_id: 103,
document_id: documentId,
audit_point: "合同条款审查",
found_issue: "违约责任条款不明确",
audit_opinion: "合同中违约责任的具体计算方式和赔偿标准需要进一步明确",
deduction_score: -3,
status: "rejected",
created_at: "2024-01-13 09:15:00",
is_vote: false,
voter_count: 2,
proposer_name: "王五",
current_user_is_proposer: false
},
{
id: 8,
evaluation_point_id: 103,
document_id: documentId,
audit_point: "合同条款审查",
found_issue: "违约责任条款不明确",
audit_opinion: "合同中违约责任的具体计算方式和赔偿标准需要进一步明确",
deduction_score: -3,
status: "rejected",
created_at: "2024-01-13 09:15:00",
is_vote: false,
voter_count: 2,
proposer_name: "王五",
current_user_is_proposer: false
},
{
id: 9,
evaluation_point_id: 103,
document_id: documentId,
audit_point: "合同条款审查",
found_issue: "违约责任条款不明确",
audit_opinion: "合同中违约责任的具体计算方式和赔偿标准需要进一步明确",
deduction_score: -3,
status: "rejected",
created_at: "2024-01-13 09:15:00",
is_vote: false,
voter_count: 2,
proposer_name: "王五",
current_user_is_proposer: false
},
{
id: 10,
evaluation_point_id: 103,
document_id: documentId,
audit_point: "合同条款审查",
found_issue: "违约责任条款不明确",
audit_opinion: "合同中违约责任的具体计算方式和赔偿标准需要进一步明确",
deduction_score: -3,
status: "rejected",
created_at: "2024-01-13 09:15:00",
is_vote: false,
voter_count: 2,
proposer_name: "王五",
current_user_is_proposer: false
},
{
id: 11,
evaluation_point_id: 103,
document_id: documentId,
audit_point: "合同条款审查",
found_issue: "违约责任条款不明确",
audit_opinion: "合同中违约责任的具体计算方式和赔偿标准需要进一步明确",
deduction_score: -3,
status: "rejected",
created_at: "2024-01-13 09:15:00",
is_vote: false,
voter_count: 2,
proposer_name: "王五",
current_user_is_proposer: false
},
];
// 模拟分页
const total = mockOpinions.length;
const startIndex = (page - 1) * pageSize;
const endIndex = startIndex + pageSize;
const paginatedOpinions = mockOpinions.slice(startIndex, endIndex);
body: JSON.stringify({
user_id: realUserId,
document_id: documentId, // 如果后端需要document_id可以加上
page,
page_size: pageSize
})
});
if (!response.ok) {
throw new Error('获取意见列表失败');
}
const data = await response.json();
// 处理新的数据结构,支持分页
const responseData = data.data || data;
const pagination = data.pagination;
// 定义后端返回的数据项类型
interface ProposalItem {
proposal_id: string | number;
evaluation_point_name: string;
proposed_score: number;
reason: string;
proposer: string;
votes?: Array<{ voter: string; vote_type: string }>;
agree_voters?: string[];
disagree_voters?: string[];
pending_voters?: string[];
can_vote?: boolean;
problem_message?: string;
evaluation_point_id?: string | number;
document_id?: string | number;
status?: string;
created_at?: string;
updated_at?: string;
is_vote?: boolean;
current_user_is_proposer?: boolean;
}
// 适配后端返回结构,使用新字段
const opinions: CrossCheckingOpinion[] = Array.isArray(responseData) ? responseData.map((item: ProposalItem) => ({
proposal_id: item.proposal_id,
evaluation_point_name: item.evaluation_point_name,
proposed_score: item.proposed_score,
reason: item.reason,
proposer: item.proposer,
votes: item.votes || [],
agree_voters: item.agree_voters || [],
disagree_voters: item.disagree_voters || [],
pending_voters: item.pending_voters || [],
can_vote: item.can_vote ?? false,
problem_message: item.problem_message || '',
// 兼容旧字段
id: item.proposal_id,
evaluation_point_id: item.evaluation_point_id,
document_id: item.document_id || documentId,
audit_point: item.evaluation_point_name,
found_issue: item.problem_message || '',
audit_opinion: item.reason || '',
deduction_score: item.proposed_score,
status: item.status || 'pending',
created_at: item.created_at || '',
updated_at: item.updated_at || '',
is_vote: item.is_vote || false,
voter_count: (item.agree_voters?.length || 0) + (item.disagree_voters?.length || 0),
proposer_name: item.proposer,
current_user_is_proposer: item.current_user_is_proposer || false
})) : [];
return {
data: {
opinions: paginatedOpinions,
total: total
opinions,
total: pagination?.total || opinions.length
}
};
} catch (error) {
+218 -9
View File
@@ -35,6 +35,32 @@ export interface CrossCheckingTask {
documentIds: number[];
}
// 用户任务文档接口类型定义
export interface UserTaskDocument {
document_id: number;
document_name: string;
document_type_id: number;
document_type_name: string;
}
// 用户任务信息接口
export interface UserTaskInfo {
task_id: number;
task_status: string;
documents: UserTaskDocument[];
}
// 用户任务API响应格式
export interface UserTaskApiResponse {
data: UserTaskInfo[];
pagination: {
page: number;
page_size: number;
total: number;
total_pages: number;
};
}
// API响应格式
export interface ApiResponse<T> {
success: boolean;
@@ -148,9 +174,46 @@ const mockTasks: CrossCheckingTask[] = [
*/
export async function getCrossCheckingTasks(params: TaskListParams = {}): Promise<ApiResponse<TaskListResponse>> {
try {
// TODO 这个需要对接获取交叉评查任务列表的接口 模拟API延迟
await new Promise(resolve => setTimeout(resolve, 500));
console.log('开始调用getCrossCheckingTasks,参数:', params);
// 调用用户任务API,获取当前用户参与的任务
const userTasksResponse = await getUserTaskDocuments(1); // 暂时使用固定用户ID 1
console.log('getUserTaskDocuments响应:', userTasksResponse);
if (!userTasksResponse.success || !userTasksResponse.data) {
console.error('获取用户任务失败:', userTasksResponse.error);
return {
success: false,
error: userTasksResponse.error || '获取用户任务失败'
};
}
// 将用户任务数据转换为CrossCheckingTask格式
const userTasks = userTasksResponse.data;
const convertedTasks: CrossCheckingTask[] = userTasks.map((userTask: UserTaskInfo, index: number) => {
// 从用户任务中提取任务信息,如果没有对应信息则使用默认值
const task: CrossCheckingTask = {
id: userTask.task_id,
sequence: index + 1,
taskName: `任务 ${userTask.task_id}`, // 用户任务API中没有任务名称,使用默认值
startDate: new Date().toISOString().split('T')[0], // 使用当前日期作为默认值
taskType: CrossCheckingTaskType.CITY, // 默认任务类型
docType: CrossCheckingDocType.PENALTY, // 默认案卷类型
evaluationRegion: '待定', // 默认评查地区
progress: userTask.task_status === 'completed' ? 100 :
userTask.task_status === 'in_progress' ? 50 : 0,
status: userTask.task_status === 'completed' ? CrossCheckingTaskStatus.COMPLETED :
userTask.task_status === 'in_progress' ? CrossCheckingTaskStatus.IN_PROGRESS :
CrossCheckingTaskStatus.PENDING,
score: userTask.task_status === 'completed' ? 85 : 0, // 默认分数
operation: userTask.task_status === 'completed' ? '查看结果' :
userTask.task_status === 'in_progress' ? '进行中' : '去评查',
documentIds: userTask.documents.map((doc: UserTaskDocument) => doc.document_id)
};
return task;
});
const {
page = 1,
pageSize = 10,
@@ -163,7 +226,7 @@ export async function getCrossCheckingTasks(params: TaskListParams = {}): Promis
} = params;
// 筛选数据
let filteredTasks = [...mockTasks];
let filteredTasks = [...convertedTasks];
// 按任务类型筛选
if (taskType && taskType !== 'all') {
@@ -314,14 +377,46 @@ export async function getCrossCheckingTaskDetail(
total: number;
}>> {
try {
const task = mockTasks.find(t => t.id === taskId);
if (!task) {
// 从用户任务API中获取任务信息
const userTasksResponse = await getUserTaskDocuments(1); // 暂时使用固定用户ID 1
if (!userTasksResponse.success || !userTasksResponse.data) {
console.error('获取用户任务失败:', userTasksResponse.error);
return {
success: false,
error: userTasksResponse.error || '获取用户任务失败'
};
}
// 查找指定的任务
const userTask = userTasksResponse.data.find(t => t.task_id === taskId);
if (!userTask) {
return {
success: false,
error: '任务不存在'
};
}
// 将用户任务转换为CrossCheckingTask格式
const task: CrossCheckingTask = {
id: userTask.task_id,
sequence: 1, // 暂时使用默认值
taskName: `任务 ${userTask.task_id}`, // 用户任务API中没有任务名称,使用默认值
startDate: new Date().toISOString().split('T')[0], // 使用当前日期作为默认值
taskType: CrossCheckingTaskType.CITY, // 默认任务类型
docType: CrossCheckingDocType.PENALTY, // 默认案卷类型
evaluationRegion: '待定', // 默认评查地区
progress: userTask.task_status === 'completed' ? 100 :
userTask.task_status === 'in_progress' ? 50 : 0,
status: userTask.task_status === 'completed' ? CrossCheckingTaskStatus.COMPLETED :
userTask.task_status === 'in_progress' ? CrossCheckingTaskStatus.IN_PROGRESS :
CrossCheckingTaskStatus.PENDING,
score: userTask.task_status === 'completed' ? 85 : 0, // 默认分数
operation: userTask.task_status === 'completed' ? '查看结果' :
userTask.task_status === 'in_progress' ? '进行中' : '去评查',
documentIds: userTask.documents.map(doc => doc.document_id)
};
let files: import('../evaluation_points/rules-files').ReviewFileUI[] = [];
let total = 0;
@@ -376,10 +471,24 @@ export async function getCrossCheckingStats(): Promise<ApiResponse<{
completedTasks: number;
}>> {
try {
const totalTasks = mockTasks.length;
const pendingTasks = mockTasks.filter(t => t.status === CrossCheckingTaskStatus.PENDING).length;
const inProgressTasks = mockTasks.filter(t => t.status === CrossCheckingTaskStatus.IN_PROGRESS).length;
const completedTasks = mockTasks.filter(t => t.status === CrossCheckingTaskStatus.COMPLETED).length;
console.log('开始调用getCrossCheckingStats');
// 获取用户任务数据来计算统计
const userTasksResponse = await getUserTaskDocuments(1); // 暂时使用固定用户ID 1
if (!userTasksResponse.success || !userTasksResponse.data) {
console.error('获取用户任务失败:', userTasksResponse.error);
return {
success: false,
error: userTasksResponse.error || '获取用户任务失败'
};
}
const userTasks = userTasksResponse.data;
const totalTasks = userTasks.length;
const pendingTasks = userTasks.filter(t => t.task_status === 'pending').length;
const inProgressTasks = userTasks.filter(t => t.task_status === 'in_progress').length;
const completedTasks = userTasks.filter(t => t.task_status === 'completed').length;
return {
success: true,
@@ -398,3 +507,103 @@ export async function getCrossCheckingStats(): Promise<ApiResponse<{
};
}
}
// ==================== 新增:用户任务文档相关接口 ====================
// 导入API客户端
import { post } from '../axios-client';
/**
* 获取用户参与的所有任务及文档
* @param userId 用户ID
* @returns 用户任务及文档列表
*/
export async function getUserTaskDocuments(userId: number): Promise<ApiResponse<UserTaskInfo[]>> {
try {
console.log('开始调用用户任务API,用户ID:', userId);
// 导入API配置以显示当前使用的baseUrl
const { API_BASE_URL } = await import('../../config/api-config');
console.log('当前API基础URL:', API_BASE_URL);
// 调用真实的API接口
console.log('调用API路径:', '/admin/cross_review/tasks/user_documents');
console.log('完整API URL:', `${API_BASE_URL}/admin/cross_review/tasks/user_documents`);
console.log('请求参数:', { user_id: userId });
const response = await post<UserTaskApiResponse>(
'/admin/cross_review/tasks/user_documents',
{ user_id: userId }
);
console.log('API响应:', response);
// 如果API调用失败,尝试使用模拟数据作为回退
if (response.error) {
console.warn('API调用失败,使用模拟数据作为回退');
// 返回模拟数据
const mockUserTasks: UserTaskInfo[] = [
{
task_id: 1,
task_status: 'completed',
documents: [
{ document_id: 1, document_name: '测试文档1', document_type_id: 1, document_type_name: '行政处罚' },
{ document_id: 2, document_name: '测试文档2', document_type_id: 1, document_type_name: '行政处罚' }
]
},
{
task_id: 2,
task_status: 'in_progress',
documents: [
{ document_id: 3, document_name: '测试文档3', document_type_id: 2, document_type_name: '行政许可' }
]
}
];
return {
success: true,
data: mockUserTasks
};
}
if (response.error) {
console.error('获取用户任务及文档失败:', response.error);
return {
success: false,
error: response.error
};
}
// 确保返回的数据是数组格式
let userTasks: UserTaskInfo[] = [];
if (response.data) {
// 检查响应数据的结构
console.log('响应数据结构:', response.data);
// 根据实际API响应结构,数据在response.data.data中
if (response.data.data && Array.isArray(response.data.data)) {
userTasks = response.data.data;
} else if (Array.isArray(response.data)) {
// 备用方案:如果数据直接在response.data中
userTasks = response.data;
} else {
console.warn('响应数据格式不正确:', response.data);
userTasks = [];
}
}
console.log('解析后的用户任务数据:', userTasks);
return {
success: true,
data: userTasks
};
} catch (error) {
console.error('获取用户任务及文档失败:', error);
return {
success: false,
error: error instanceof Error ? error.message : '获取用户任务及文档失败'
};
}
}