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

liurunyu

2025-06-05 6630fbaf54a4c36fb4e7bf6bfd5ee62e6f56e4ed

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

@@ -44,7 +44,12 @@
        List<VoClientRechargeStatistics> list = seRechargeHistoryMapper.statisticsByClient(statisticsStartId, statisticsEndId) ;
        if(list != null && list.size() > 0){
            for(VoClientRechargeStatistics vo : list){
                StRechargeClientDay po = this.stRechargeClientDayMapper.selectByClientAndYearAndMonth(vo.clientId, statisticsYear, statisticsMonth) ;
                List<StRechargeClientDay> listOfDay = this.stRechargeClientDayMapper.selectByClientAndYearAndMonth(vo.clientId, statisticsYear, statisticsMonth) ;
                StRechargeClientDay po = null ;
                if(listOfDay != null && listOfDay.size() > 0){
                    //程序逻辑控制上，集合中只有一个对象
                    po = listOfDay.get(0) ;
                }
                if(po == null){
                    po = new StRechargeClientDay() ;
                    po.clientId = vo.clientId ;
@@ -70,7 +75,12 @@
        List<VoClientRechargeStatistics> list = stRechargeClientDayMapper.statisticsByClient(statisticsYear, statisticsMonth) ;
        if(list != null && list.size() > 0){
            for(VoClientRechargeStatistics vo : list){
                StRechargeClientMonth po = this.stRechargeClientMonthMapper.selectByClientAndYear(vo.clientId, statisticsYear) ;
                List<StRechargeClientMonth> listOfMonth = this.stRechargeClientMonthMapper.selectByClientAndYear(vo.clientId, statisticsYear) ;
                StRechargeClientMonth po = null ;
                if(listOfMonth != null && listOfMonth.size() > 0){
                    //程序逻辑控制上，集合中只有一个对象
                    po = listOfMonth.get(0) ;
                }
                if(po == null){
                    po = new StRechargeClientMonth() ;
                    po.clientId = vo.clientId ;
@@ -95,7 +105,12 @@
        List<VoClientRechargeStatistics> list = stRechargeClientMonthMapper.statisticsByClient(statisticsYear) ;
        if(list != null && list.size() > 0){
            for(VoClientRechargeStatistics vo : list){
                StRechargeClientYear po = this.stRechargeClientYearMapper.selectByClientAndYear(vo.clientId, statisticsYear) ;
                List<StRechargeClientYear> listOfYear = this.stRechargeClientYearMapper.selectByClientAndYear(vo.clientId, statisticsYear) ;
                StRechargeClientYear po = null ;
                if(listOfYear != null && listOfYear.size() > 0){
                    //程序逻辑控制上，集合中只有一个对象
                    po = listOfYear.get(0) ;
                }
                if(po == null){
                    po = new StRechargeClientYear() ;
                    po.clientId = vo.clientId ;