diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignTaskExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignTaskExecutor.java index 572de401..2c5d565a 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignTaskExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignTaskExecutor.java @@ -13,8 +13,6 @@ import org.qinan.safetyeval.client.dto.SingleResponse; import org.qinan.safetyeval.client.dto.institution.EditSignTaskSaveCmd; import org.qinan.safetyeval.client.dto.institution.EvalSignTaskPageQuery; import org.qinan.safetyeval.client.dto.institution.EvalSignTaskSaveCmd; -import org.qinan.safetyeval.domain.constant.ArchiveTypeEnum; -import org.qinan.safetyeval.domain.constant.ProjectArchiveFileSourceEnum; import org.qinan.safetyeval.domain.constant.ProjectRoleEnum; import org.qinan.safetyeval.domain.constant.ProjectStageEnum; import org.qinan.safetyeval.domain.constant.SignTaskStatusEnum; @@ -29,9 +27,7 @@ import org.qinan.safetyeval.domain.service.EvalSignTaskDomainService; import org.qinan.safetyeval.domain.service.ProjectStageSyncService; import org.qinan.safetyeval.infrastructure.dataobject.*; import org.qinan.safetyeval.infrastructure.mapper.*; -import org.qinan.safetyeval.infrastructure.persistence.domainobject.EvalProjectArchiveFileDO; import org.qinan.safetyeval.infrastructure.persistence.mapper.EvalProjectArchiveFileMapper; -import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; import org.qinan.safetyeval.infrastructure.support.InstitutionOrgSupport; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -71,8 +67,6 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi { @Autowired private EvalProcessControlMapper evalProcessControlMapper; @Autowired - private EvalProjectArchiveFileMapper evalProjectArchiveFileMapper; - @Autowired private EvalProjectMemberMapper evalProjectMemberMapper; @Autowired private ProjectStageSyncService projectStageSyncService; @@ -165,8 +159,6 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi { .eq(EvalRiskParticipantDO::getProjectId, evalSignTaskDO.getProjectId()) .set(EvalRiskParticipantDO::getSignFileUrl, cmd.getSignerUrl()) .set(EvalRiskParticipantDO::getSignStatusCode, SignTaskStatusEnum.SIGNED.getCode())); - saveAutoArchiveFile(evalSignTaskDO, ArchiveTypeEnum.RISK_ANALYSIS, - ProjectStageEnum.RISK_ANALYSIS.getMsg() + "签字", cmd.getSignerUrl()); } if (ProjectStageEnum.PROJECT_GROUP.getVal().equals(evalSignTaskDO.getNodeCode())) { evalRiskParticipantMapper.update(new LambdaUpdateWrapper() @@ -175,8 +167,6 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi { .eq(EvalRiskParticipantDO::getProjectId, evalSignTaskDO.getProjectId()) .set(EvalRiskParticipantDO::getSignFileUrl, cmd.getSignerUrl()) .set(EvalRiskParticipantDO::getSignStatusCode, SignTaskStatusEnum.SIGNED.getCode())); - saveAutoArchiveFile(evalSignTaskDO, ArchiveTypeEnum.PROJECT_ORG_FILE, - ProjectStageEnum.PROJECT_GROUP.getMsg() + "签字", cmd.getSignerUrl()); } if (ProjectStageEnum.INTERNAL_REVIEW.getVal().equals(evalSignTaskDO.getNodeCode())) { @@ -185,8 +175,6 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi { .eq(EvalInternalReviewDO::getProjectId, evalSignTaskDO.getProjectId()) .set(EvalInternalReviewDO::getReviewerSignatureUrl, cmd.getSignerUrl()) .set(EvalInternalReviewDO::getReviewerSignatureTaskStatus, SignatureTaskStatusEnum.COMPLETED.getCode())); - saveAutoArchiveFile(evalSignTaskDO, ArchiveTypeEnum.REVIEW_RECORD, - ProjectStageEnum.INTERNAL_REVIEW.getMsg(), cmd.getSignerUrl()); } if (ProjectStageEnum.TECHNICAL_REVIEW.getVal().equals(evalSignTaskDO.getNodeCode())) { evalTechReviewMapper.update(new LambdaUpdateWrapper() @@ -194,8 +182,6 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi { .eq(EvalTechReviewDO::getProjectId, evalSignTaskDO.getProjectId()) .set(EvalTechReviewDO::getReviewerSignatureUrl, cmd.getSignerUrl()) .set(EvalTechReviewDO::getReviewerSignatureTaskStatus, SignatureTaskStatusEnum.COMPLETED.getCode())); - saveAutoArchiveFile(evalSignTaskDO, ArchiveTypeEnum.REVIEW_RECORD, - ProjectStageEnum.TECHNICAL_REVIEW.getMsg() , cmd.getSignerUrl()); } if (ProjectStageEnum.PROCESS_CONTROL.getVal().equals(evalSignTaskDO.getNodeCode())) { doProcessController(evalSignTaskDO, cmd); @@ -203,27 +189,6 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi { return SingleResponse.success(true); } - /** - * 签字完成后自动写入项目档案文件(来源:流程自动记录) - * - * @param evalSignTaskDO 签字任务 - * @param archiveType 档案类型 ArchiveTypeEnum - * @param fileName 文件名称 - * @param fileUrl 文件地址 - */ - private void saveAutoArchiveFile(EvalSignTaskDO evalSignTaskDO, ArchiveTypeEnum archiveType, String fileName, String fileUrl) { - EvalProjectArchiveFileDO archiveFileDO = new EvalProjectArchiveFileDO(); - archiveFileDO.setOrgId(evalSignTaskDO.getOrgId()); - archiveFileDO.setProjectId(String.valueOf(evalSignTaskDO.getProjectId())); - archiveFileDO.setFileUrl(fileUrl); - archiveFileDO.setFileName(fileName); - archiveFileDO.setArchiveType(archiveType.getCode()); - archiveFileDO.setBusinessNode(evalSignTaskDO.getNodeCode()); - archiveFileDO.setRecordSource(ProjectArchiveFileSourceEnum.AUTO_PROCESS_RECORD.getCode()); - archiveFileDO.setEnv(evalSignTaskDO.getEnv()); - InsertFieldDefaults.apply(archiveFileDO); - evalProjectArchiveFileMapper.insert(archiveFileDO); - } /** * doProcessController @@ -245,8 +210,6 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi { .set(EvalProcessControlDO::getReviewerSignatureUrl, cmd.getSignerUrl()) .set(EvalProcessControlDO::getControllerPersonnelSignTime, LocalDateTime.now()) .set(EvalProcessControlDO::getReviewerSignatureTaskStatus, SignatureTaskStatusEnum.COMPLETED.getCode())); - saveAutoArchiveFile(evalSignTaskDO, ArchiveTypeEnum.PROCESS_CONTROL, - ProjectStageEnum.PROCESS_CONTROL.getMsg() + "人签字", cmd.getSignerUrl()); } if (evalProcessControlDO.getReviewerSignatureTaskStatus().equals(code) && !evalProcessControlDO.getOrgHeadSignatureTaskStatus().equals(code)) { @@ -256,9 +219,6 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi { .set(EvalProcessControlDO::getOrgHeadSignatureUrl, cmd.getSignerUrl()) .set(EvalProcessControlDO::getControlTime, LocalDateTime.now()) .set(EvalProcessControlDO::getOrgHeadSignatureTaskStatus, SignatureTaskStatusEnum.COMPLETED.getCode())); - saveAutoArchiveFile(evalSignTaskDO, ArchiveTypeEnum.PROCESS_CONTROL, - ProjectStageEnum.ORG_HEAD_MSG + "签字", cmd.getSignerUrl()); - projectStageSyncService.onNodeCompleted(evalSignTaskDO.getProjectId(), ProjectStageEnum.PROCESS_CONTROL.getNode()); } }