From 4e3345eea5b44763de0d480bf809baa48a21e2ad Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Sun, 29 Sep 2024 17:04:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=84=E7=90=86=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E6=8F=90=E5=87=BA=E4=BA=BA=E5=92=8C=E6=84=8F=E8=A7=81=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/esRevisionAdvice/entity/EsRevisionAdvice.java   | 4 ++++
 .../service/impl/EsRevisionServiceImpl.java                 | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

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 aa257376..f1829672 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
@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -38,6 +40,8 @@ public class EsRevisionAdvice implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
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 727d4964..871ec911 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
@@ -254,7 +254,11 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
             case ADVICE:
                 // 保存意见数据
                 if (!adviceList.isEmpty()) {
-                    adviceList.forEach(advice -> advice.setProcessInstanceId(processInstanceId));
+                    adviceList.forEach(advice -> {
+                        advice.setProcessInstanceId(processInstanceId);
+                        advice.setBatchNum(maxBatchNum);
+                        advice.setCreateUserId(curUserId);
+                    });
                     adviceList.forEach(advice -> advice.setBatchNum(maxBatchNum));
                     adviceService.saveBatch(adviceList);
                 }