diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml index 39dce910..42398a1e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml @@ -39,7 +39,7 @@ select - + , ppstu.id term_user_id, @@ -84,7 +84,7 @@ select - + , ppstu.id term_user_id, diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java index cb300e65..9dbeead3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java @@ -175,7 +175,7 @@ public class ProcessProjectStandardService extends ServiceImpl moduleOwnerList = new ArrayList<>(); + List responsibleUnitLeaderList = new ArrayList<>(); for (ProcessProjectStandardTermUser termUser : termUsers) { moduleOwnerList.add(termUser.getModuleOwner()); + responsibleUnitLeaderList.add(termUser.getResponsibleUnitLeader()); String assessResults1 = termUser.getAssessResults(); if (AssessCommon.NOT_COMPLIANT.equals(assessResults1)) { assessResults = AssessCommon.NOT_COMPLIANT; @@ -209,13 +211,25 @@ public class ProcessProjectStandardService extends ServiceImpl userNameList = new ArrayList<>(); - moduleOwnerList.stream() - .filter(Objects::nonNull) - .distinct().forEach(i ->{ - userNameList.add(userNameMap.get(i)) ; - }); - term.setModuleOwner(String.join(",", userNameList)); + if (ProcessProjectStandardCommon.BSZGJLDSP_.equals(taskDefinitionKey)){ + List userNameList = new ArrayList<>(); + moduleOwnerList.stream() + .filter(Objects::nonNull) + .distinct().forEach(i ->{ + userNameList.add(userNameMap.get(i)) ; + }); + term.setModuleOwner(String.join(",", userNameList)); + } + if (ProcessProjectStandardCommon.FGGCSSP.equals(taskDefinitionKey)){ + List userNameList = new ArrayList<>(); + responsibleUnitLeaderList.stream() + .filter(Objects::nonNull) + .distinct().forEach(i ->{ + userNameList.add(userNameMap.get(i)) ; + }); + term.setResponsibleUnitLeader(String.join(",", userNameList)); + } + term.setProjectApprovalFlag(projectApprovalFlag); term.setAssessResults(assessResults); term.setAssessResults_dictText(assessResultsMap.get(assessResults));