From 676e99259dbbf341d9f164cc8fab14b907eb3885 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 28 十二月 2024 15:03:39 +0800
Subject: [PATCH] 完善
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmountSv.java | 60 +++++++++++---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientConsumeStatistics.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountSv.java | 31 +++++++
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByClientSv.java | 88 +++++++++++-----------
4 files changed, 122 insertions(+), 61 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientConsumeStatistics.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientConsumeStatistics.java
index f1817fc..686e1af 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientConsumeStatistics.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientConsumeStatistics.java
@@ -10,8 +10,8 @@
@Data
public class VoClientConsumeStatistics {
public Long clientId ;
- public Double water;//鐢ㄦ按閲忥紙m3锛�
- public Double amount;//鑺辫垂閲戦(鎵ｈ垂)锛堝厓锛�
+ public Double amount;//鐢ㄦ按閲忥紙m3锛�
+ public Double money;//鑺辫垂閲戦(鎵ｈ垂)锛堝厓锛�
public Integer duration; //鏃堕暱(鍒嗛挓)
public Integer times;//鐢ㄦ按娆℃暟
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmountSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmountSv.java
index 904c497..52f52f4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmountSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmountSv.java
@@ -4,9 +4,7 @@
import com.dy.pipIrrGlobal.daoSt.StClientAmountDayMapper;
import com.dy.pipIrrGlobal.daoSt.StClientAmountMonthMapper;
import com.dy.pipIrrGlobal.daoSt.StClientAmountYearMapper;
-import com.dy.pipIrrGlobal.pojoRm.RmClientAmountDay;
import com.dy.pipIrrGlobal.pojoSt.*;
-import com.dy.pipIrrGlobal.voRm.VoClientAmountDay;
import com.dy.pipIrrGlobal.voSt.VoClientAmountStatistics;
import com.dy.pipIrrGlobal.voSt.VoClientConsumeStatistics;
import org.springframework.beans.factory.annotation.Autowired;
@@ -126,130 +124,162 @@
}
}
+
private void setValueOfDayOfMonth(Integer statisticsDay, VoClientAmountStatistics vo, StClientAmountDay po){
switch (statisticsDay) {
case 1:
po.amount1 = vo.amount;
+ po.money1 = vo.money;
po.times1 = vo.times;
break;
case 2:
po.amount2 = vo.amount;
+ po.money2 = vo.money;
po.times2 = vo.times;
break;
case 3:
po.amount3 = vo.amount;
+ po.money3 = vo.money;
po.times3 = vo.times;
break;
case 4:
po.amount4 = vo.amount;
+ po.money4 = vo.money;
po.times4 = vo.times;
break;
case 5:
po.amount5 = vo.amount;
+ po.money5 = vo.money;
po.times5 = vo.times;
break;
case 6:
po.amount6 = vo.amount;
+ po.money6 = vo.money;
po.times6 = vo.times;
break;
case 7:
po.amount7 = vo.amount;
+ po.money7 = vo.money;
po.times7 = vo.times;
break;
case 8:
po.amount8 = vo.amount;
+ po.money8 = vo.money;
po.times8 = vo.times;
break;
case 9:
po.amount9 = vo.amount;
+ po.money9 = vo.money;
po.times9 = vo.times;
break;
case 10:
po.amount10 = vo.amount;
+ po.money10 = vo.money;
po.times10 = vo.times;
break;
case 11:
po.amount11 = vo.amount;
+ po.money11 = vo.money;
po.times11 = vo.times;
break;
case 12:
po.amount12 = vo.amount;
+ po.money12 = vo.money;
po.times12 = vo.times;
break;
case 13:
po.amount13 = vo.amount;
+ po.money13 = vo.money;
po.times13 = vo.times;
break;
case 14:
po.amount14 = vo.amount;
+ po.money14 = vo.money;
po.times14 = vo.times;
break;
case 15:
po.amount15 = vo.amount;
+ po.money15 = vo.money;
po.times15 = vo.times;
break;
case 16:
po.amount16 = vo.amount;
+ po.money16 = vo.money;
po.times16 = vo.times;
break;
case 17:
po.amount17 = vo.amount;
+ po.money17 = vo.money;
po.times17 = vo.times;
break;
case 18:
po.amount18 = vo.amount;
+ po.money18 = vo.money;
po.times18 = vo.times;
break;
case 19:
po.amount19 = vo.amount;
+ po.money19 = vo.money;
po.times19 = vo.times;
break;
case 20:
po.amount20 = vo.amount;
+ po.money20 = vo.money;
po.times20 = vo.times;
break;
case 21:
po.amount21 = vo.amount;
+ po.money21 = vo.money;
po.times21 = vo.times;
break;
case 22:
po.amount22 = vo.amount;
+ po.money22 = vo.money;
po.times22 = vo.times;
break;
case 23:
po.amount23 = vo.amount;
+ po.money23 = vo.money;
po.times23 = vo.times;
break;
case 24:
po.amount24 = vo.amount;
+ po.money24 = vo.money;
po.times24 = vo.times;
break;
case 25:
po.amount25 = vo.amount;
+ po.money25 = vo.money;
po.times25 = vo.times;
break;
case 26:
po.amount26 = vo.amount;
+ po.money26 = vo.money;
po.times26 = vo.times;
break;
case 27:
po.amount27 = vo.amount;
+ po.money27 = vo.money;
po.times27 = vo.times;
break;
case 28:
po.amount28 = vo.amount;
+ po.money28 = vo.money;
po.times28 = vo.times;
break;
case 29:
po.amount29 = vo.amount;
+ po.money29 = vo.money;
po.times29 = vo.times;
break;
case 30:
po.amount30 = vo.amount;
+ po.money30 = vo.money;
po.times30 = vo.times;
break;
case 31:
po.amount31 = vo.amount;
+ po.money31 = vo.money;
po.times31 = vo.times;
break;
}
@@ -258,58 +288,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;
}
}
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 306b50d..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
@@ -131,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;
}
@@ -260,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;
}
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountSv.java
index 5899c0f..3509ebc 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountSv.java
@@ -104,126 +104,157 @@
switch (statisticsDay) {
case 1:
po.amount1 = vo.amount;
+ po.money1 = vo.money;
po.times1 = vo.times;
break;
case 2:
po.amount2 = vo.amount;
+ po.money2 = vo.money;
po.times2 = vo.times;
break;
case 3:
po.amount3 = vo.amount;
+ po.money3 = vo.money;
po.times3 = vo.times;
break;
case 4:
po.amount4 = vo.amount;
+ po.money4 = vo.money;
po.times4 = vo.times;
break;
case 5:
po.amount5 = vo.amount;
+ po.money5 = vo.money;
po.times5 = vo.times;
break;
case 6:
po.amount6 = vo.amount;
+ po.money6 = vo.money;
po.times6 = vo.times;
break;
case 7:
po.amount7 = vo.amount;
+ po.money7 = vo.money;
po.times7 = vo.times;
break;
case 8:
po.amount8 = vo.amount;
+ po.money8 = vo.money;
po.times8 = vo.times;
break;
case 9:
po.amount9 = vo.amount;
+ po.money9 = vo.money;
po.times9 = vo.times;
break;
case 10:
po.amount10 = vo.amount;
+ po.money10 = vo.money;
po.times10 = vo.times;
break;
case 11:
po.amount11 = vo.amount;
+ po.money11 = vo.money;
po.times11 = vo.times;
break;
case 12:
po.amount12 = vo.amount;
+ po.money12 = vo.money;
po.times12 = vo.times;
break;
case 13:
po.amount13 = vo.amount;
+ po.money13 = vo.money;
po.times13 = vo.times;
break;
case 14:
po.amount14 = vo.amount;
+ po.money14 = vo.money;
po.times14 = vo.times;
break;
case 15:
po.amount15 = vo.amount;
+ po.money15 = vo.money;
po.times15 = vo.times;
break;
case 16:
po.amount16 = vo.amount;
+ po.money16 = vo.money;
po.times16 = vo.times;
break;
case 17:
po.amount17 = vo.amount;
+ po.money17 = vo.money;
po.times17 = vo.times;
break;
case 18:
po.amount18 = vo.amount;
+ po.money18 = vo.money;
po.times18 = vo.times;
break;
case 19:
po.amount19 = vo.amount;
+ po.money19 = vo.money;
po.times19 = vo.times;
break;
case 20:
po.amount20 = vo.amount;
+ po.money20 = vo.money;
po.times20 = vo.times;
break;
case 21:
po.amount21 = vo.amount;
+ po.money21 = vo.money;
po.times21 = vo.times;
break;
case 22:
po.amount22 = vo.amount;
+ po.money22 = vo.money;
po.times22 = vo.times;
break;
case 23:
po.amount23 = vo.amount;
+ po.money23 = vo.money;
po.times23 = vo.times;
break;
case 24:
po.amount24 = vo.amount;
+ po.money24 = vo.money;
po.times24 = vo.times;
break;
case 25:
po.amount25 = vo.amount;
+ po.money25 = vo.money;
po.times25 = vo.times;
break;
case 26:
po.amount26 = vo.amount;
+ po.money26 = vo.money;
po.times26 = vo.times;
break;
case 27:
po.amount27 = vo.amount;
+ po.money27 = vo.money;
po.times27 = vo.times;
break;
case 28:
po.amount28 = vo.amount;
+ po.money28 = vo.money;
po.times28 = vo.times;
break;
case 29:
po.amount29 = vo.amount;
+ po.money29 = vo.money;
po.times29 = vo.times;
break;
case 30:
po.amount30 = vo.amount;
+ po.money30 = vo.money;
po.times30 = vo.times;
break;
case 31:
po.amount31 = vo.amount;
+ po.money31 = vo.money;
po.times31 = vo.times;
break;
}
--
Gitblit v1.8.0