1、协议细化，处理小数； 2、水肥机、气象站、墒情站实体增加属性fboxId(FBox序列号)；

liurunyu

2025-06-20 e9d04864135236c8b39b06f62d001631524197e6

 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByIcSv.java

@@ -44,7 +44,12 @@
        List<VoIcRechargeStatistics> list = seRechargeHistoryMapper.statisticsByIc(statisticsStartId, statisticsEndId) ;
        if(list != null && list.size() > 0){
            for(VoIcRechargeStatistics vo : list){
                StRechargeIcDay po = this.stRechargeIcDayMapper.selectByClientAndCardAndYearAndMonth(vo.clientId, vo.cardId, statisticsYear, statisticsMonth) ;
                List<StRechargeIcDay> listOfDay = this.stRechargeIcDayMapper.selectByClientAndCardAndYearAndMonth(vo.clientId, vo.cardId, statisticsYear, statisticsMonth) ;
                StRechargeIcDay po = null ;
                if(listOfDay != null && listOfDay.size() > 0){
                    //程序逻辑控制上，集合中只有一个对象
                    po = listOfDay.get(0) ;
                }
                if(po == null){
                    po = new StRechargeIcDay() ;
                    po.clientId = vo.clientId ;
@@ -71,7 +76,12 @@
        List<VoIcRechargeStatistics> list = stRechargeIcDayMapper.statisticsByIc(statisticsYear, statisticsMonth) ;
        if(list != null && list.size() > 0){
            for(VoIcRechargeStatistics vo : list){
                StRechargeIcMonth po = this.stRechargeIcMonthMapper.selectByClientAndCardAndYear(vo.clientId, vo.cardId, statisticsYear) ;
                List<StRechargeIcMonth> listOfMonth = this.stRechargeIcMonthMapper.selectByClientAndCardAndYear(vo.clientId, vo.cardId, statisticsYear) ;
                StRechargeIcMonth po = null ;
                if(listOfMonth != null && listOfMonth.size() > 0){
                    //程序逻辑控制上，集合中只有一个对象
                    po = listOfMonth.get(0) ;
                }
                if(po == null){
                    po = new StRechargeIcMonth() ;
                    po.clientId = vo.clientId ;
@@ -97,7 +107,12 @@
        List<VoIcRechargeStatistics> list = stRechargeIcMonthMapper.statisticsByIc(statisticsYear) ;
        if(list != null && list.size() > 0){
            for(VoIcRechargeStatistics vo : list){
                StRechargeIcYear po = this.stRechargeIcYearMapper.selectByClientAndCardAndYear(vo.clientId, vo.cardId, statisticsYear) ;
                List<StRechargeIcYear> listOfYear = this.stRechargeIcYearMapper.selectByClientAndCardAndYear(vo.clientId, vo.cardId, statisticsYear) ;
                StRechargeIcYear po = null ;
                if(listOfYear != null && listOfYear.size() > 0){
                    //程序逻辑控制上，集合中只有一个对象
                    po = listOfYear.get(0) ;
                }
                if(po == null){
                    po = new StRechargeIcYear() ;
                    po.clientId = vo.clientId ;