From 0263af9b1659e7316f0dde8925ea212ab1ebfe2f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 18 八月 2025 11:22:20 +0800
Subject: [PATCH] 修改bug

---
 pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java
index d278197..4a7245d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java
@@ -128,17 +128,12 @@
         if(bindingResult != null && bindingResult.hasErrors()){
             return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
-        int count;
+        int count = 0 ;
         try {
             po.id = null ;
             po.createDt = new Date();
             po.deleted = 0 ;
-            if(po.life4End != null && po.startDt != null && !po.startDt.trim().equals("")){
-                String nowYear = DateTime.yyyy() ;
-                String startDt = nowYear + "-" + po.startDt ;
-                String endDt = DateTime.nextXDay_yyyy_MM_dd(startDt, po.life4End) ;
-                po.endDt = endDt.substring(5, 10) ;
-            }
+            this.setLifeEnd(po);
             count = this.sv.save(po);
         } catch (Exception e) {
             log.error("淇濆瓨浣滅墿寮傚父", e);
@@ -173,10 +168,11 @@
         if(po.id == null){
             return BaseResponseUtils.buildFail("鏃犳暟鎹疄浣揑D") ;
         }
-        po.createDt = null ;
-        po.deleted = null ;
-        int count;
+        int count = 0;
         try {
+            po.createDt = null ;
+            po.deleted = null ;
+            this.setLifeEnd(po);
             count = this.sv.update(po);
         } catch (Exception e) {
             log.error("淇濆瓨浣滅墿寮傚父", e);
@@ -223,4 +219,13 @@
             return BaseResponseUtils.buildSuccess(true) ;
         }
     }
+
+    private void setLifeEnd(MdCrops po) throws Exception{
+        if(po.life4End != null && po.startDt != null && !po.startDt.trim().equals("")){
+            String nowYear = DateTime.yyyy() ;
+            String startDt = nowYear + "-" + po.startDt ;
+            String endDt = DateTime.nextXDay_yyyy_MM_dd(startDt, po.life4End) ;
+            po.endDt = endDt.substring(5, 10) ;
+        }
+    }
 }

--
Gitblit v1.8.0