feat: migrate cross checking ui to v3 flow

This commit is contained in:
wren
2026-05-07 18:15:40 +08:00
parent a14a1f0ee1
commit add399e126
7 changed files with 786 additions and 333 deletions
+127 -102
View File
@@ -2,6 +2,19 @@ import { postgrestGet, postgrestPut } from "../postgrest-client";
import axios from 'axios';
import { API_BASE_URL } from '../../config/api-config';
interface ResultEnvelope<T> {
code?: number;
msg?: string;
data?: T;
}
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;
}
/**
* 从不同格式的 API 响应中提取数据
* @param responseData API 响应数据
@@ -86,8 +99,7 @@ async function safeGetJWT(jwtToken?: string): Promise<string> {
/**
* 检查用户是否有权确认完成文档评查
*
* 🔥 接口文档: auth_doc/交叉评查接口文档.md 接口11
* 📍 API地址: GET /api/v2/cross_review/tasks/{task_id}/can-confirm
* 📍 API地址: GET /api/v3/cross-review/tasks/{task_id}/can-confirm
*
* @param taskId 任务ID
* @param frontendJWT JWT token
@@ -100,10 +112,8 @@ export async function findIsProposer(taskId: string | number, userId: number | u
return false;
}
// 调用新的接口检查用户是否有权确认完成
// GET /api/v2/cross_review/tasks/{task_id}/can-confirm
const response = await axios.get(
`${API_BASE_URL}/api/v2/cross_review/tasks/${taskId}/can-confirm`,
const response = await axios.get<ResultEnvelope<{ canConfirm?: boolean; can_confirm?: boolean }>>(
`${API_BASE_URL}/api/v3/cross-review/tasks/${taskId}/can-confirm`,
{
headers: {
'Content-Type': 'application/json',
@@ -112,12 +122,8 @@ export async function findIsProposer(taskId: string | number, userId: number | u
}
);
const data = response.data;
// console.log('[findIsProposer] 检查权限响应:', data);
// 返回 can_confirm 字段,表示是否有权确认完成
// 有权限的用户:任务创建者(assigner_id) 或 主要负责人(principal_user_ids)
return data?.can_confirm === true;
const data = response.data?.data || response.data;
return data?.canConfirm === true || data?.can_confirm === true;
} catch (error) {
console.error('[findIsProposer] 检查权限失败:', error);
@@ -147,26 +153,29 @@ export async function submitCrossCheckingOpinion(
const token = await safeGetJWT(jwtToken);
const requestData = {
document_id: opinionData.documentId,
evaluation_point_id: Number(opinionData.evaluationPointId), // 强制转数字
proposed_score: opinionData.deductionScore,
reason: opinionData.auditOpinion,
proposer_id: userInfo?.user_id,
evaluation_result_id: opinionData.reviewPointResultId
documentId: Number(opinionData.documentId),
evaluationPointId: Number(opinionData.evaluationPointId),
deductionScore: opinionData.deductionScore,
auditOpinion: opinionData.auditOpinion,
reviewPointResultId: Number(opinionData.reviewPointResultId)
};
const response = await axios.post(`${API_BASE_URL}/api/v2/cross_review/proposals`, requestData, {
const response = await axios.post<ResultEnvelope<{ proposalId?: number; createdAt?: string }>>(`${API_BASE_URL}/api/v3/cross-review/proposals`, requestData, {
headers: {
'Content-Type': 'application/json',
'Authorization': `Bearer ${token}`
}
});
const data = unwrapResultEnvelope<{ proposalId?: number; createdAt?: string }>(response.data);
return {
data: {
success: true,
message: '意见提交成功',
data: response.data
data: {
id: data?.proposalId,
created_at: data?.createdAt || new Date().toISOString()
}
}
};
} catch (error) {
@@ -213,64 +222,80 @@ export async function getCrossCheckingOpinions(
// 如果没传userId,默认用1
const realUserId = userId ?? 1;
// 实际后端API调用,拼接API_BASE_URL
const response = await axios.post(`${API_BASE_URL}/api/v2/cross_review/proposals/document`, {
// user_id: realUserId,
document_id: documentId, // 如果后端需要document_id可以加上
page,
page_size: pageSize
}, {
const response = await axios.get<ResultEnvelope<{
total: number;
page: number;
pageSize: number;
items: Array<{
proposalId: string | number;
evaluationPointName: string;
proposedScore: number;
reason: string;
proposer: string;
votes?: Array<{ voter: string; voteType: string }>;
agreeVoters?: string[];
disagreeVoters?: string[];
pendingVoters?: string[];
canVote?: boolean;
problemMessage?: string;
proposerId: number;
createdAt: string;
status: string;
}>;
}>>(`${API_BASE_URL}/api/v3/cross-review/documents/${documentId}/proposals`, {
params: {
page,
pageSize
},
headers: {
'Content-Type': 'application/json',
'Authorization': `Bearer ${token}`
}
});
const data = response.data;
// console.log('最原始的返回data', data);
// 处理新的数据结构,支持分页
const responseData = data.data || data;
const pagination = data.pagination;
const pageData = unwrapResultEnvelope<{
total: number;
page: number;
pageSize: number;
items: Array<{
proposalId: string | number;
evaluationPointName: string;
proposedScore: number;
reason: string;
proposer: string;
votes?: Array<{ voter: string; voteType: string }>;
agreeVoters?: string[];
disagreeVoters?: string[];
pendingVoters?: string[];
canVote?: boolean;
problemMessage?: string;
proposerId: number;
createdAt: string;
status: string;
}>;
}>(response.data);
// 定义后端返回的数据项类型
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;
proposer_id: number;
created_at: string;
status: string;
}
// 适配后端返回结构,使用新字段
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,
const opinions: CrossCheckingOpinion[] = Array.isArray(pageData?.items) ? pageData.items.map((item) => ({
proposal_id: item.proposalId,
evaluation_point_name: item.evaluationPointName,
proposed_score: item.proposedScore,
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 || '',
proposer_id: item.proposer_id,
created_at: item.created_at,
votes: (item.votes || []).map((vote) => ({ voter: vote.voter, vote_type: vote.voteType })),
agree_voters: item.agreeVoters || [],
disagree_voters: item.disagreeVoters || [],
pending_voters: item.pendingVoters || [],
can_vote: item.canVote ?? false,
problem_message: item.problemMessage || '',
proposer_id: item.proposerId,
created_at: item.createdAt,
status: item.status
})) : [];
return {
data: {
opinions,
total: pagination?.total || opinions.length
total: pageData?.total || opinions.length
}
};
} catch (error) {
@@ -335,31 +360,29 @@ export async function performOpinionAction(
switch (actionData.action) {
case 'agree':
message = '已赞同该意见';
endpoint = `${API_BASE_URL}/api/v2/cross_review/proposals/${actionData.opinionId}/votes`;
requestBody = { vote_type: 'agree', voter_id: userInfo?.user_id };
endpoint = `${API_BASE_URL}/api/v3/cross-review/proposals/${actionData.opinionId}/votes`;
requestBody = { voteType: 'agree' };
break;
case 'disagree':
message = '已反对该意见';
endpoint = `${API_BASE_URL}/api/v2/cross_review/proposals/${actionData.opinionId}/votes`;
requestBody = { vote_type: 'disagree', voter_id: userInfo?.user_id };
endpoint = `${API_BASE_URL}/api/v3/cross-review/proposals/${actionData.opinionId}/votes`;
requestBody = { voteType: 'disagree' };
break;
case 'withdraw_vote':
message = '已撤销投票';
// 撤销投票的接口,根据实际API调整
endpoint = `${API_BASE_URL}/api/v2/cross_review/proposals/${actionData.opinionId}/votes`;
requestBody = { vote_type: 'cancel', voter_id: userInfo?.user_id };
endpoint = `${API_BASE_URL}/api/v3/cross-review/proposals/${actionData.opinionId}/votes`;
requestBody = { voteType: 'cancel' };
break;
case 'withdraw_opinion':
message = '已撤销意见';
// 撤销意见的接口,根据实际API调整
endpoint = `${API_BASE_URL}/api/v2/cross_review/proposals/${actionData.opinionId}`;
endpoint = `${API_BASE_URL}/api/v3/cross-review/proposals/${actionData.opinionId}`;
requestBody = {};
break;
default:
throw new Error('无效的操作类型');
}
const response = actionData.action === 'withdraw_opinion'
await (actionData.action === 'withdraw_opinion'
? await axios.delete(endpoint, {
headers: {
'Content-Type': 'application/json',
@@ -371,11 +394,7 @@ export async function performOpinionAction(
'Content-Type': 'application/json',
'Authorization': `Bearer ${token}`
}
});
const data = response.data;
console.log('返回的意见列表数据',data);
}));
return {
data: {
@@ -412,8 +431,7 @@ export async function performOpinionAction(
* @param frontendJWT JWT token
* @returns 完成评查结果
*
* 🔥 接口文档: auth_doc/交叉评查接口文档(1).md 接口10
* 📍 API地址: POST /admin/v2/cross_review/tasks/{task_id}/documents/{document_id}/complete
* 📍 API地址: POST /api/v3/cross-review/tasks/{task_id}/documents/{document_id}/complete
*/
export async function confirmReviewResults(
taskId: string | number,
@@ -428,10 +446,13 @@ export async function confirmReviewResults(
return { error: '文档ID不能为空', status: 400 };
}
// 调用后端API确认文档审核完成
// 接口: POST /admin/v2/cross_review/tasks/{task_id}/documents/{document_id}/complete
const response = await axios.post(
`${API_BASE_URL}/admin/v2/cross_review/tasks/${taskId}/documents/${documentId}/complete`,
const response = await axios.post<ResultEnvelope<{
taskId?: number;
documentId?: number;
taskStatus?: string;
auditStatus?: number;
}>>(
`${API_BASE_URL}/api/v3/cross-review/tasks/${taskId}/documents/${documentId}/complete`,
{}, // 无需请求体
{
headers: {
@@ -441,15 +462,16 @@ export async function confirmReviewResults(
}
);
const data = response.data;
const data = response.data?.data || response.data;
// 检查响应是否成功
if (data?.success || data?.code === 0) {
if (data) {
return {
data: {
task_id: data.task_id || taskId,
document_id: data.document_id || documentId,
message: data.message || '文档评查已完成'
task_id: data.taskId || taskId,
document_id: data.documentId || documentId,
task_status: data.taskStatus,
audit_status: data.auditStatus,
message: '文档评查已完成'
}
};
}
@@ -457,7 +479,7 @@ export async function confirmReviewResults(
// 数据为空或格式不正确
console.error('❌ [confirmReviewResults] API响应数据异常:', data);
return {
error: data?.message || '确认文档审核失败',
error: '确认文档审核失败',
status: 500
};
@@ -491,26 +513,30 @@ export async function checkProposalVotes(
// 获取JWT token
const token = await safeGetJWT(jwtToken);
const requestData = {
document_id: documentId
};
const response = await axios.post(`${API_BASE_URL}/api/v2/cross_review/proposals/document/check_pending_votes`, requestData, {
const response = await axios.get<ResultEnvelope<{
hasPendingVotes?: boolean;
pendingProposals?: Array<{ evaluationPointName: string; pendingVotersNum: number }>;
}>>(`${API_BASE_URL}/api/v3/cross-review/documents/${documentId}/pending-votes`, {
headers: {
'Content-Type': 'application/json',
'Authorization': `Bearer ${token}`
}
});
const data = response.data;
console.log("检查投票数据",data);
const data = unwrapResultEnvelope<{
hasPendingVotes?: boolean;
pendingProposals?: Array<{ evaluationPointName: string; pendingVotersNum: number }>;
}>(response.data);
return {
data: {
success: true,
message: '检查成功',
data: data
data: {
pending_proposals: (data?.pendingProposals || []).map((item) => ({
evaluation_point_name: item.evaluationPointName,
pending_voters_num: item.pendingVotersNum
}))
}
}
};
} catch (error) {
@@ -533,4 +559,3 @@ export async function checkProposalVotes(
};
}
}