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:
lijiarao
2024-02-03 18:06:31 +08:00
parent 8e8196c5c8
commit 46a9e76fc1
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+6 -1
View File
@@ -953,6 +953,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
List<ProcessProjectAssessTerm> processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); List<ProcessProjectAssessTerm> processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList();
List<ProcessProjectAssessTermUser> allTermUserList = new ArrayList<>(); List<ProcessProjectAssessTermUser> allTermUserList = new ArrayList<>();
String moduleOwner = null;
for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) { for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) {
ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser(); ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser();
termUser.setId(processProjectAssessTerm.getTermUserId()); termUser.setId(processProjectAssessTerm.getTermUserId());
@@ -969,6 +970,8 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
termUser.setAssessTime(date); termUser.setAssessTime(date);
allTermUserList.add(termUser); allTermUserList.add(termUser);
String moduleOwner1 = processProjectAssessTerm.getModuleOwner();
moduleOwner = moduleOwner1;
} }
processProjectAssessTermUserService.updateBatchById(allTermUserList); processProjectAssessTermUserService.updateBatchById(allTermUserList);
ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId); ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
@@ -976,7 +979,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
// 完成任务 // 完成任务
String taskId = processDTO.getTaskId(); String taskId = processDTO.getTaskId();
Map<String, Object> variables = new HashMap<>(); Map<String, Object> variables = new HashMap<>();
variables.put(ProcessProjectAssessCommon.MODULE_OWNER, processProjectAssessTermList.get(0).getModuleOwner()); if (StringUtils.isNotBlank(moduleOwner)){
variables.put(ProcessProjectAssessCommon.MODULE_OWNER, moduleOwner);
}
taskService.complete(taskId,variables); taskService.complete(taskId,variables);
ThreadLocalUtil.remove(); ThreadLocalUtil.remove();