From 867370234299c79b56c6088b2fe7d2c15da22f38 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 18 八月 2025 10:42:42 +0800
Subject: [PATCH] 完善代码

---
 pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java |   52 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 9 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 0e73e45..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
@@ -75,7 +75,7 @@
     })
     @GetMapping(path = "some")
     @SsoAop()
-    public BaseResponse<QueryResultVo<List<VoCrops>>> some(@RequestBody CropsQo qo){
+    public BaseResponse<QueryResultVo<List<VoCrops>>> some(CropsQo qo){
         try {
             QueryResultVo<List<VoCrops>> res = this.sv.selectSome(qo) ;
             return BaseResponseUtils.buildSuccess(res);
@@ -84,7 +84,30 @@
             return BaseResponseUtils.buildException(e.getMessage()) ;
         }
     }
-
+    /**
+     * 瀹㈡埛绔姹傚緱鍒版墍鏈変綔鐗╂暟鎹�
+     * @return 鎵�鏈変綔鐗╂暟鎹�
+     */
+    @Operation(summary = "鑾峰緱鎵�鏈変綔鐗�", description = "杩斿洖鎵�鏈変綔鐗╂暟鎹�")
+    @ApiResponses(value = {
+            @ApiResponse(
+                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+                    description = "杩斿洖鎵�鏈変綔鐗╂暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = VoCrops.class))}
+            )
+    })
+    @GetMapping(path = "all")
+    @SsoAop()
+    public BaseResponse<List<VoCrops>> all(){
+        try {
+            List<VoCrops> res = this.sv.selectAll() ;
+            return BaseResponseUtils.buildSuccess(res);
+        } catch (Exception e) {
+            log.error("鏌ヨ浣滅墿寮傚父", e);
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
     /**
      * 鏂板淇濆瓨浣滅墿
      * @param po 鏂板淇濆瓨浣滅墿form琛ㄥ崟瀵硅薄
@@ -105,11 +128,12 @@
         if(bindingResult != null && bindingResult.hasErrors()){
             return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
-        po.id = null ;
-        po.createDt = new Date();
-        po.deleted = 0 ;
-        int count;
+        int count = 0 ;
         try {
+            po.id = null ;
+            po.createDt = new Date();
+            po.deleted = 0 ;
+            this.setLifeEnd(po);
             count = this.sv.save(po);
         } catch (Exception e) {
             log.error("淇濆瓨浣滅墿寮傚父", e);
@@ -144,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);
@@ -194,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