From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmountSv.java | 125 +++++++++++++++++++++++++++++++----------
1 files changed, 94 insertions(+), 31 deletions(-)
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..c92c250 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,11 +4,8 @@
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;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -42,13 +39,9 @@
protected void statisticsDay(Integer statisticsYear, Integer statisticsMonth, Integer statisticsDay, Long statisticsStartId, Long statisticsEndId){
List<VoClientAmountStatistics> list = rmClientAmountDayDao.statisticsByClient(statisticsStartId, statisticsEndId) ;
if(list != null && list.size() > 0){
+ List<StClientAmountDay> listOfDay = stClientAmountDayDao.selectByYearAndMonthAndDay(statisticsYear, statisticsMonth) ;
for(VoClientAmountStatistics vo : list){
- List<StClientAmountDay> listOfDay = stClientAmountDayDao.selectByClientIdAndYearAndMonthAndDay(vo.clientId, statisticsYear, statisticsMonth) ;
- StClientAmountDay po = null ;
- if(listOfDay != null && listOfDay.size() > 0){
- //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
- po = listOfDay.get(0) ;
- }
+ StClientAmountDay po = this.getDayDataOfClient(listOfDay, vo.clientId) ;
if(po == null){
po = new StClientAmountDay() ;
po.clientId = vo.clientId ;
@@ -70,23 +63,17 @@
*/
@Transactional
protected void statisticsMonth(Integer statisticsYear, Integer statisticsMonth, Long statisticsStartId, Long statisticsEndId){
- List<VoClientAmountStatistics> list = rmClientAmountDayDao.statisticsByClient(statisticsStartId, statisticsEndId) ;
+ List<VoClientAmountStatistics> list = stClientAmountDayDao.statisticsByClient(statisticsYear, statisticsMonth) ;
if(list != null && list.size() > 0){
+ List<StClientAmountMonth> listOfMonth = stClientAmountMonthDao.selectByYear(statisticsYear) ;
for(VoClientAmountStatistics vo : list){
- List<StClientAmountMonth> listOfMonth = stClientAmountMonthDao.selectByClientIdAndYearAndMonth(vo.clientId, statisticsYear, statisticsMonth) ;
- StClientAmountMonth po = null ;
- if(listOfMonth != null && listOfMonth.size() > 0){
- //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
- po = listOfMonth.get(0) ;
- }
+ StClientAmountMonth po = this.getMonthDataOfClient(listOfMonth, vo.clientId) ;
if(po == null) {
po = new StClientAmountMonth();
}
po.clientId = vo.clientId ;
po.year = statisticsYear ;
- po.month = statisticsMonth ;
- po.amount = vo.amount;
- po.money = vo.money ;
+ this.setValueOfMonthOfYear(statisticsMonth, vo, po) ;
if(po.id == null) {
stClientAmountMonthDao.insert(po);
}else{
@@ -103,20 +90,17 @@
protected void statisticsYear(Integer statisticsYear){
List<VoClientAmountStatistics> list = stClientAmountMonthDao.statisticsByClient(statisticsYear) ;
if(list != null && list.size() > 0){
+ List<StClientAmountYear> listOfYear = stClientAmountYearDao.selectByYear(statisticsYear) ;
for(VoClientAmountStatistics vo : list){
- List<StClientAmountYear> listOfYear = stClientAmountYearDao.selectByClientIdAndYear(vo.clientId, statisticsYear) ;
- StClientAmountYear po = null ;
- if(listOfYear != null && listOfYear.size() > 0){
- //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
- po = listOfYear.get(0) ;
- }
+ StClientAmountYear po = this.getYearDataOfClient(listOfYear, vo.clientId) ;
if(po == null) {
po = new StClientAmountYear();
}
po.clientId = vo.clientId ;
po.year = statisticsYear ;
- po.amount = vo.amount;
+ po.amount = vo.amount ;
po.money = vo.money ;
+ po.times = vo.times ;
if(po.id == null) {
stClientAmountYearDao.insert(po);
}else{
@@ -126,190 +110,269 @@
}
}
+
+ private StClientAmountDay getDayDataOfClient(List<StClientAmountDay> list, Long clientId){
+ if(list != null && list.size() > 0){
+ for(StClientAmountDay po : list){
+ if(po.clientId.longValue() == clientId.longValue()){
+ //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
+ return po;
+ }
+ }
+ }
+ return null ;
+ }
+
+
+ private StClientAmountMonth getMonthDataOfClient(List<StClientAmountMonth> list, Long clientId){
+ if(list != null && list.size() > 0){
+ for(StClientAmountMonth po : list){
+ if(po.clientId.longValue() == clientId.longValue()){
+ //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
+ return po;
+ }
+ }
+ }
+ return null ;
+ }
+
+
+ private StClientAmountYear getYearDataOfClient(List<StClientAmountYear> list, Long clientId){
+ if(list != null && list.size() > 0){
+ for(StClientAmountYear po : list){
+ if(po.clientId.longValue() == clientId.longValue()){
+ //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
+ return po;
+ }
+ }
+ }
+ return null ;
+ }
+
+
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;
}
}
- private void setValueOfMonthOfYear(Integer statisticsMonth, VoClientConsumeStatistics vo, StConsumeClientMonth po){
+ private void setValueOfMonthOfYear(Integer statisticsMonth, VoClientAmountStatistics vo, StClientAmountMonth po){
switch (statisticsMonth) {
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;
}
}
- private void setValueOfYear(VoClientConsumeStatistics vo, StConsumeClientYear po){
- po.amount = vo.amount;
- po.times = vo.times;
- }
}
--
Gitblit v1.8.0