feat: migrate cross checking ui to v3 flow
This commit is contained in:
wren
@@ -76,7 +76,7 @@ export interface UserTaskApiResponse {
|
||||
items: UserTaskInfo[];
|
||||
}
|
||||
|
||||
// 任务文档接口类型定义（旧版，保留兼容）
|
||||
// 任务文档接口类型定义（任务详情页兼容结构）
|
||||
export interface TaskDocument {
|
||||
document_id: number;
|
||||
file_name: string;
|
||||
@@ -289,6 +289,156 @@ export interface ApiResponse<T> {
|
||||
status?: number;
|
||||
}
|
||||
|
||||
interface ResultEnvelope<T> {
|
||||
code?: number;
|
||||
msg?: string;
|
||||
data?: T;
|
||||
}
|
||||
|
||||
interface V3UserTaskItem {
|
||||
taskId: number;
|
||||
taskName: string;
|
||||
taskType: string;
|
||||
docTypeId?: number | null;
|
||||
docTypeCode?: string | null;
|
||||
status: string;
|
||||
progress?: number;
|
||||
totalDocuments?: number;
|
||||
completedDocuments?: number;
|
||||
createdAt?: string;
|
||||
}
|
||||
|
||||
interface V3UserTaskPage {
|
||||
total: number;
|
||||
page: number;
|
||||
pageSize: number;
|
||||
items: V3UserTaskItem[];
|
||||
}
|
||||
|
||||
interface V3TaskDocumentItem {
|
||||
documentId: number;
|
||||
name: string;
|
||||
documentNumber?: string | null;
|
||||
typeId?: number | null;
|
||||
processingStatus?: string | null;
|
||||
versionNo?: number;
|
||||
isLatestVersion?: boolean;
|
||||
auditStatus?: number;
|
||||
createdAt?: string;
|
||||
}
|
||||
|
||||
interface V3TaskDocumentPage {
|
||||
taskId: number;
|
||||
total: number;
|
||||
page: number;
|
||||
pageSize: number;
|
||||
items: V3TaskDocumentItem[];
|
||||
}
|
||||
|
||||
function unwrapResultEnvelope<T>(payload: unknown): T {
|
||||
if (payload && typeof payload === 'object' && 'data' in (payload as ResultEnvelope<T>)) {
|
||||
return ((payload as ResultEnvelope<T>).data ?? null) as T;
|
||||
}
|
||||
return payload as T;
|
||||
}
|
||||
|
||||
function mapProcessingStatus(status?: string | null): CrossReviewDocumentWithVersion['status'] {
|
||||
switch (status) {
|
||||
case 'processed':
|
||||
case 'Processed':
|
||||
return 'Processed';
|
||||
case 'failed':
|
||||
case 'Failed':
|
||||
return 'Failed';
|
||||
case 'cutting':
|
||||
case 'Cutting':
|
||||
return 'Cutting';
|
||||
case 'extracting':
|
||||
case 'Extractioning':
|
||||
return 'Extractioning';
|
||||
case 'evaluating':
|
||||
case 'Evaluationing':
|
||||
return 'Evaluationing';
|
||||
case 'waiting':
|
||||
case 'Waiting':
|
||||
default:
|
||||
return 'Waiting';
|
||||
}
|
||||
}
|
||||
|
||||
function mapV3TaskToUserTaskInfo(item: V3UserTaskItem): UserTaskInfo {
|
||||
return {
|
||||
task_id: item.taskId,
|
||||
task_name: item.taskName,
|
||||
task_status: item.status,
|
||||
doc_type: item.docTypeCode || undefined,
|
||||
task_created_at: item.createdAt,
|
||||
task_type: item.taskType,
|
||||
progress: item.progress,
|
||||
total_documents: item.totalDocuments
|
||||
};
|
||||
}
|
||||
|
||||
function mapV3DocumentToTaskDocument(item: V3TaskDocumentItem): TaskDocument {
|
||||
return {
|
||||
document_id: item.documentId,
|
||||
file_name: item.name || '',
|
||||
status: mapProcessingStatus(item.processingStatus),
|
||||
path: '',
|
||||
file_code: item.documentNumber || '',
|
||||
file_type_name: item.typeId ? `类型${item.typeId}` : '',
|
||||
file_type_id: item.typeId || 0,
|
||||
file_size: 0,
|
||||
upload_time: item.createdAt || '',
|
||||
created_at: item.createdAt || '',
|
||||
evaluations_status: 0,
|
||||
audit_status: item.auditStatus || 0,
|
||||
created_by_user_id: 0,
|
||||
issues: [],
|
||||
final_score: 0,
|
||||
score_summary: '',
|
||||
score_percent: null,
|
||||
pass_count: 0,
|
||||
warning_count: 0,
|
||||
fail_count: 0,
|
||||
manual_count: 0
|
||||
};
|
||||
}
|
||||
|
||||
function mapV3DocumentToVersionedDocument(item: V3TaskDocumentItem): CrossReviewDocumentWithVersion {
|
||||
const typeName = item.typeId ? `类型${item.typeId}` : '未知类型';
|
||||
return {
|
||||
id: item.documentId,
|
||||
name: item.name || '',
|
||||
path: '',
|
||||
version_number: item.versionNo || 1,
|
||||
created_at: item.createdAt || '',
|
||||
status: mapProcessingStatus(item.processingStatus),
|
||||
file_size: 0,
|
||||
document_number: item.documentNumber || null,
|
||||
type_id: item.typeId || 0,
|
||||
type_name: typeName,
|
||||
upload_time: item.createdAt || '',
|
||||
audit_status: (item.auditStatus || 0) as 0 | 1,
|
||||
total_evaluation_points: 0,
|
||||
pass_count: 0,
|
||||
warning_count: 0,
|
||||
error_count: 0,
|
||||
manual_count: 0,
|
||||
issue_count: 0,
|
||||
warning_messages: [],
|
||||
error_messages: [],
|
||||
issue_messages: [],
|
||||
manual_messages: [],
|
||||
final_score: 0,
|
||||
full_score: 100,
|
||||
score_summary: '',
|
||||
score_percent: 0,
|
||||
total_versions: 1,
|
||||
history_versions: []
|
||||
};
|
||||
}
|
||||
|
||||
// 任务列表查询参数
|
||||
export interface TaskListParams {
|
||||
page?: number;
|
||||
@@ -321,10 +471,7 @@ export interface TaskListResponse {
|
||||
*/
|
||||
export async function getCrossCheckingTasks(params: TaskListParams = {}, userInfo?: { user_id?: number; [key: string]: unknown }, jwtToken?: string): Promise<ApiResponse<TaskListResponse>> {
|
||||
try {
|
||||
// console.log('开始调用getCrossCheckingTasks，参数:', params);
|
||||
|
||||
// 调用用户任务API，获取当前用户参与的任务
|
||||
const userTasksResponse = await getUserTaskDocuments(params.page || 1, params.pageSize || 10, jwtToken);
|
||||
const userTasksResponse = await getUserTaskDocuments(params, jwtToken);
|
||||
|
||||
// console.log('getUserTaskDocuments响应:', JSON.stringify(userTasksResponse,null,2));
|
||||
|
||||
@@ -347,7 +494,7 @@ export async function getCrossCheckingTasks(params: TaskListParams = {}, userInf
|
||||
startDate: userTask.task_created_at ? new Date(userTask.task_created_at).toISOString().split('T')[0] : new Date().toISOString().split('T')[0],
|
||||
taskType: userTask.task_type, // 保持默认任务类型
|
||||
docType: userTask.doc_type || '未知类型', // 使用API返回的文档类型
|
||||
evaluationRegion: userTask.evaluation_region || [], // 保持默认评查地区
|
||||
evaluationRegion: userTask.evaluation_region || [],
|
||||
progress: userTask.progress || 0, // 使用API返回的进度
|
||||
status: userTask.task_status || 'pending', // 使用API返回的任务状态
|
||||
score: userTask.task_status === 'completed' ? 85 : 0, // 默认分数
|
||||
@@ -391,7 +538,7 @@ export async function getCrossCheckingTasks(params: TaskListParams = {}, userInf
|
||||
const lowerKeyword = keyword.toLowerCase();
|
||||
filteredTasks = filteredTasks.filter(task =>
|
||||
task.taskName.toLowerCase().includes(lowerKeyword) ||
|
||||
task.evaluationRegion.toLowerCase().includes(lowerKeyword)
|
||||
task.evaluationRegion.join(',').toLowerCase().includes(lowerKeyword)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -525,7 +672,7 @@ export async function getCrossCheckingStats(userInfo?: { user_id?: number; [key:
|
||||
console.log('开始调用getCrossCheckingStats');
|
||||
|
||||
// 获取用户任务数据来计算统计（默认获取第一页数据进行统计）
|
||||
const userTasksResponse = await getUserTaskDocuments(1, 100, jwtToken); // 获取前100个任务用于统计
|
||||
const userTasksResponse = await getUserTaskDocuments({ page: 1, pageSize: 100 }, jwtToken);
|
||||
|
||||
if (!userTasksResponse.success || !userTasksResponse.data) {
|
||||
console.error('获取用户任务失败:', userTasksResponse.error);
|
||||
@@ -568,25 +715,49 @@ export async function getCrossCheckingStats(userInfo?: { user_id?: number; [key:
|
||||
* @param jwtToken JWT token
|
||||
* @returns 用户任务列表
|
||||
*/
|
||||
export async function getUserTaskDocuments(page: number = 1, pageSize: number = 10, jwtToken?: string): Promise<ApiResponse<UserTaskApiResponse>> {
|
||||
export async function getUserTaskDocuments(params: TaskListParams = {}, jwtToken?: string): Promise<ApiResponse<UserTaskApiResponse>> {
|
||||
try {
|
||||
// 拼接绝对路径，去除多余斜杠
|
||||
const base = API_BASE_URL.endsWith('/') ? API_BASE_URL.slice(0, -1) : API_BASE_URL;
|
||||
const url = `${base}/admin/v2/cross_review/tasks/user_tasks`;
|
||||
const url = `${base}/api/v3/cross-review/tasks/query`;
|
||||
|
||||
const response = await axios.post(url, {
|
||||
page: page,
|
||||
page_size: pageSize
|
||||
}, {
|
||||
const page = params.page || 1;
|
||||
const pageSize = params.pageSize || 10;
|
||||
const requestBody: Record<string, unknown> = {
|
||||
page,
|
||||
pageSize
|
||||
};
|
||||
|
||||
if (params.keyword?.trim()) {
|
||||
requestBody.keyword = params.keyword.trim();
|
||||
}
|
||||
if (params.status && params.status !== 'all') {
|
||||
requestBody.status = params.status;
|
||||
}
|
||||
if (params.taskType && params.taskType !== 'all') {
|
||||
requestBody.taskType = params.taskType;
|
||||
}
|
||||
if (params.docType && params.docType !== 'all') {
|
||||
requestBody.docTypeCode = params.docType;
|
||||
}
|
||||
|
||||
const response = await axios.post<ResultEnvelope<V3UserTaskPage>>(url, requestBody, {
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': `Bearer ${jwtToken || ''}`
|
||||
}
|
||||
});
|
||||
|
||||
const pageData = unwrapResultEnvelope<V3UserTaskPage>(response.data);
|
||||
const items = Array.isArray(pageData?.items) ? pageData.items.map(mapV3TaskToUserTaskInfo) : [];
|
||||
|
||||
return {
|
||||
success: true,
|
||||
data: response.data
|
||||
data: {
|
||||
total: pageData?.total || 0,
|
||||
page: pageData?.page || page,
|
||||
page_size: pageData?.pageSize || pageSize,
|
||||
items
|
||||
}
|
||||
};
|
||||
} catch (error) {
|
||||
if (axios.isAxiosError(error)) {
|
||||
@@ -603,7 +774,7 @@ export async function getUserTaskDocuments(page: number = 1, pageSize: number =
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取指定任务的文档列表（旧版接口，保留兼容）
|
||||
* 获取指定任务的文档列表（兼容任务详情使用）
|
||||
* @param taskId 任务ID
|
||||
* @param page 页码
|
||||
* @param pageSize 每页大小
|
||||
@@ -612,24 +783,30 @@ export async function getUserTaskDocuments(page: number = 1, pageSize: number =
|
||||
*/
|
||||
export async function getTaskDocuments(taskId: number, page: number = 1, pageSize: number = 10, jwtToken?: string): Promise<ApiResponse<TaskDocumentApiResponse>> {
|
||||
try {
|
||||
// 拼接绝对路径，去除多余斜杠
|
||||
const base = API_BASE_URL.endsWith('/') ? API_BASE_URL.slice(0, -1) : API_BASE_URL;
|
||||
const url = `${base}/admin/v2/cross_review/tasks/${taskId}/documents`;
|
||||
// console.log('最终请求URL:', url);
|
||||
const url = `${base}/api/v3/cross-review/tasks/${taskId}/documents`;
|
||||
|
||||
const response = await axios.post(url, {
|
||||
page: page,
|
||||
page_size: pageSize
|
||||
}, {
|
||||
const response = await axios.get<ResultEnvelope<V3TaskDocumentPage>>(url, {
|
||||
params: {
|
||||
page,
|
||||
pageSize
|
||||
},
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': `Bearer ${jwtToken || ''}`
|
||||
}
|
||||
});
|
||||
|
||||
const pageData = unwrapResultEnvelope<V3TaskDocumentPage>(response.data);
|
||||
const items = Array.isArray(pageData?.items) ? pageData.items.map(mapV3DocumentToTaskDocument) : [];
|
||||
|
||||
return {
|
||||
success: true,
|
||||
data: response.data
|
||||
data: {
|
||||
total: pageData?.total || 0,
|
||||
page: pageData?.page || page,
|
||||
page_size: pageData?.pageSize || pageSize,
|
||||
items
|
||||
}
|
||||
};
|
||||
} catch (error) {
|
||||
if (axios.isAxiosError(error)) {
|
||||
@@ -646,9 +823,9 @@ export async function getTaskDocuments(taskId: number, page: number = 1, pageSiz
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取任务下文档列表（支持版本归纳）- 新版接口
|
||||
* 获取任务下文档列表（支持版本归纳）
|
||||
*
|
||||
* POST /api/v2/cross_review/tasks/{task_id}/documents
|
||||
* GET /api/v3/cross-review/tasks/{task_id}/documents
|
||||
*
|
||||
* 同一任务内同名且同类型的文档会被归纳为版本组，最新上传的为当前版本，其余为历史版本。
|
||||
*
|
||||
@@ -661,18 +838,16 @@ export async function getTaskDocumentsWithVersions(
|
||||
const { taskId, page = 1, pageSize = 10, keyword, jwtToken } = params;
|
||||
|
||||
try {
|
||||
// 拼接绝对路径，去除多余斜杠
|
||||
const base = API_BASE_URL.endsWith('/') ? API_BASE_URL.slice(0, -1) : API_BASE_URL;
|
||||
const url = `${base}/api/v2/cross_review/tasks/${taskId}/documents`;
|
||||
const url = `${base}/api/v3/cross-review/tasks/${taskId}/documents`;
|
||||
|
||||
// 构建请求体
|
||||
const queryParams: {
|
||||
page: number;
|
||||
page_size: number;
|
||||
pageSize: number;
|
||||
keyword?: string;
|
||||
} = {
|
||||
page,
|
||||
page_size: pageSize
|
||||
pageSize
|
||||
};
|
||||
|
||||
// 只有当 keyword 有值时才添加
|
||||
@@ -680,16 +855,25 @@ export async function getTaskDocumentsWithVersions(
|
||||
queryParams.keyword = keyword.trim();
|
||||
}
|
||||
|
||||
const response = await axios.get<CrossReviewDocumentListResponse>(url, {
|
||||
const response = await axios.get<ResultEnvelope<V3TaskDocumentPage>>(url, {
|
||||
params: queryParams,
|
||||
headers: {
|
||||
'Authorization': `Bearer ${jwtToken || ''}`
|
||||
}
|
||||
});
|
||||
|
||||
const pageData = unwrapResultEnvelope<V3TaskDocumentPage>(response.data);
|
||||
const documents = Array.isArray(pageData?.items) ? pageData.items.map(mapV3DocumentToVersionedDocument) : [];
|
||||
|
||||
return {
|
||||
success: true,
|
||||
data: response.data
|
||||
data: {
|
||||
total: pageData?.total || 0,
|
||||
page: pageData?.page || page,
|
||||
page_size: pageData?.pageSize || pageSize,
|
||||
total_pages: Math.ceil((pageData?.total || 0) / (pageData?.pageSize || pageSize || 1)),
|
||||
documents
|
||||
}
|
||||
};
|
||||
} catch (error) {
|
||||
if (axios.isAxiosError(error)) {
|
||||
@@ -1030,4 +1214,4 @@ export async function uploadCrossReviewDocumentTemplate(
|
||||
error: error instanceof Error ? error.message : '上传模板失败'
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user