From baa03931fb62a09a3d05427c73964eeef219f199 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 27 Sep 2024 10:52:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=B2=A1=E6=9C=89=E5=AD=98=E4=B8=8A=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=9E=E4=BE=8BID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/esRevisionAdvice/entity/EsRevisionAdvice.java | 8 +-------
 .../service/impl/EsRevisionServiceImpl.java               | 2 ++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/EsRevisionAdvice.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/EsRevisionAdvice.java
index 7bf35e3d..aa257376 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/EsRevisionAdvice.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/EsRevisionAdvice.java
@@ -65,12 +65,6 @@ public class EsRevisionAdvice implements Serializable {
     @ApiModelProperty(value = "流程实例Id")
     private String processInstanceId;
 
-    /**
-     * 执行id
-     */
-    @ApiModelProperty(value = "执行id")
-    private String executionId;
-
     /**
      * 条款号
      */
@@ -92,7 +86,7 @@ public class EsRevisionAdvice implements Serializable {
     /**
      * 意见提出人
      */
-    @Dict(dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')", dicCode = "id")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
     @ApiModelProperty(value = "意见提出人")
     private String createUserId;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java
index c6e9ed08..9d2a561e 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java
@@ -132,6 +132,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
     }
 
     private void startNodeBusProcess(ProcessInfoVO<ProcessRevisionVO> processInfoVO) {
+        String processInstanceId = processInfoVO.getBasicProcessInfoDTO().getProcessInstanceId();
         ProcessRevisionVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
         ProcessEsRevision processInfo = businessInfoDTO.getProcessInfo();
         // 修改企标计划状态
@@ -144,6 +145,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         // 设置状态为运行中
         espService.updateProjectStatus(espId, ESPProjectStatus.IN_PROGRESS.getValue());
         // 保存数据
+        processInfo.setProcessInstanceId(processInstanceId);
         save(processInfo);
     }