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

fix: 年度制修订各部门主动上报流程部所联络人汇总没数据问题

Browse Source
This commit is contained in:
mzaxd
2024-01-16 17:03:08 +08:00
parent 59e3928b4d
commit 45c3298779
1 changed files with 1 additions and 5 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
+1 -5
View File
@@ -276,9 +276,6 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
throw new JeroBootException("任务不存在"); throw new JeroBootException("任务不存在");
} }
String executionId = taskService.createTaskQuery().taskId(taskId).singleResult().getExecutionId(); String executionId = taskService.createTaskQuery().taskId(taskId).singleResult().getExecutionId();
// 根据当前执行Id获取所有子执行Id
List<String> executionIdList = actFlowCommonService.getAllChildExecutionIds(executionId);
executionIdList.add(executionId);
AnnualReportDataVO annualReportDataVO = new AnnualReportDataVO(); AnnualReportDataVO annualReportDataVO = new AnnualReportDataVO();
// 使用流程引擎根据taskId找到流程实例Id // 使用流程引擎根据taskId找到流程实例Id
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
@@ -316,11 +313,10 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
break; break;
case CONTACT_USER_COLLECT: case CONTACT_USER_COLLECT:
wrapper.eq(ProcessEsAnnualReport::getContactUser, userId); wrapper.eq(ProcessEsAnnualReport::getContactUser, userId);
wrapper.eq(ProcessEsAnnualReport::getExecutionId, executionId);
break; break;
case CONTACT_USER_LEADER_APPROVAL: case CONTACT_USER_LEADER_APPROVAL:
wrapper.eq(ProcessEsAnnualReport::getContactUserLeaderLeader, userId); wrapper.eq(ProcessEsAnnualReport::getContactUserLeaderLeader, userId);
wrapper.in(ProcessEsAnnualReport::getExecutionId, executionIdList); wrapper.in(ProcessEsAnnualReport::getExecutionId, executionId);
break; break;
case STANDARD_ENGINEER_COLLECT: case STANDARD_ENGINEER_COLLECT:
break; break;