From 865acbd9b2e0832d2a4309d81441a1db049721f4 Mon Sep 17 00:00:00 2001
From: zhuyulei <1843199800@qq.com>
Date: Thu, 18 Jan 2024 10:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=AE=A1=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kms/yg/df/controller/BsSgcDfGcglController.java   | 8 ++++----
 .../src/main/java/com/kms/yg/df/domain/BsSgcDfGcgl.java   | 4 ++--
 .../com/kms/yg/sz/controller/BsSgcSzGcglController.java   | 8 ++++----
 .../src/main/java/com/kms/yg/sz/domain/BsSgcSzGcgl.java   | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcglController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcglController.java
index c15e3527..9ffd9b96 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcglController.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcglController.java
@@ -92,7 +92,7 @@ public class BsSgcDfGcglController extends BaseController
     public AjaxResult add(@RequestBody BsSgcDfGcgl bsSgcDfGcgl)
     {
         BaseEntityUtils.preInsert(bsSgcDfGcgl);
-        bsSgcDfGcgl.setRecordTakeEffectTime(new Date());
+        bsSgcDfGcgl.setEffDate(new Date());
         return toAjax(bsSgcDfGcglService.save(bsSgcDfGcgl));
     }
 
@@ -106,12 +106,12 @@ public class BsSgcDfGcglController extends BaseController
     {
         String id = bsSgcDfGcgl.getId();
         BsSgcDfGcgl byId = bsSgcDfGcglService.getById(id);
-        byId.setRecordLoseEfficacyTime(new Date());
+        byId.setExprDate(new Date());
         byId.setId(UUID.randomUUID().toString());
         bsSgcDfGcglService.save(byId);
 
-        bsSgcDfGcgl.setRecordTakeEffectTime(new Date());
-        bsSgcDfGcgl.setRecordLoseEfficacyTime(null);
+        bsSgcDfGcgl.setEffDate(new Date());
+        bsSgcDfGcgl.setExprDate(null);
 
 
 
diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcgl.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcgl.java
index 2905c0e2..affe0272 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcgl.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcgl.java
@@ -196,10 +196,10 @@ public class BsSgcDfGcgl extends BaseEntity
 
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date recordTakeEffectTime;
+    private Date effDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date recordLoseEfficacyTime;
+    private Date exprDate;
 
 
     private String dikeCode;
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcglController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcglController.java
index b05e1dce..40749cfa 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcglController.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcglController.java
@@ -91,7 +91,7 @@ public class BsSgcSzGcglController extends BaseController
     public AjaxResult add(@RequestBody BsSgcSzGcgl bsSgcSzGcgl)
     {
         BaseEntityUtils.preInsert(bsSgcSzGcgl);
-        bsSgcSzGcgl.setRecordTakeEffectTime(new Date());
+        bsSgcSzGcgl.setEffDate(new Date());
         return toAjax(bsSgcSzGcglService.save(bsSgcSzGcgl));
     }
 
@@ -106,12 +106,12 @@ public class BsSgcSzGcglController extends BaseController
 
         String id = bsSgcSzGcgl.getId();
         BsSgcSzGcgl byId = bsSgcSzGcglService.getById(id);
-        byId.setRecordLoseEfficacyTime(new Date());
+        byId.setExprDate(new Date());
         byId.setId(UUID.randomUUID().toString());
         bsSgcSzGcglService.save(byId);
 
-        bsSgcSzGcgl.setRecordTakeEffectTime(new Date());
-        bsSgcSzGcgl.setRecordLoseEfficacyTime(null);
+        bsSgcSzGcgl.setEffDate(new Date());
+        bsSgcSzGcgl.setExprDate(null);
 
         return toAjax(bsSgcSzGcglService.updateById(bsSgcSzGcgl));
     }
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcgl.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcgl.java
index 001b387a..b54a6564 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcgl.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcgl.java
@@ -197,10 +197,10 @@ public class BsSgcSzGcgl extends BaseEntity
 
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date recordTakeEffectTime;
+    private Date effDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date recordLoseEfficacyTime;
+    private Date exprDate;
 
     private String wagaCode;