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 | 28 +++++++++++++++++++---------
1 files changed, 19 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 5c94eeb..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
@@ -8,7 +8,6 @@
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoMd.MdCrops;
import com.dy.pipIrrGlobal.voMd.VoCrops;
-import com.dy.pipIrrGlobal.voMd.VoParam;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -95,7 +94,7 @@
responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
description = "杩斿洖鎵�鏈変綔鐗╂暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
- schema = @Schema(implementation = VoParam.class))}
+ schema = @Schema(implementation = VoCrops.class))}
)
})
@GetMapping(path = "all")
@@ -129,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);
@@ -168,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);
@@ -218,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