From 9343e802bd45a58de02343db3832b4c7dd16e49e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 14 七月 2025 11:06:22 +0800
Subject: [PATCH] 修改用水户年用水量统计查询中的bug
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientSv.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 19f7bb3..0cacebe 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 ;
@@ -100,10 +101,19 @@
rsVo.yearGrp = yearGrp ;
rsQrVo.obj = rsVo ;
+ boolean oneYear = yearGrp.size() == 1? true : false ;
// 鐢熸垚鏌ヨ鍙傛暟
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
// 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
- Long itemTotal = stClientAmountYearDao.selectCountYearStatistics(params) ;
+ Long itemTotal = 0L ;
+ String clientIdsJson = null ;
+ if(oneYear){
+ itemTotal = stClientAmountYearDao.selectCountYearStatistics4OneYear(params) ;
+ }else{
+ itemTotal = stClientAmountYearDao.selectCountYearStatistics(params) ;
+ List<VoStClientIdAmountYearRecord> clientIds = stClientAmountYearDao.selectClientIds4YearStatistics(params);
+ clientIdsJson = JSON.toJSONString(clientIds) ;
+ }
if(itemTotal != null && itemTotal > 0) {
rsQrVo.pageSize = qo.pageSize;
@@ -114,7 +124,16 @@
int count = 1 ;
for(int year: yearGrp){
params.put("year", year);
- List<VoStClientAmountYearRecord> list = stClientAmountYearDao.selectYearStatistics(params);
+ List<VoStClientAmountYearRecord> list ;
+ if(oneYear){
+ list = stClientAmountYearDao.selectYearStatistics4OneYear(params);
+ }else{
+ if(clientIdsJson != null){
+ params.put("clientIdsJson", clientIdsJson);
+ }
+ list = stClientAmountYearDao.selectYearStatistics(params);
+ }
+
if(group.isEmpty()){
this.completion(group, list);
}
--
Gitblit v1.8.0