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

update 法规合规评估流程-查询条款列表

Browse Source
This commit is contained in:
lijiarao
2024-01-18 14:16:57 +08:00
parent 0c7fa60fc6
commit 9dee3a93c5
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
+4 -4
View File
@@ -39,7 +39,7 @@
<select id="getByResponsibleUnitLeader" resultMap="BaseResultMap"> <select id="getByResponsibleUnitLeader" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List"> <include refid="Base_Column_List">
<property name="alias" value="ppat"/> <property name="alias" value="ppst"/>
</include> </include>
, ,
ppstu.id term_user_id, ppstu.id term_user_id,
@@ -61,7 +61,7 @@
<select id="getByModuleOwner" resultMap="BaseResultMap"> <select id="getByModuleOwner" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List"> <include refid="Base_Column_List">
<property name="alias" value="ppat"/> <property name="alias" value="ppst"/>
</include> </include>
, ,
ppstu.id term_user_id, ppstu.id term_user_id,
@@ -84,7 +84,7 @@
<select id="getByDesignEngineer" resultMap="BaseResultMap"> <select id="getByDesignEngineer" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List"> <include refid="Base_Column_List">
<property name="alias" value="ppat"/> <property name="alias" value="ppst"/>
</include> </include>
, ,
ppstu.id term_user_id, ppstu.id term_user_id,
@@ -105,7 +105,7 @@
<select id="getByStandardsEngineer" resultMap="BaseResultMap"> <select id="getByStandardsEngineer" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List"> <include refid="Base_Column_List">
<property name="alias" value="ppat"/> <property name="alias" value="ppst"/>
</include> </include>
, ,
ppstu.id term_user_id, ppstu.id term_user_id,
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+22 -8
View File
@@ -175,7 +175,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
//法规工程师审批 //法规工程师审批
case ProcessProjectStandardCommon.FGGCSSP: case ProcessProjectStandardCommon.FGGCSSP:
processProjectStandardTermList = termMapper.getByStandardsEngineer(processId); processProjectStandardTermList = termMapper.getByStandardsEngineer(processId);
list = termUserService.list(wrapper);
break; break;
//设计工程师补充工作令编号 //设计工程师补充工作令编号
case ProcessProjectStandardCommon.SJGCSBCGZLBH: case ProcessProjectStandardCommon.SJGCSBCGZLBH:
@@ -196,8 +196,10 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
String assessResults = AssessCommon.NOT_INVOLVED; String assessResults = AssessCommon.NOT_INVOLVED;
String projectApprovalFlag = YesOrNoEnum.NO.getValue(); String projectApprovalFlag = YesOrNoEnum.NO.getValue();
List<String> moduleOwnerList = new ArrayList<>(); List<String> moduleOwnerList = new ArrayList<>();
List<String> responsibleUnitLeaderList = new ArrayList<>();
for (ProcessProjectStandardTermUser termUser : termUsers) { for (ProcessProjectStandardTermUser termUser : termUsers) {
moduleOwnerList.add(termUser.getModuleOwner()); moduleOwnerList.add(termUser.getModuleOwner());
responsibleUnitLeaderList.add(termUser.getResponsibleUnitLeader());
String assessResults1 = termUser.getAssessResults(); String assessResults1 = termUser.getAssessResults();
if (AssessCommon.NOT_COMPLIANT.equals(assessResults1)) { if (AssessCommon.NOT_COMPLIANT.equals(assessResults1)) {
assessResults = AssessCommon.NOT_COMPLIANT; assessResults = AssessCommon.NOT_COMPLIANT;
@@ -209,13 +211,25 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
projectApprovalFlag = YesOrNoEnum.YES.getValue(); projectApprovalFlag = YesOrNoEnum.YES.getValue();
} }
} }
List<String> userNameList = new ArrayList<>(); if (ProcessProjectStandardCommon.BSZGJLDSP_.equals(taskDefinitionKey)){
moduleOwnerList.stream() List<String> userNameList = new ArrayList<>();
.filter(Objects::nonNull) moduleOwnerList.stream()
.distinct().forEach(i ->{ .filter(Objects::nonNull)
userNameList.add(userNameMap.get(i)) ; .distinct().forEach(i ->{
}); userNameList.add(userNameMap.get(i)) ;
term.setModuleOwner(String.join(",", userNameList)); });
term.setModuleOwner(String.join(",", userNameList));
}
if (ProcessProjectStandardCommon.FGGCSSP.equals(taskDefinitionKey)){
List<String> 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.setProjectApprovalFlag(projectApprovalFlag);
term.setAssessResults(assessResults); term.setAssessResults(assessResults);
term.setAssessResults_dictText(assessResultsMap.get(assessResults)); term.setAssessResults_dictText(assessResultsMap.get(assessResults));