完善代码

liurunyu

2025-08-18 9440721414f31d1c85094be1a035d9a90f9c4d5a

 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,7 +56,14 @@
        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 ;
    }
@@ -60,7 +73,14 @@
     */
    @SuppressWarnings("unchecked")
    public List<VoCrops> selectAll(){
        return this.mdCropsDao.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 ;
    }
    /**
     * 添加实体
@@ -88,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) ;
        }
    }

}