diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index 2d5c6b33..90754283 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -213,7 +213,6 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.in(ProcessStandardComplianceCheckDetail::getId, ids); updateWrapper.set(ProcessStandardComplianceCheckDetail::getDesignEngineer, null); - updateWrapper.set(ProcessStandardComplianceCheckDetail::getProcessInstanceId, null); sccDetailService.update(updateWrapper); runtimeService.setVariable(processInstanceId, PASS, false); break; @@ -313,6 +312,11 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl detailList = sccDetailService.list(detailQueryWrapper); String xmlNodeId = record.getNodeId(); + processSccVO.setStandardInfo(scc); // 设置流程信息 switch (xmlNodeId) { case STANDARD_ENGINEER_START: case DEPT_USER_DISTRIBUTE: - processSccVO.setStandardInfo(scc); + case MAIN_CHECK_USER_COLLECT: + case COUNTERSIGN: + case MANAGER_APPROVAL: processSccVO.setDetailInfoList(detailList); break; case MAIN_CHECK_USER_DISTRIBUTE: @@ -368,11 +375,12 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl processInstanceId.equals(detail.getProcessInstanceId())) + .collect(Collectors.toList()); + processSccVO.setDetailInfoList(detailList); break; } result.setBusinessInfoDTO(processSccVO);