From f382c565170e30d401f9616605c5ac1019ba51df Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 29 Dec 2023 16:54:00 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=A8=BD=E6=9F=A5=E5=BB=B6=E6=9C=9F?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B):=2079733?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EsInspectDelayApplyFlowServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java index 832f43a2..8c89aee6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java @@ -19,8 +19,10 @@ import com.jero.modules.activiti.process.esinspectdelayapply.vo.EsInspectDelayAp import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.service.ProcessNodeLinkService; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectDelayService; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.ProcessEngine; import org.activiti.engine.ProcessEngines; @@ -52,6 +54,7 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF private final ProcessApprovalRecordService processApprovalRecordService; private final ProcessDraftService processDraftService; private final ProcessNodeLinkService processNodeLinkService; + private final EnterpriseStandardInspectService enterpriseStandardInspectService; private final IProcessEsInspectDelayApplyService processEsInspectDelayApplyService; private final EnterpriseStandardInspectDelayService enterpriseStandardInspectDelayService; @@ -59,12 +62,14 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF ProcessApprovalRecordService processApprovalRecordService, ProcessDraftService processDraftService, ProcessNodeLinkService processNodeLinkService, + EnterpriseStandardInspectService enterpriseStandardInspectService, IProcessEsInspectDelayApplyService processEsInspectDelayApplyService, EnterpriseStandardInspectDelayService enterpriseStandardInspectDelayService) { this.processAllService = processAllService; this.processApprovalRecordService = processApprovalRecordService; this.processDraftService = processDraftService; this.processNodeLinkService = processNodeLinkService; + this.enterpriseStandardInspectService = enterpriseStandardInspectService; this.processEsInspectDelayApplyService = processEsInspectDelayApplyService; this.enterpriseStandardInspectDelayService = enterpriseStandardInspectDelayService; } @@ -266,7 +271,7 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())); // 判断是否是最后一个节点 if (isLastNode(processAll.getProcessInstanceId())){ - // 稽查延期申请流程 生成数据 企业标准稽查延期 + // 稽查延期申请流程 更新计划稽查日期 生成企业标准稽查延期数据 saveDataToInspect(processAll.getProjectId()); } } @@ -278,6 +283,11 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF .eq(ProcessEsInspectDelayApply::getProjectId, projectId)); List enterpriseStandardInspectDelayList = new ArrayList<>(); for (ProcessEsInspectDelayApply processEsInspectDelayApply : list) { + enterpriseStandardInspectService.update( + new LambdaUpdateWrapper() + .eq(EnterpriseStandardInspect::getId, processEsInspectDelayApply.getInspectId()) + .set(EnterpriseStandardInspect::getPlanInspectDate, processEsInspectDelayApply.getRequestDelayDate())); + EnterpriseStandardInspectDelay enterpriseStandardInspectDelay = new EnterpriseStandardInspectDelay(); enterpriseStandardInspectDelay.setInspectId(processEsInspectDelayApply.getInspectId()); enterpriseStandardInspectDelay.setRequestDelayDate(processEsInspectDelayApply.getRequestDelayDate());