From 9440721414f31d1c85094be1a035d9a90f9c4d5a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 18 八月 2025 10:45:32 +0800
Subject: [PATCH] 完善代码
---
pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java | 95 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 93 insertions(+), 2 deletions(-)
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 1d2dbd5..a7e741b 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;
@@ -33,7 +34,12 @@
* @return 瀹炰綋
*/
public VoCrops selectById(Long id){
- return this.mdCropsDao.selectById(id) ;
+ VoCrops vo = this.mdCropsDao.selectById(id) ;
+ if(vo != null){
+ this.setStoppedStr(vo) ;
+ this.setLife(vo) ;
+ }
+ return vo ;
}
/**
@@ -50,9 +56,31 @@
rsVo.pageSize = qo.pageSize ;
rsVo.pageCurr = qo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = this.mdCropsDao.selectSome(params) ;
+ List<VoCrops> list = this.mdCropsDao.selectSome(params) ;
+ if(list != null && list.size() > 0){
+ for(VoCrops vo : list){
+ this.setStoppedStr(vo) ;
+ this.setLife(vo) ;
+ }
+ }
+ rsVo.obj = list ;
return rsVo ;
+ }
+ /**
+ * 鏌ヨ鎵�鏈夊疄浣�
+ * @return 鍖呭惈瀹炰綋闆嗗悎鐨勭粨鏋滃璞�
+ */
+ @SuppressWarnings("unchecked")
+ public List<VoCrops> selectAll(){
+ List<VoCrops> list = this.mdCropsDao.selectAll() ;
+ if(list != null && list.size() > 0){
+ for(VoCrops vo : list){
+ this.setStoppedStr(vo) ;
+ this.setLife(vo) ;
+ }
+ }
+ return list ;
}
/**
* 娣诲姞瀹炰綋
@@ -80,5 +108,68 @@
return mdCropsDao.deleteById(id);
}
+ private void setStoppedStr(VoCrops vo) {
+ if (vo.stopped != null) {
+ if(vo.stopped == 0){
+ vo.stoppedStr = "鍚�";
+ }else{
+ vo.stoppedStr = "鏄�";
+ }
+ }else{
+ 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 ;
+ vo.lifeFactorStr = "" + vo.lifeFactor ;
+ }
+ 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 ;
+ vo.lifeFactorStr = "" + vo.lifeFactor ;
+ }
+ }
+ if(vo.life2Start != null && vo.life2End != null){
+ if(days >= vo.life2Start && days <= vo.life2End){
+ vo.lifeCur = "蹇�熺敓闀挎湡" ;
+ vo.lifeFactor = vo.life2Factor ;
+ vo.lifeFactorStr = "" + vo.lifeFactor ;
+ }
+ }
+ if(vo.life1Start != null && vo.life1End != null){
+ if(days >= vo.life1Start && days <= vo.life1End){
+ vo.lifeCur = "鐢熼暱鍒濇湡" ;
+ vo.lifeFactor = vo.life1Factor ;
+ vo.lifeFactorStr = "" + vo.lifeFactor ;
+ }
+ if(days < vo.life1Start){
+ vo.lifeCur = "鏈紑濮�" ;
+ }
+ }
+ }
+ }
+ }catch (Exception e){
+ log.error("璁＄畻浣滅墿鐢熷懡鍛ㄦ湡澶辫触", e) ;
+ }
+ }
}
--
Gitblit v1.8.0