From 14ae99a760b17ff03d69a2a67a1110784c2eccee Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Sat, 12 Oct 2024 18:27:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8B=BC=E7=AE=B1=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java | 4 ++--
 .../java/com/glxp/api/req/collect/RelCodeBatchRequest.java  | 4 ++--
 .../com/glxp/api/service/collect/RelCodeBatchService.java   | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java b/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java
index 6b21f11bb..035b75f82 100644
--- a/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java
+++ b/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java
@@ -65,14 +65,14 @@ public class RelCodeBatch implements Serializable {
      */
     @TableField(value = "madeDate")
     @ApiModelProperty(value="生产日期")
-    private Date madeDate;
+    private String madeDate;
 
     /**
      * 有效期至
      */
     @TableField(value = "validateDate")
     @ApiModelProperty(value="有效期至")
-    private Date validateDate;
+    private String validateDate;
 
     /**
      * 生产车间
diff --git a/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java b/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java
index 840665143..8155bbf08 100644
--- a/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java
+++ b/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java
@@ -46,12 +46,12 @@ public class RelCodeBatchRequest extends ListPageRequest {
     /**
      * 生产日期
      */
-    private Date madeDate;
+    private String madeDate;
 
     /**
      * 有效期至
      */
-    private Date validateDate;
+    private String validateDate;
 
     /**
      * 生产车间
diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java
index 35fed9212..25e28ecc9 100644
--- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java
+++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java
@@ -97,9 +97,11 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
                     String batchNo = batchE.getAttribute("batchNo");
                     relCodeBatch.setBatchNo(batchNo);
                     String madeDate = batchE.getAttribute("madeDate");
-                    relCodeBatch.setMadeDate(DateUtil.parse(madeDate,"yyyy-MM-dd"));
+                    relCodeBatch.setMadeDate(madeDate);
+//                    relCodeBatch.setMadeDate(DateUtil.parse(madeDate,"yyyy-MM-dd"));
                     String validateDate = batchE.getAttribute("validateDate");
-                    relCodeBatch.setValidateDate(DateUtil.offsetDay(DateUtil.parse(validateDate,"yyyy-MM-dd"),1));
+//                    relCodeBatch.setValidateDate(DateUtil.offsetDay(DateUtil.parse(validateDate,"yyyy-MM-dd"),1));
+                    relCodeBatch.setValidateDate(String.valueOf(DateUtil.offsetDay(DateUtil.parse(validateDate,"yyyy-MM-dd"),1)));
                     String workShop = batchE.getAttribute("workShop");
                     relCodeBatch.setWorkShop(workShop);
                     String lineName = batchE.getAttribute("lineName");