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

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

Browse Source
This commit is contained in:
yjz
2024-01-17 18:00:53 +08:00
parent 06b47dc1e8
commit f4b0e6e508
1 changed files with 22 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
+22 -1
View File
@@ -11,6 +11,9 @@ import com.jero.modules.activiti.enums.FinishFlagEnum;
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
import com.jero.modules.activiti.process.common.enums.ProcessType;
import com.jero.modules.activiti.process.common.service.ProcessDraftService;
import com.jero.modules.activiti.process.esinspect.common.EsInspectCommon;
import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect;
import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectService;
import com.jero.modules.activiti.process.esinspectdelayapply.common.EsInspectDelayApplyCommon;
import com.jero.modules.activiti.process.esinspectdelayapply.entity.ProcessEsInspectDelayApply;
import com.jero.modules.activiti.process.esinspectdelayapply.service.IEsInspectDelayApplyFlowService;
@@ -55,6 +58,7 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF
private final ProcessApprovalRecordService processApprovalRecordService;
private final ProcessDraftService processDraftService;
private final ProcessNodeLinkService processNodeLinkService;
private final IProcessEsInspectService processEsInspectService;
private final EnterpriseStandardInspectService enterpriseStandardInspectService;
private final IProcessEsInspectDelayApplyService processEsInspectDelayApplyService;
private final EnterpriseStandardInspectDelayService enterpriseStandardInspectDelayService;
@@ -63,6 +67,7 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF
ProcessApprovalRecordService processApprovalRecordService,
ProcessDraftService processDraftService,
ProcessNodeLinkService processNodeLinkService,
IProcessEsInspectService processEsInspectService,
EnterpriseStandardInspectService enterpriseStandardInspectService,
IProcessEsInspectDelayApplyService processEsInspectDelayApplyService,
EnterpriseStandardInspectDelayService enterpriseStandardInspectDelayService) {
@@ -70,6 +75,7 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF
this.processApprovalRecordService = processApprovalRecordService;
this.processDraftService = processDraftService;
this.processNodeLinkService = processNodeLinkService;
this.processEsInspectService = processEsInspectService;
this.enterpriseStandardInspectService = enterpriseStandardInspectService;
this.processEsInspectDelayApplyService = processEsInspectDelayApplyService;
this.enterpriseStandardInspectDelayService = enterpriseStandardInspectDelayService;
@@ -288,10 +294,25 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF
.eq(ProcessEsInspectDelayApply::getProjectId, projectId));
List<EnterpriseStandardInspectDelay> enterpriseStandardInspectDelayList = new ArrayList<>();
for (ProcessEsInspectDelayApply processEsInspectDelayApply : list) {
// 查询之前稽查状态
String inspectStatus = EsInspectCommon.INSPECT_STATUS_1;
ProcessEsInspect processEsInspect = processEsInspectService.getOne(
new LambdaQueryWrapper<ProcessEsInspect>()
.eq(ProcessEsInspect::getInspectId, processEsInspectDelayApply.getInspectId()), false);
if (!Objects.isNull(processEsInspect)){
int size = processDraftService.count(new LambdaQueryWrapper<ProcessDraft>()
.eq(ProcessDraft::getProjectId, processEsInspect.getProjectId())
.and(qw -> qw.ne(ProcessDraft::getSaveSource, "3")
.or().isNull(ProcessDraft::getSaveSource)));
if (size == 0){
inspectStatus = EsInspectCommon.INSPECT_STATUS_2;
}
}
enterpriseStandardInspectService.update(
new LambdaUpdateWrapper<EnterpriseStandardInspect>()
.eq(EnterpriseStandardInspect::getId, processEsInspectDelayApply.getInspectId())
.set(EnterpriseStandardInspect::getPlanInspectDate, processEsInspectDelayApply.getRequestDelayDate()));
.set(EnterpriseStandardInspect::getPlanInspectDate, processEsInspectDelayApply.getRequestDelayDate())
.set(EnterpriseStandardInspect::getInspectStatus, inspectStatus));
EnterpriseStandardInspectDelay enterpriseStandardInspectDelay = new EnterpriseStandardInspectDelay();
enterpriseStandardInspectDelay.setInspectId(processEsInspectDelayApply.getInspectId());