From 0b152ed9a113be8a5b68588d0f8730938b88f297 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 20 Dec 2023 15:19:44 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=BD=92=E6=A1=A3=20=E4=BB=A5?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=B7=A5=E7=A8=8B=E5=B8=88=E4=B8=BA=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectassess/entity/ProcessProjectAssessTerm.java     | 7 +++++++
 .../mapper/xml/ProcessProjectAssessTermMapper.xml          | 4 +++-
 .../projectassess/service/ProcessProjectAssessService.java | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java
index cbcb669c..6f9b34ad 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java
+++ b/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;
+
     /**
      * 设计工程师
      */
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml
index bcab4449..b7a105f8 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml
+++ b/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
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
index c19ad6ea..c854b73b 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+++ b/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);