From bdb2f52b04d53f4e0faaa384238244f253b5334f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 14 七月 2025 15:14:59 +0800
Subject: [PATCH] 修改用水户日、月、年用水量统计查询中的bug
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientSv.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientSv.java
index d1c9168..c05c768 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientSv.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrStatistics.stClient;
+import com.alibaba.fastjson2.JSON;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoSt.StClientAmountDayMapper ;
import com.dy.pipIrrGlobal.daoSt.StClientAmountMonthMapper ;
@@ -59,6 +60,10 @@
rsVo.pageCurr = qo.pageCurr;
rsVo.calculateAndSet(itemTotal, params);
+ List<VoStClientIdAmountYearRecord> clientIds = stClientAmountDayDao.selectClientIds4DayStatistics(params);
+ String clientIdsJson = JSON.toJSONString(clientIds) ;
+ params.put("clientIdsJson", clientIdsJson);
+
rsVo.obj = stClientAmountDayDao.selectDayStatistics(params);
}
return rsVo ;
@@ -82,6 +87,10 @@
rsVo.pageCurr = qo.pageCurr;
rsVo.calculateAndSet(itemTotal, params);
+ List<VoStClientIdAmountYearRecord> clientIds = stClientAmountMonthDao.selectClientIds4MonthStatistics(params);
+ String clientIdsJson = JSON.toJSONString(clientIds) ;
+ params.put("clientIdsJson", clientIdsJson);
+
rsVo.obj = stClientAmountMonthDao.selectMonthStatistics(params);
}
return rsVo ;
@@ -93,23 +102,32 @@
* @param qo
* @return
*/
- public QueryResultVo<List<VoStClientAmountYearRecords>> selectStClientAmountYear(StClientQo qo, List<Integer> yearGrp) throws ParseException {
- QueryResultVo<List<VoStClientAmountYearRecords>> rsVo = new QueryResultVo<>() ;
+ public QueryResultVo<VoStClientAmountYear> selectStClientAmountYear(StClientQo qo, List<Integer> yearGrp) throws ParseException {
+ QueryResultVo<VoStClientAmountYear> rsQrVo = new QueryResultVo<>() ;
+
+ VoStClientAmountYear rsVo = new VoStClientAmountYear();
+ rsVo.yearGrp = yearGrp ;
+ rsQrVo.obj = rsVo ;
+
+ boolean oneYear = yearGrp.size() == 1? true : false ;
// 鐢熸垚鏌ヨ鍙傛暟
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
- params.put("yearGrp", yearGrp);
// 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
Long itemTotal = stClientAmountYearDao.selectCountYearStatistics(params) ;
if(itemTotal != null && itemTotal > 0) {
- rsVo.pageSize = qo.pageSize;
- rsVo.pageCurr = qo.pageCurr;
- rsVo.calculateAndSet(itemTotal, params);
+ rsQrVo.pageSize = qo.pageSize;
+ rsQrVo.pageCurr = qo.pageCurr;
+ rsQrVo.calculateAndSet(itemTotal, params);
+
+ List<VoStClientIdAmountYearRecord> clientIds = stClientAmountYearDao.selectClientIds4YearStatistics(params);
+ String clientIdsJson = JSON.toJSONString(clientIds) ;
List<VoStClientAmountYearRecords> group = new ArrayList<>();
int count = 1 ;
for(int year: yearGrp){
params.put("year", year);
+ params.put("clientIdsJson", clientIdsJson);
List<VoStClientAmountYearRecord> list = stClientAmountYearDao.selectYearStatistics(params);
if(group.isEmpty()){
this.completion(group, list);
@@ -117,9 +135,10 @@
this.merge(count, group, list) ;
count += 1 ;
}
- rsVo.obj = group ;
+ rsVo.records = group ;
}
- return rsVo ;
+
+ return rsQrVo ;
}
/**
--
Gitblit v1.8.0