From db31f95644e77010ffb88ac9e57e618818737733 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 09 一月 2025 11:25:23 +0800
Subject: [PATCH] 优化”开阀操作次数“、”关阀操作次数“、”时间段内开阀次数超过指定值“、”时间段内开阀次数低于指定值“、”时间段有开阀无关阀“、”时间段无开阀有关阀“功能实现及sql。
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByClientSv.java | 109 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 62 insertions(+), 47 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByClientSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByClientSv.java
index 0062d5e..894dd14 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByClientSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByClientSv.java
@@ -46,7 +46,12 @@
List<VoClientConsumeStatistics> list = rmOpenCloseValveHistoryMapper.statisticsByClient(statisticsStartDt, statisticsEndDt) ;
if(list != null && list.size() > 0){
for(VoClientConsumeStatistics vo : list){
- StConsumeClientDay po = this.stConsumeClientDayMapper.selectByClientAndYearAndMonth(vo.clientId, statisticsYear, statisticsMonth) ;
+ List<StConsumeClientDay> listOfDay = this.stConsumeClientDayMapper.selectByClientAndYearAndMonth(vo.clientId, statisticsYear, statisticsMonth) ;
+ StConsumeClientDay po = null ;
+ if(listOfDay != null && listOfDay.size() > 0){
+ //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
+ po = listOfDay.get(0) ;
+ }
if(po == null){
po = new StConsumeClientDay() ;
po.clientId = vo.clientId ;
@@ -72,7 +77,12 @@
List<VoClientConsumeStatistics> list = stConsumeClientDayMapper.statisticsByClient(statisticsYear, statisticsMonth) ;
if(list != null && list.size() > 0){
for(VoClientConsumeStatistics vo : list){
- StConsumeClientMonth po = this.stConsumeClientMonthMapper.selectByClientAndYear(vo.clientId, statisticsYear) ;
+ List<StConsumeClientMonth> listOfMonth = this.stConsumeClientMonthMapper.selectByClientAndYear(vo.clientId, statisticsYear) ;
+ StConsumeClientMonth po = null ;
+ if(listOfMonth != null && listOfMonth.size() > 0){
+ //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
+ po = listOfMonth.get(0) ;
+ }
if(po == null){
po = new StConsumeClientMonth() ;
po.clientId = vo.clientId ;
@@ -97,7 +107,12 @@
List<VoClientConsumeStatistics> list = stConsumeClientMonthMapper.statisticsByClient(statisticsYear) ;
if(list != null && list.size() > 0){
for(VoClientConsumeStatistics vo : list){
- StConsumeClientYear po = this.stConsumeClientYearMapper.selectByClientAndYear(vo.clientId, statisticsYear) ;
+ List<StConsumeClientYear> listOfYear = this.stConsumeClientYearMapper.selectByClientAndYear(vo.clientId, statisticsYear) ;
+ StConsumeClientYear po = null ;
+ if(listOfYear != null && listOfYear.size() > 0){
+ //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
+ po = listOfYear.get(0) ;
+ }
if(po == null){
po = new StConsumeClientYear() ;
po.clientId = vo.clientId ;
@@ -116,127 +131,127 @@
private void setValueOfDayOfMonth(Integer statisticsDay, VoClientConsumeStatistics vo, StConsumeClientDay po){
switch (statisticsDay) {
case 1:
- po.amount1 = vo.amount;
+ po.amount1 = vo.money;
po.times1 = vo.times;
break;
case 2:
- po.amount2 = vo.amount;
+ po.amount2 = vo.money;
po.times2 = vo.times;
break;
case 3:
- po.amount3 = vo.amount;
+ po.amount3 = vo.money;
po.times3 = vo.times;
break;
case 4:
- po.amount4 = vo.amount;
+ po.amount4 = vo.money;
po.times4 = vo.times;
break;
case 5:
- po.amount5 = vo.amount;
+ po.amount5 = vo.money;
po.times5 = vo.times;
break;
case 6:
- po.amount6 = vo.amount;
+ po.amount6 = vo.money;
po.times6 = vo.times;
break;
case 7:
- po.amount7 = vo.amount;
+ po.amount7 = vo.money;
po.times7 = vo.times;
break;
case 8:
- po.amount8 = vo.amount;
+ po.amount8 = vo.money;
po.times8 = vo.times;
break;
case 9:
- po.amount9 = vo.amount;
+ po.amount9 = vo.money;
po.times9 = vo.times;
break;
case 10:
- po.amount10 = vo.amount;
+ po.amount10 = vo.money;
po.times10 = vo.times;
break;
case 11:
- po.amount11 = vo.amount;
+ po.amount11 = vo.money;
po.times11 = vo.times;
break;
case 12:
- po.amount12 = vo.amount;
+ po.amount12 = vo.money;
po.times12 = vo.times;
break;
case 13:
- po.amount13 = vo.amount;
+ po.amount13 = vo.money;
po.times13 = vo.times;
break;
case 14:
- po.amount14 = vo.amount;
+ po.amount14 = vo.money;
po.times14 = vo.times;
break;
case 15:
- po.amount15 = vo.amount;
+ po.amount15 = vo.money;
po.times15 = vo.times;
break;
case 16:
- po.amount16 = vo.amount;
+ po.amount16 = vo.money;
po.times16 = vo.times;
break;
case 17:
- po.amount17 = vo.amount;
+ po.amount17 = vo.money;
po.times17 = vo.times;
break;
case 18:
- po.amount18 = vo.amount;
+ po.amount18 = vo.money;
po.times18 = vo.times;
break;
case 19:
- po.amount19 = vo.amount;
+ po.amount19 = vo.money;
po.times19 = vo.times;
break;
case 20:
- po.amount20 = vo.amount;
+ po.amount20 = vo.money;
po.times20 = vo.times;
break;
case 21:
- po.amount21 = vo.amount;
+ po.amount21 = vo.money;
po.times21 = vo.times;
break;
case 22:
- po.amount22 = vo.amount;
+ po.amount22 = vo.money;
po.times22 = vo.times;
break;
case 23:
- po.amount23 = vo.amount;
+ po.amount23 = vo.money;
po.times23 = vo.times;
break;
case 24:
- po.amount24 = vo.amount;
+ po.amount24 = vo.money;
po.times24 = vo.times;
break;
case 25:
- po.amount25 = vo.amount;
+ po.amount25 = vo.money;
po.times25 = vo.times;
break;
case 26:
- po.amount26 = vo.amount;
+ po.amount26 = vo.money;
po.times26 = vo.times;
break;
case 27:
- po.amount27 = vo.amount;
+ po.amount27 = vo.money;
po.times27 = vo.times;
break;
case 28:
- po.amount28 = vo.amount;
+ po.amount28 = vo.money;
po.times28 = vo.times;
break;
case 29:
- po.amount29 = vo.amount;
+ po.amount29 = vo.money;
po.times29 = vo.times;
break;
case 30:
- po.amount30 = vo.amount;
+ po.amount30 = vo.money;
po.times30 = vo.times;
break;
case 31:
- po.amount31 = vo.amount;
+ po.amount31 = vo.money;
po.times31 = vo.times;
break;
}
@@ -245,58 +260,58 @@
private void setValueOfMonthOfYear(Integer statisticsMonth, VoClientConsumeStatistics vo, StConsumeClientMonth po){
switch (statisticsMonth) {
case 1:
- po.amount1 = vo.amount;
+ po.amount1 = vo.money;
po.times1 = vo.times;
break;
case 2:
- po.amount2 = vo.amount;
+ po.amount2 = vo.money;
po.times2 = vo.times;
break;
case 3:
- po.amount3 = vo.amount;
+ po.amount3 = vo.money;
po.times3 = vo.times;
break;
case 4:
- po.amount4 = vo.amount;
+ po.amount4 = vo.money;
po.times4 = vo.times;
break;
case 5:
- po.amount5 = vo.amount;
+ po.amount5 = vo.money;
po.times5 = vo.times;
break;
case 6:
- po.amount6 = vo.amount;
+ po.amount6 = vo.money;
po.times6 = vo.times;
break;
case 7:
- po.amount7 = vo.amount;
+ po.amount7 = vo.money;
po.times7 = vo.times;
break;
case 8:
- po.amount8 = vo.amount;
+ po.amount8 = vo.money;
po.times8 = vo.times;
break;
case 9:
- po.amount9 = vo.amount;
+ po.amount9 = vo.money;
po.times9 = vo.times;
break;
case 10:
- po.amount10 = vo.amount;
+ po.amount10 = vo.money;
po.times10 = vo.times;
break;
case 11:
- po.amount11 = vo.amount;
+ po.amount11 = vo.money;
po.times11 = vo.times;
break;
case 12:
- po.amount12 = vo.amount;
+ po.amount12 = vo.money;
po.times12 = vo.times;
break;
}
}
private void setValueOfYear(VoClientConsumeStatistics vo, StConsumeClientYear po){
- po.amount = vo.amount;
+ po.amount = vo.money;
po.times = vo.times;
}
}
--
Gitblit v1.8.0