From 533325ee9ea40c9414a7a1313ee73bbf781b1dea Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 19 Dec 2023 15:22:03 +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=E5=90=84=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E4=B8=BB=E7=AE=A1=E7=BA=A7=E9=A2=86=E5=AF=BC=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=20=E9=A9=B3=E5=9B=9E=E5=90=8E=EF=BC=8C=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=9F=A5=E8=AF=A2=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 ed60ab54..cbcb669c 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
@@ -100,6 +100,13 @@ public class ProcessProjectAssessTerm {
     @ApiModelProperty(value = "可以分派标识")
     private Integer canAssignFlag;
 
+    /**
+     * 发起人
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "发起人")
+    private String promoter;
+
     /**
      * 条款关联用户表ID
      */
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 7d45b7b0..7ea2cedb 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
@@ -31,6 +31,8 @@
       <include refid="Base_Column_List">
           <property name="alias" value="ppat"/>
       </include>
+      ,
+      ppatu.id term_user_id
       from process_project_assess_term ppat
                left join process_project_assess_term_user ppatu on ppat.id = ppatu.term_id
       where ppat.assessment_id = #{assessmentId}
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 eb432bd0..444d62b2 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
@@ -66,6 +66,7 @@ import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAsse
 import com.jero.modules.activiti.process.projectassess.mapper.ProcessProjectAssessMapper;
 import org.springframework.transaction.annotation.Transactional;
 
+import static cn.hutool.poi.excel.sax.ElementName.c;
 import static cn.hutool.poi.excel.sax.ElementName.v;
 import static org.apache.tools.ant.taskdefs.SetPermissions.NonPosixMode.pass;
 
@@ -130,6 +131,10 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         for (LoginUser loginUser : userList) {
             userNameMap.put(loginUser.getId(), loginUser.calcNameWorkNo());
         }
+        ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId);
+        String createUserId = processAll.getCreateUserId();
+        //发起人
+        String createUserName = userNameMap.get(createUserId);
         //上一节点处理人
         Map<String, String> previousNodeHandlerMap = new HashMap<>();
         LambdaQueryWrapper<ProcessProjectAssessTermUser> wrapper = new LambdaQueryWrapper<>();
@@ -231,6 +236,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
 
                 String previousNodeHandler = previousNodeHandlerMap.get(termId);
                 term.setPreviousNodeHandler(previousNodeHandler);
+                term.setPromoter(createUserName);
             }
         }
         //拼接分类法规标题