From c4eb09c409143a7c6c0cea2e9297fa4e2285bbbd Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 17 Oct 2023 14:39:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=81=E7=A8=8B=E4=B8=AD=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=BA=BA=E5=91=98=E5=AD=97=E6=AE=B5=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProcessEsInitChange.java           | 29 ++++++++++++++-----
 .../impl/ProcessEsInitChangeServiceImpl.java  | 18 ++++++++++++
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
index 60b8204a..9a373aaf 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
@@ -260,6 +260,13 @@ public class ProcessEsInitChange implements Serializable {
      */
     private String mainDraftingUser;
 
+    /**
+     * 主起草人
+     */
+    @TableField(exist = false)
+    @JsonProperty("mainDraftingUser_dictText")
+    private String mainDraftingUserDictText;
+
     /**
      * 主起草单位
      */
@@ -277,6 +284,14 @@ public class ProcessEsInitChange implements Serializable {
      */
     private String mainDraftingUnitResponsiblePerson;
 
+    /**
+     * 主起草单位责任人
+     */
+    @TableField(exist = false)
+    @JsonProperty("mainDraftingUnitResponsiblePerson_dictText")
+    private String mainDraftingUnitResponsiblePersonDictText;
+
+
     /**
      * 新主起草单位负责人
      */
@@ -287,6 +302,13 @@ public class ProcessEsInitChange implements Serializable {
      */
     private String standardPromoter;
 
+    /**
+     * 标准推进人
+     */
+    @TableField(exist = false)
+    @JsonProperty("standardPromoter_dictText")
+    private String standardPromoterDictText;
+
     /**
      * 草稿完成日期
      */
@@ -433,13 +455,6 @@ public class ProcessEsInitChange implements Serializable {
     @JsonProperty("mainDraftingUserLeaderLeader_dictText")
     private String mainDraftUserLeaderLeaderDictText;
 
-    /**
-     * 主起草人
-     */
-    @TableField(exist = false)
-    @JsonProperty("mainDraftingUser_dictText")
-    private String mainDraftUserDictText;
-
     /**
      * 标准化审批人
      */
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index ae760258..fca7d61b 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -110,6 +110,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
 
         // 制作需要的Id集合
         for (ProcessEsInitChange initChange : initChangeList) {
+            userIdList.add(initChange.getMainDraftingUser());
+            userIdList.add(initChange.getMainDraftingUnitResponsiblePerson());
+            userIdList.add(initChange.getStandardPromoter());
             userIdList.add(initChange.getMainDraftUserLeader());
             userIdList.add(initChange.getMainDraftUserLeaderLeader());
             departIdList.add(initChange.getMainDraftingUnit());
@@ -129,12 +132,27 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
 
         // 翻译数据
         for (ProcessEsInitChange initChange : initChangeList) {
+            // 主起草人
+            if (userMap.get(initChange.getMainDraftingUser()) != null) {
+                initChange.setMainDraftingUserDictText(userMap.get(initChange.getMainDraftingUser()).getUsername());
+            }
+            // 起草单位负责人
+            if (userMap.get(initChange.getMainDraftingUnitResponsiblePerson()) != null) {
+                initChange.setMainDraftingUnitResponsiblePersonDictText(userMap.get(initChange.getMainDraftingUnitResponsiblePerson()).getUsername());
+            }
+            // 标准推进人
+            if (userMap.get(initChange.getStandardPromoter()) != null) {
+                initChange.setStandardPromoterDictText(userMap.get(initChange.getStandardPromoter()).getUsername());
+            }
+            // 主起草人上级领导
             if (userMap.get(initChange.getMainDraftUserLeader()) != null) {
                 initChange.setMainDraftUserLeaderDictText(userMap.get(initChange.getMainDraftUserLeader()).getUsername());
             }
+            // 主起草用户领导的领导
             if (userMap.get(initChange.getMainDraftUserLeaderLeader()) != null) {
                 initChange.setMainDraftUserLeaderLeaderDictText(userMap.get(initChange.getMainDraftUserLeaderLeader()).getUsername());
             }
+            // 主起草单位
             if (departMap.get(initChange.getMainDraftingUnit()) != null) {
                 initChange.setMainDraftingUnitDictText(departMap.get(initChange.getMainDraftingUnit()).getDepartName());
             }