From 3acc22ba5b2e5063dd29c22996c4d8f575aafb4b Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 9 Jan 2024 18:19:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080500=20=E4=BC=81=E6=A0=87=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E6=B5=81=E7=A8=8B=EF=BC=88=E4=B8=BB=E8=B5=B7?=
 =?UTF-8?q?=E8=8D=89=E4=BA=BA=E5=8F=91=E5=B8=83=EF=BC=89--=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E7=9A=84=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E5=92=8C=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=8F=96=E5=BE=97?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/process/esRevision/entity/ProcessEsRevision.java  | 2 --
 .../esRevision/listener/ProcessESRevisionEndListener.java      | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
index 9650ccbe..65cd0c2d 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
@@ -225,14 +225,12 @@ public class ProcessEsRevision implements Serializable {
     /**
      * 发布日期
      */
-    @TableField(exist = false)
     @ApiModelProperty(value = "发布日期")
     private String releaseDate;
 
     /**
      * 实施日期
      */
-    @TableField(exist = false)
     @ApiModelProperty(value = "实施日期")
     private String implementDate;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
index 4f1b0ec7..edfca12c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
@@ -30,6 +30,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -92,6 +93,8 @@ public class ProcessESRevisionEndListener implements ExecutionListener {
         }
         variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.RELEASE.getStateValue());
         variables.put(FieldCommon.COMP_ILLUSTRATION, data.getCompIllustration());
+        variables.put(FieldCommon.RELEASE_DATE, data.getReleaseDate());
+        variables.put(FieldCommon.IMPLEMENTATION_DATE, data.getImplementDate());
         variables.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue());
         String standardId = IdWorker.getIdStr();
         variables.put(FieldCommon.ID, standardId);