update 项目合规评估流程 法规工程师归档 以设计工程师为维度展示

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java

@@ -134,6 +134,13 @@ public class ProcessProjectAssessTerm {
     @ApiModelProperty(value = "模块负责人ids")
     private String moduleOwners;
 
+    /**
+     * 设计工程师
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "设计工程师id")
+    private String designEngineer;
+
     /**
      * 设计工程师
      */

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml

@@ -23,6 +23,7 @@
       <result column="file_id" jdbcType="VARCHAR" property="fileId" />
       <result column="expected_time" jdbcType="TIMESTAMP" property="expectedTime" />
       <result column="not_involved" property="notInvolved"/>
+      <result column="design_engineer" property="designEngineer"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -86,7 +87,8 @@
       ppatu.evaluation_feedback,
       ppatu.description,
       ppatu.file_id,
-      ppatu.expected_time
+      ppatu.expected_time,
+      ppatu.design_engineer
 
       from process_project_assess_term_user ppatu
       left join process_project_assess_term ppat on ppat.id = ppatu.term_id

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java

@@ -246,7 +246,8 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             String evaluationFeedback = term.getEvaluationFeedback();
             term.setEvaluationFeedback_dictText(dictevaluationFeedbackMap.get(evaluationFeedback));
             term.setProcessProjectAssessTermUserList(termUsers);
-
+            String designEngineer = term.getDesignEngineer();
+            term.setDesignEngineer(userNameMap.get(designEngineer));
             String previousNodeHandler = previousNodeHandlerMap.get(termId);
             term.setPreviousNodeHandler(previousNodeHandler);
             term.setPromoter(createUserName);