完善卷宗和合同的数据隔离的效果

This commit is contained in:
2025-06-03 21:06:48 +08:00
parent 057563ba5e
commit 87ad3376fe
10 changed files with 326 additions and 108 deletions
+15 -8
View File
@@ -58,6 +58,7 @@ interface AuditStatus {
document_id: string | number;
evaluation_point_id: string | number;
edit_audit_status: number;
message: string;
[key: string]: unknown;
}
@@ -205,13 +206,13 @@ export async function getReviewPoints(fileId: string) {
const manualReviewPointsData = extractApiData<AuditStatus[]>(manualReviewPointsResponse.data);
// 构建评查点ID到editAuditStatus的映射
const editAuditStatusMap = new Map<string | number, {id: string | number, status: number}>();
const editAuditStatusMap = new Map<string | number, {id: string | number, status: number, message: string}>();
// 如果有查询结果,则根据evaluation_point_id索引到对应数据
if (manualReviewPointsData && Array.isArray(manualReviewPointsData)) {
manualReviewPointsData.forEach(auditStatus => {
if (auditStatus.evaluation_point_id && auditStatus.edit_audit_status !== undefined) {
editAuditStatusMap.set(auditStatus.evaluation_point_id, {id: auditStatus.id, status: auditStatus.edit_audit_status});
editAuditStatusMap.set(auditStatus.evaluation_point_id, {id: auditStatus.id, status: auditStatus.edit_audit_status, message: auditStatus.message});
}
});
}
@@ -220,7 +221,7 @@ export async function getReviewPoints(fileId: string) {
if (manualReviewPointsIds.length > 0) {
manualReviewPointsIds.forEach(pointId => {
if (!editAuditStatusMap.has(pointId)) {
editAuditStatusMap.set(pointId, {id: '', status: 0});
editAuditStatusMap.set(pointId, {id: '', status: 0, message: ''});
}
});
}
@@ -247,7 +248,7 @@ export async function getReviewPoints(fileId: string) {
const resultData: ReviewPointResult[] = evaluationResultsData.map(result => {
const point = pointsMap.get(result.evaluation_point_id) || {} as EvaluationPoint;
const group = groupsMap.get(point.evaluation_point_groups_id || 0) || {} as EvaluationPointGroup;
const editAuditStatus = editAuditStatusMap.get(result.evaluation_point_id) || {id: '', status: 0};
const editAuditStatus = editAuditStatusMap.get(result.evaluation_point_id) || {id: '', status: 0, message: ''};
// 评查结果内容改成由evaluated_point_results_log中获取
const evaluatedPointResultsLog = result.evaluated_point_results_log || {};
@@ -304,6 +305,7 @@ export async function getReviewPoints(fileId: string) {
pointId: point.id,
editAuditStatusId: editAuditStatus.id,
editAuditStatus: editAuditStatus.status,
editAuditStatusMessage: editAuditStatus.message,
title: message,
pointName: point.name || '',
groupName: group.name || '',
@@ -667,8 +669,8 @@ export async function updateReviewResult(resultId: string, editAuditStatusId: st
// 构建要更新的数据,保留原有字段
const updatedEvaluatedResults = {
...currentEvaluatedResults,
// 如果是重新审核操作,不更新result,只更新message
...(isReview ? { message } : { result: result === 'true' ? true : false, message }),
// 如果是重新审核操作,不更新resultmessage
...(isReview ? {} : { result: result === 'true' ? true : false, message }),
};
const updatedData = {
@@ -696,7 +698,11 @@ export async function updateReviewResult(resultId: string, editAuditStatusId: st
// 更新现有审核状态记录
const auditStatusResponse = await postgrestPut(
'audit_status',
{ edit_audit_status: editAuditStatusValue },
{
edit_audit_status: editAuditStatusValue,
// 重新审核时不更新message
...(isReview ? {} : { message })
},
{ id: editAuditStatusId }
);
@@ -714,7 +720,8 @@ export async function updateReviewResult(resultId: string, editAuditStatusId: st
document_id: documentId,
evaluation_point_id: evaluationPointId,
evaluation_result_id: resultId,
edit_audit_status: editAuditStatusValue
edit_audit_status: editAuditStatusValue,
message: isReview ? '' : message
};
// 使用postgrestPost创建新记录