From 93ba9eca861363be9a0ffa73478a3505920d2673 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 14 七月 2025 14:23:48 +0800
Subject: [PATCH] 修改用水户年用水量统计查询中的bug
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientSv.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 0cacebe..e255bc4 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
@@ -107,24 +107,29 @@
// 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
Long itemTotal = 0L ;
String clientIdsJson = null ;
+ /* 2025-07-14 閲囩敤鍐滄埛鎬绘暟
if(oneYear){
itemTotal = stClientAmountYearDao.selectCountYearStatistics4OneYear(params) ;
}else{
itemTotal = stClientAmountYearDao.selectCountYearStatistics(params) ;
- List<VoStClientIdAmountYearRecord> clientIds = stClientAmountYearDao.selectClientIds4YearStatistics(params);
- clientIdsJson = JSON.toJSONString(clientIds) ;
- }
+ }*/
+ itemTotal = stClientAmountYearDao.selectCountYearStatistics(params) ;
if(itemTotal != null && itemTotal > 0) {
rsQrVo.pageSize = qo.pageSize;
rsQrVo.pageCurr = qo.pageCurr;
rsQrVo.calculateAndSet(itemTotal, params);
+ List<VoStClientIdAmountYearRecord> clientIds = stClientAmountYearDao.selectClientIds4YearStatistics(params);
+ clientIdsJson = JSON.toJSONString(clientIds) ;
+
List<VoStClientAmountYearRecords> group = new ArrayList<>();
int count = 1 ;
for(int year: yearGrp){
params.put("year", year);
- List<VoStClientAmountYearRecord> list ;
+ params.put("clientIdsJson", clientIdsJson);
+ List<VoStClientAmountYearRecord> list = stClientAmountYearDao.selectYearStatistics(params);
+ /* 2025-07-14
if(oneYear){
list = stClientAmountYearDao.selectYearStatistics4OneYear(params);
}else{
@@ -132,7 +137,7 @@
params.put("clientIdsJson", clientIdsJson);
}
list = stClientAmountYearDao.selectYearStatistics(params);
- }
+ }*/
if(group.isEmpty()){
this.completion(group, list);
--
Gitblit v1.8.0