Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

2025-06-10 10a0b0ca34824307aa7d23b0ad6679b36bd57842

 pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/delSome/DelSomeLossAmountSv.java

@@ -1,6 +1,7 @@
package com.dy.pipIrrTemp.delSome;

import com.dy.pipIrrGlobal.daoTmp.DeleteMapper;
import com.dy.pipIrrGlobal.voTmp.VoStLossAmountDay;
import com.dy.pipIrrGlobal.voTmp.VoStLossAmountMonth;
import com.dy.pipIrrGlobal.voTmp.VoStLossAmountYear;
import lombok.extern.slf4j.Slf4j;
@@ -25,6 +26,31 @@
    @Autowired
    private void setDao(DeleteMapper dao){
        this.dao = dao;
    }

    public void delStLossDay(){
        VoStLossAmountDay first = null ;
        List<VoStLossAmountDay> list = dao.selectAllStLossDay() ;
        if(list != null && list.size() > 0){
            for(VoStLossAmountDay vo : list){
                if(first == null){
                    first = vo ;
                }else{
                    if(first.intakeId.longValue() != vo.intakeId.longValue()){
                        //取水口变了
                        first = vo ;
                    }else{
                        if(!first.dt.equals(vo.dt)) {
                            //日期变了
                            first = vo ;
                        }else{
                            //同一个取水口同日期
                            doDelStLossDay(vo.id) ;
                        }
                    }
                }
            }
        }
    }

    public void delStLossMonth(){
@@ -83,6 +109,10 @@
        }
    }
    @Transactional
    int doDelStLossDay(Long id){
        return dao.deleteStLossDayById(id) ;
    }
    @Transactional
    int doDelStLossMonth(Long id){
        return dao.deleteStLossMonthById(id) ;
    }