diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index 528e38fc..33462ce1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java @@ -509,6 +509,17 @@ public class ProcessProjectAssessService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId); + wrapper.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId); + List projectAssessTermUsers = processProjectAssessTermUserService.list(wrapper); + List moduleOwnerList = projectAssessTermUsers.stream() + .map(ProcessProjectAssessTermUser::getModuleOwner) + .filter(Objects::nonNull) + .distinct().collect(Collectors.toList()); + List processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); List allTermUserList = new ArrayList<>(); for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) { @@ -519,25 +530,7 @@ public class ProcessProjectAssessService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId); - wrapper.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId); - List projectAssessTermUsers = processProjectAssessTermUserService.list(wrapper); - List moduleOwnerList = projectAssessTermUsers.stream() - .map(ProcessProjectAssessTermUser::getModuleOwner) - .filter(Objects::nonNull) - .distinct().collect(Collectors.toList()); - ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId); - // 完成任务 - String taskId = processDTO.getTaskId(); - Map variables = new HashMap<>(); - variables.put(ProcessProjectAssessCommon.PASS, pass); - variables.put(ProcessProjectAssessCommon.MODULE_OWNER_LIST, moduleOwnerList); - taskService.complete(taskId, variables); - ThreadLocalUtil.remove(); if (!Objects.equals(userId,originUserId)){ LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId); @@ -551,7 +544,18 @@ public class ProcessProjectAssessService extends ServiceImpl variables = new HashMap<>(); + variables.put(ProcessProjectAssessCommon.PASS, pass); + if (!pass){ + runtimeService.setVariable(executionId,ProcessProjectAssessCommon.MODULE_OWNER_LIST,moduleOwnerList); + } + ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId); + taskService.complete(taskId, variables); + ThreadLocalUtil.remove(); } //模块负责人修改 private void mkfzrxgApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass) {