From a15a8cfd7b01ce4bba6fe9fd876f6704ca23a12d Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 07 一月 2025 16:40:32 +0800 Subject: [PATCH] 1、取水口用水日统计表中增加金额、次数字段; 2、优化或重写“累计流量超过指定值的取水口”、“累计流量低于指定值的取水口”、“指定时间段内用水量超过指定值的取水口”、“指定时间段内消费金额超过指定值的取水口”几个统计查询; 3、改“指定时间段内用水时长超过指定值的取水口”为“指定时间段内用水次数超过指定值的取水口” --- pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByClientSv.java | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByClientSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByClientSv.java index 86036d6..39fb322 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByClientSv.java +++ b/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 ; -- Gitblit v1.8.0