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/CropsSv.java |   75 +++++++++++++++++++++++++++++++++++++
 1 files changed, 74 insertions(+), 1 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 53c331f..266d941 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,9 +1,12 @@
 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.daoPr.PrStWeatherMapper;
 import com.dy.pipIrrGlobal.pojoMd.MdCrops;
 import com.dy.pipIrrGlobal.voMd.VoCrops;
+import com.dy.pipIrrGlobal.voPr.VoWeather;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.common.utils.PojoUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,9 +26,13 @@
 public class CropsSv {
 
     private MdCropsMapper mdCropsDao ;
+    private PrStWeatherMapper prStWeatherDao;
 
     @Autowired
-    private void setDao(MdCropsMapper dao) { this.mdCropsDao = dao; }
+    private void setDao(MdCropsMapper mdCropsDao, PrStWeatherMapper prStWeatherDao) {
+        this.mdCropsDao = mdCropsDao;
+        this.prStWeatherDao = prStWeatherDao;
+    }
 
     /**
      * 寰楀埌涓�涓疄浣�
@@ -36,6 +43,13 @@
         VoCrops vo = this.mdCropsDao.selectById(id) ;
         if(vo != null){
             this.setStoppedStr(vo) ;
+            this.setLife(vo) ;
+            if(vo.weatherId != null){
+                VoWeather wVo = this.prStWeatherDao.selectOne(vo.weatherId) ;
+                if(wVo != null){
+                    vo.weatherName = wVo.getName() ;
+                }
+            }
         }
         return vo ;
     }
@@ -58,6 +72,7 @@
         if(list != null && list.size() > 0){
             for(VoCrops vo : list){
                 this.setStoppedStr(vo) ;
+                this.setLife(vo) ;
             }
         }
         rsVo.obj = list ;
@@ -74,6 +89,7 @@
         if(list != null && list.size() > 0){
             for(VoCrops vo : list){
                 this.setStoppedStr(vo) ;
+                this.setLife(vo) ;
             }
         }
         return list ;
@@ -115,5 +131,62 @@
             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 = "宸茬粨鏉�" ;
+                            vo.lifeLenStr = "--" ;
+                        }
+                    }
+                    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 = "鏈紑濮�" ;
+                            vo.lifeLenStr = "--" ;
+                        }
+                    }
+                }else{
+                    vo.lifeCur = "鏈紑濮�" ;
+                    vo.lifeLenStr = "--" ;
+                }
+            }
+        }catch (Exception e){
+            log.error("璁＄畻浣滅墿鐢熷懡鍛ㄦ湡澶辫触", e) ;
+        }
+    }
 
 }

--
Gitblit v1.8.0