update 法规合规评估流程

laws-base/laws-base-api/jero-system-local-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java

@@ -350,4 +350,5 @@ public interface ISysBaseAPI extends CommonAPI {
      */
     List<DictModel> loadDictItemByKeyword(String dictCode, String keyword, Integer pageSize);
 
+    String translateByDictMap(Map<String, String> dictMap, String keys);
 }

laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java

@@ -33,6 +33,7 @@ import com.jero.modules.system.mapper.*;
 import com.jero.modules.system.service.*;
 import com.jero.modules.system.util.SecurityUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.sequence.KeepCommand;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jetbrains.annotations.NotNull;
@@ -1166,6 +1167,21 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 		return sysDictService.loadDict(dictCode, keyword, pageSize);
 	}
 
+	@Override
+	public String translateByDictMap(Map<String, String> dictMap, String keys) {
+		if (keys == null){
+			return null;
+		}
+		String[] keyList = keys.split(",");
+		List<String> resultList = new ArrayList<>();
+		for (String key : keyList) {
+			if (dictMap.containsKey(key)){
+				resultList.add(dictMap.get(key));
+			}
+		}
+		return String.join(",",resultList);
+	}
+
 	@Override
 	public Map<String, List<DictModel>> translateManyDict(String dictCodes, String keys) {
 		List<String> dictCodeList = Arrays.asList(dictCodes.split(","));

laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java

@@ -138,6 +138,12 @@ public class ProcessProjectStandardTerm {
     @ApiModelProperty(value="设计工程师")
     private String designEngineer;
 
+    /**
+     * 设计工程师
+     */
+    @ApiModelProperty(value="设计工程师")
+    private String designEngineer_dictText;
+
     /**
      * 抄送人员
      */

laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml

@@ -39,16 +39,15 @@
     
     <select id="getByResponsibleUnitLeader" resultMap="BaseResultMap">
       select
+      ppstu.id term_user_id,
+      ppstu.not_involved,
+      ppstu.assess_results,
+      ppstu.description,
+      ppstu.file_id,
+      ppstu.design_engineer,
       <include refid="Base_Column_List">
         <property name="alias" value="ppst"/>
       </include>
-      ,
-        ppstu.id term_user_id,
-        ppstu.not_involved,
-        ppstu.assess_results,
-        ppstu.description,
-        ppstu.file_id,
-        ppstu.design_engineer
       from process_project_standard_term ppst
              left join process_project_standard_term_user ppstu on ppst.id = ppstu.term_id
       where ppst.process_id = #{processId}
@@ -61,17 +60,16 @@
 
   <select id="getByModuleOwner" resultMap="BaseResultMap">
     select
+    ppstu.id term_user_id,
+    ppstu.not_involved,
+    ppstu.assess_results,
+    ppstu.model_series,
+    ppstu.description,
+    ppstu.file_id,
+    ppstu.design_engineer,
     <include refid="Base_Column_List">
       <property name="alias" value="ppst"/>
     </include>
-    ,
-      ppstu.id term_user_id,
-      ppstu.not_involved,
-      ppstu.assess_results,
-      ppstu.model_series,
-      ppstu.description,
-      ppstu.file_id,
-      ppstu.design_engineer
     from process_project_standard_term ppst
            left join process_project_standard_term_user ppstu on ppst.id = ppstu.term_id
     where ppst.process_id = #{processId}
@@ -85,10 +83,6 @@
 
   <select id="getByDesignEngineer" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List">
-      <property name="alias" value="ppst"/>
-    </include>
-    ,
     ppstu.id term_user_id,
     ppstu.not_involved,
     ppstu.module_owner,
@@ -96,7 +90,10 @@
     ppstu.model_series,
     ppstu.description,
     ppstu.file_id,
-    ppstu.design_engineer
+    ppstu.design_engineer,
+    <include refid="Base_Column_List">
+      <property name="alias" value="ppst"/>
+    </include>
     from process_project_standard_term ppst
     left join process_project_standard_term_user ppstu on ppst.id = ppstu.term_id
     where ppst.process_id = #{processId}
@@ -107,16 +104,15 @@
 
   <select id="getByStandardsEngineer" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List">
-      <property name="alias" value="ppst"/>
-    </include>
-    ,
     ppstu.id term_user_id,
     ppstu.not_involved,
     ppstu.assess_results,
     ppstu.description,
     ppstu.file_id,
     ppstu.design_engineer
+    <include refid="Base_Column_List">
+      <property name="alias" value="ppst"/>
+    </include>
     from process_project_standard_term ppst
     left join process_project_standard_term_user ppstu on ppst.id = ppstu.term_id
     where ppst.process_id = #{processId}

laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java

@@ -165,6 +165,9 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
             //模块责任人审批
             case ProcessProjectStandardCommon.MKZRRSP_:
                 processProjectStandardTermList = termMapper.getByModuleOwner(processId, originUserId, executionParentId, false);
+                wrapper.eq(ProcessProjectStandardTermUser::getModuleOwner, originUserId);
+                wrapper.eq(ProcessProjectStandardTermUser::getParentExecutionId, executionParentId);
+                list = termUserService.list(wrapper);
                 break;
             //部所主管级领导审批
             case ProcessProjectStandardCommon.BSZGJLDSP_:
@@ -185,6 +188,9 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
 
             default:
         }
+        List<DictModel> modelSeriesDict = sysBaseAPI.queryDictItemsByCode("model_series");
+        Map<String, String> modelSeriesDictMap = CollStreamUtil.toMap(modelSeriesDict, DictModel::getValue, DictModel::getText);
+
         List<DictModel> dictModels = sysBaseAPI.queryDictItemsByCode("assess_results");
         Map<String, String> assessResultsMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText);
         //给条款中保存关联的信息
@@ -234,6 +240,10 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                 term.setAssessResults(assessResults);
                 term.setAssessResults_dictText(assessResultsMap.get(assessResults));
             }
+            String modelSeries = term.getModelSeries();
+            term.setModelSeries_dictText(sysBaseAPI.translateByDictMap(modelSeriesDictMap,modelSeries));
+            String designEngineer = term.getDesignEngineer();
+            term.setDesignEngineer_dictText(userNameMap.get(designEngineer));
         }
         String moduleOwner1 = null;
         if (processProjectStandardTermList.size()>0){
@@ -390,7 +400,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         processHandleService.updateApprovalRecord(processInfoVO);
         switch (taskDefinitionKey) {
             //模块责任人审批
-            case ProcessProjectStandardCommon.MKZRRFF_:
+            case ProcessProjectStandardCommon.MKZRRSP_:
                 mkzrrffApprove(processInfoVO, processDTO, pass);
                 break;
             //部所主管级领导审批
@@ -668,6 +678,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                 List<String> designEngineerList = Arrays.asList(designEngineers.split(","));
                 designEngineerIds.addAll(designEngineerList);
                 updateWrapper.set(ProcessProjectStandardTermUser::getDesignEngineer, designEngineerList.get(0));
+                updateWrapper.set(ProcessProjectStandardTermUser::getParentExecutionId, executionId);
                 termUserService.update(updateWrapper);
 
                 if (designEngineerList.size() >= 2){
@@ -676,6 +687,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                         BeanUtils.copyProperties(termUser,termUser1);
                         termUser1.setId(null);
                         termUser1.setDesignEngineer(designEngineerList.get(i));
+                        termUser1.setParentExecutionId(executionId);
                         allInsertTermUserList.add(termUser1);
                     }
                 }
@@ -687,7 +699,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                 .filter(Objects::nonNull)
                 .distinct().collect(Collectors.toList());
         processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.SJGCSPG_1, designEngineerIds);
-        ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,parentExecutionId);
+        ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
         // 完成任务
         String taskId = processDTO.getTaskId();
         Map<String, Object> variables = new HashMap<>();