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

fix: 年度计划各部门主动上报办理BUG

Browse Source
This commit is contained in:
mzaxd
2023-11-01 14:33:29 +08:00
parent e6dc32961e
commit 5b58db29b2
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+13 -8
View File
@@ -19,6 +19,7 @@ import com.jero.modules.activiti.process.esAnnualReport.entity.vo.AnnualReportFl
import com.jero.modules.activiti.process.esAnnualReport.mapper.ProcessEsAnnualReportMapper; import com.jero.modules.activiti.process.esAnnualReport.mapper.ProcessEsAnnualReportMapper;
import com.jero.modules.activiti.process.esAnnualReport.service.ProcessEsAnnualReportService; import com.jero.modules.activiti.process.esAnnualReport.service.ProcessEsAnnualReportService;
import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType; import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType;
import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeFlowUserVO;
import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessAllService;
import com.jero.modules.activiti.service.ProcessNodeLinkService; import com.jero.modules.activiti.service.ProcessNodeLinkService;
import com.jero.modules.activiti.service.ProcessNodeService; import com.jero.modules.activiti.service.ProcessNodeService;
@@ -237,8 +238,8 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
commonVO.setTaskId(process.getTaskId()); commonVO.setTaskId(process.getTaskId());
commonVO.setPrcMes(process.getPrcMes()); commonVO.setPrcMes(process.getPrcMes());
commonVO.setDueTime(process.getDueTime()); commonVO.setDueTime(process.getDueTime());
commonVO.setTaskId(taskId);
String processDescription = (String) runtimeService.getVariable(processInstanceId, "processDescription"); String processDescription = (String) runtimeService.getVariable(processInstanceId, "processDescription");
boolean distribute = (boolean) runtimeService.getVariable(processInstanceId, "distribute");
commonVO.setProcessDescription(processDescription); commonVO.setProcessDescription(processDescription);
annualReportDataVO.setCommonVO(commonVO); annualReportDataVO.setCommonVO(commonVO);
// 获取流程实例数据 // 获取流程实例数据
@@ -283,15 +284,19 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
} }
private AnnualReportFlowUserVO getProcessUserInfo(String processDefinitionId, String processInstanceId) { private AnnualReportFlowUserVO getProcessUserInfo(String processDefinitionId, String processInstanceId) {
//TODO 每个节点返回的人员信息应该是不同的
List<ProcessNode> nodeList = processNodeService.getNodeList(processDefinitionId, processInstanceId); List<ProcessNode> nodeList = processNodeService.getNodeList(processDefinitionId, processInstanceId);
AnnualReportFlowUserVO annualReportFlowUserVO = new AnnualReportFlowUserVO(); AnnualReportFlowUserVO annualReportFlowUserVO = new AnnualReportFlowUserVO();
Map<String, ProcessNode> userMap = nodeList.stream().collect(Collectors.toMap(ProcessNode::getVariableName, node -> node)); Map<String, ProcessNode> userMap = nodeList.stream()
annualReportFlowUserVO.setStandardEngineer(userMap.get("standardEngineer").getLinkUserIds()); .collect(Collectors.groupingBy(ProcessNode::getVariableName))
annualReportFlowUserVO.setContactUserList(userMap.get("contactUserList").getLinkUserIds()); .values()
annualReportFlowUserVO.setWorkGroupUserList(userMap.get("workGroupUserList").getLinkUserIds()); .stream()
annualReportFlowUserVO.setCollectUserLeader(userMap.get("collectUserLeader").getLinkUserIds()); .map(nodes -> nodes.get(0)) // 选择每组的第一个元素
annualReportFlowUserVO.setContactUserLeaderLeader(userMap.get("contactUserLeaderLeader").getLinkUserIds()); .collect(Collectors.toMap(ProcessNode::getVariableName, node -> node));
Optional.ofNullable(userMap.get("standardEngineer")).ifPresent(node -> annualReportFlowUserVO.setStandardEngineer(node.getLinkUserIds()));
Optional.ofNullable(userMap.get("contactUserList")).ifPresent(node -> annualReportFlowUserVO.setContactUserList(node.getLinkUserIds()));
Optional.ofNullable(userMap.get("workGroupUserList")).ifPresent(node -> annualReportFlowUserVO.setWorkGroupUserList(node.getLinkUserIds()));
Optional.ofNullable(userMap.get("collectUserLeader")).ifPresent(node -> annualReportFlowUserVO.setCollectUserLeader(node.getLinkUserIds()));
Optional.ofNullable(userMap.get("contactUserLeaderLeader")).ifPresent(node -> annualReportFlowUserVO.setContactUserLeaderLeader(node.getLinkUserIds()));
return annualReportFlowUserVO; return annualReportFlowUserVO;
} }