feat: scc主流程所有节点回显

This commit is contained in:
2024-07-15 16:30:53 +08:00
parent e123823ff5
commit d13419abc4
@@ -213,7 +213,6 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
LambdaUpdateWrapper<ProcessStandardComplianceCheckDetail> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<ProcessStandardComplianceCheckDetail> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(ProcessStandardComplianceCheckDetail::getId, ids); updateWrapper.in(ProcessStandardComplianceCheckDetail::getId, ids);
updateWrapper.set(ProcessStandardComplianceCheckDetail::getDesignEngineer, null); updateWrapper.set(ProcessStandardComplianceCheckDetail::getDesignEngineer, null);
updateWrapper.set(ProcessStandardComplianceCheckDetail::getProcessInstanceId, null);
sccDetailService.update(updateWrapper); sccDetailService.update(updateWrapper);
runtimeService.setVariable(processInstanceId, PASS, false); runtimeService.setVariable(processInstanceId, PASS, false);
break; break;
@@ -313,6 +312,11 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
runtimeService.setVariable(processInstanceId, DISTRIBUTE, distributeFlag); runtimeService.setVariable(processInstanceId, DISTRIBUTE, distributeFlag);
runtimeService.setVariable(processInstanceId, UNALLOCATED_QUANTITY, unallocatedQuantity); runtimeService.setVariable(processInstanceId, UNALLOCATED_QUANTITY, unallocatedQuantity);
break; break;
case DESIGNER_ENGINEER_EVALUATION:
sccDetailService.updateBatchById(detailInfoList);
break;
case MAIN_CHECK_USER_COLLECT:
break;
} }
// 审批节点 // 审批节点
actFlowCommonService.completeTask(taskId, curUserId); actFlowCommonService.completeTask(taskId, curUserId);
@@ -354,11 +358,14 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
detailQueryWrapper.eq(ProcessStandardComplianceCheckDetail::getCheckId, scc.getId()); detailQueryWrapper.eq(ProcessStandardComplianceCheckDetail::getCheckId, scc.getId());
List<ProcessStandardComplianceCheckDetail> detailList = sccDetailService.list(detailQueryWrapper); List<ProcessStandardComplianceCheckDetail> detailList = sccDetailService.list(detailQueryWrapper);
String xmlNodeId = record.getNodeId(); String xmlNodeId = record.getNodeId();
processSccVO.setStandardInfo(scc);
// 设置流程信息 // 设置流程信息
switch (xmlNodeId) { switch (xmlNodeId) {
case STANDARD_ENGINEER_START: case STANDARD_ENGINEER_START:
case DEPT_USER_DISTRIBUTE: case DEPT_USER_DISTRIBUTE:
processSccVO.setStandardInfo(scc); case MAIN_CHECK_USER_COLLECT:
case COUNTERSIGN:
case MANAGER_APPROVAL:
processSccVO.setDetailInfoList(detailList); processSccVO.setDetailInfoList(detailList);
break; break;
case MAIN_CHECK_USER_DISTRIBUTE: case MAIN_CHECK_USER_DISTRIBUTE:
@@ -368,11 +375,12 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
StrUtil.isBlank(detail.getDesignEngineer())).collect(Collectors.toList()); StrUtil.isBlank(detail.getDesignEngineer())).collect(Collectors.toList());
processSccVO.setDetailInfoList(detailList); processSccVO.setDetailInfoList(detailList);
break; break;
case MAIN_CHECK_USER_COLLECT: case DESIGNER_ENGINEER_EVALUATION:
break; case MAIN_CHECK_USER_APPROVAL:
case COUNTERSIGN: detailList = detailList.stream()
break; .filter(detail -> processInstanceId.equals(detail.getProcessInstanceId()))
case MANAGER_APPROVAL: .collect(Collectors.toList());
processSccVO.setDetailInfoList(detailList);
break; break;
} }
result.setBusinessInfoDTO(processSccVO); result.setBusinessInfoDTO(processSccVO);