ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(稽查延期申请流程): 79733

Browse Source
This commit is contained in:
yjz
2023-12-29 16:54:00 +08:00
parent 1bbce46b09
commit f382c56517
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java
+11 -1
View File
@@ -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<EnterpriseStandardInspectDelay> enterpriseStandardInspectDelayList = new ArrayList<>();
for (ProcessEsInspectDelayApply processEsInspectDelayApply : list) {
enterpriseStandardInspectService.update(
new LambdaUpdateWrapper<EnterpriseStandardInspect>()
.eq(EnterpriseStandardInspect::getId, processEsInspectDelayApply.getInspectId())
.set(EnterpriseStandardInspect::getPlanInspectDate, processEsInspectDelayApply.getRequestDelayDate()));
EnterpriseStandardInspectDelay enterpriseStandardInspectDelay = new EnterpriseStandardInspectDelay();
enterpriseStandardInspectDelay.setInspectId(processEsInspectDelayApply.getInspectId());
enterpriseStandardInspectDelay.setRequestDelayDate(processEsInspectDelayApply.getRequestDelayDate());