fix: 年度制修订各部门主动上报流程部所联络人汇总没数据问题
This commit is contained in:
+1
-5
@@ -276,9 +276,6 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
|
||||
throw new JeroBootException("任务不存在");
|
||||
}
|
||||
String executionId = taskService.createTaskQuery().taskId(taskId).singleResult().getExecutionId();
|
||||
// 根据当前执行Id获取所有子执行Id
|
||||
List<String> executionIdList = actFlowCommonService.getAllChildExecutionIds(executionId);
|
||||
executionIdList.add(executionId);
|
||||
AnnualReportDataVO annualReportDataVO = new AnnualReportDataVO();
|
||||
// 使用流程引擎根据taskId找到流程实例Id
|
||||
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
|
||||
@@ -316,11 +313,10 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
|
||||
break;
|
||||
case CONTACT_USER_COLLECT:
|
||||
wrapper.eq(ProcessEsAnnualReport::getContactUser, userId);
|
||||
wrapper.eq(ProcessEsAnnualReport::getExecutionId, executionId);
|
||||
break;
|
||||
case CONTACT_USER_LEADER_APPROVAL:
|
||||
wrapper.eq(ProcessEsAnnualReport::getContactUserLeaderLeader, userId);
|
||||
wrapper.in(ProcessEsAnnualReport::getExecutionId, executionIdList);
|
||||
wrapper.in(ProcessEsAnnualReport::getExecutionId, executionId);
|
||||
break;
|
||||
case STANDARD_ENGINEER_COLLECT:
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user