From 6b59d3cbe0ae7a6881885113cfe9cbd818cb63a5 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 18 八月 2025 10:27:52 +0800
Subject: [PATCH] 增加作物生长期判断及相关参数计算等逻辑
---
pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java | 52 ++++++++++++++++++++++++++
pipIrr-platform/文档/韩月产品设计.txt | 1
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java | 11 +++++
3 files changed, 63 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
index 2d69504..560e820 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
@@ -138,7 +138,7 @@
* 宸茬粡鐢熸垚鏃堕暱锛堝ぉ锛�
*/
public Integer lifeLen;
- /**
+ /**
* 褰撳墠鐢熼暱闃舵
*/
public String lifeCur ;
@@ -150,5 +150,14 @@
* 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
*/
public String stoppedStr;
+ /**
+ * 宸茬粡鐢熸垚鏃堕暱锛堝ぉ锛�
+ */
+ public String lifeLenStr;
+
+ /**
+ * 瀵瑰簲浣滅墿鐢熼暱闃舵鐨勭郴鏁�
+ */
+ public String lifeFactorStr ;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java
index 53c331f..0d4e4f7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrModel.crops;
+import com.dy.common.util.DateTime;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoMd.MdCropsMapper;
import com.dy.pipIrrGlobal.pojoMd.MdCrops;
@@ -36,6 +37,7 @@
VoCrops vo = this.mdCropsDao.selectById(id) ;
if(vo != null){
this.setStoppedStr(vo) ;
+ this.setLife(vo) ;
}
return vo ;
}
@@ -58,6 +60,7 @@
if(list != null && list.size() > 0){
for(VoCrops vo : list){
this.setStoppedStr(vo) ;
+ this.setLife(vo) ;
}
}
rsVo.obj = list ;
@@ -74,6 +77,7 @@
if(list != null && list.size() > 0){
for(VoCrops vo : list){
this.setStoppedStr(vo) ;
+ this.setLife(vo) ;
}
}
return list ;
@@ -115,5 +119,53 @@
vo.stoppedStr = "" ;
}
}
+ private void setLife(VoCrops vo){
+ vo.lifeLenStr = "--" ;
+ vo.lifeCur = "--" ;
+ vo.lifeFactorStr = "--" ;
+ try{
+ if(vo.startDt != null && vo.endDt != null){
+ String start = DateTime.yyyy() + "-" + vo.startDt ;
+ String now = DateTime.yyyy_MM_dd() ;
+ Long days = DateTime.daysBetweenyyyy_MM_dd(now, start) ;
+ if(days > 0){
+ vo.lifeLen = days.intValue() ;
+ vo.lifeLenStr = "" + days + "澶�" ;
+ if(vo.life4Start != null && vo.life4End != null){
+ if(days >= vo.life4Start && days <= vo.life4End){
+ vo.lifeCur = "鐢熼暱鏈湡" ;
+ vo.lifeFactor = vo.life4Factor ;
+ }
+ if(days > vo.life4End){
+ vo.lifeCur = "宸茬粨鏉�" ;
+ }
+ }
+ if(vo.life3Start != null && vo.life3End != null){
+ if(days >= vo.life3Start && days <= vo.life3End){
+ vo.lifeCur = "鐢熼暱涓湡" ;
+ vo.lifeFactor = vo.life3Factor ;
+ }
+ }
+ if(vo.life2Start != null && vo.life2End != null){
+ if(days >= vo.life2Start && days <= vo.life2End){
+ vo.lifeCur = "蹇�熺敓闀挎湡" ;
+ vo.lifeFactor = vo.life2Factor ;
+ }
+ }
+ if(vo.life1Start != null && vo.life1End != null){
+ if(days >= vo.life1Start && days <= vo.life1End){
+ vo.lifeCur = "鐢熼暱鍒濇湡" ;
+ vo.lifeFactor = vo.life1Factor ;
+ }
+ if(days < vo.life1Start){
+ vo.lifeCur = "鏈紑濮�" ;
+ }
+ }
+ }
+ }
+ }catch (Exception e){
+ log.error("璁＄畻浣滅墿鐢熷懡鍛ㄦ湡澶辫触", e) ;
+ }
+ }
}
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\351\237\251\346\234\210\344\272\247\345\223\201\350\256\276\350\256\241.txt" "b/pipIrr-platform/\346\226\207\346\241\243/\351\237\251\346\234\210\344\272\247\345\223\201\350\256\276\350\256\241.txt"
new file mode 100644
index 0000000..fc5e19c
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/\351\237\251\346\234\210\344\272\247\345\223\201\350\256\276\350\256\241.txt"
@@ -0,0 +1 @@
+https://js.design/f/RobkAZ?p=2F_hFprDdh&mode=design
\ No newline at end of file
--
Gitblit v1.8.0