From aec4636e4fb430055feb66751da0e6c05bb864df Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 30 四月 2025 16:25:30 +0800
Subject: [PATCH] fix(irrigatePlan): 修复终止灌溉计划时长设置错误- 将终止计划的默认时长从 9999 修改为 0 - 此修改确保在终止灌溉计划时，不会出现时长设置过长的问题
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientSv.java | 21 +++++++++++++--------
1 files changed, 13 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..19f7bb3 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
@@ -93,18 +93,22 @@
* @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 ;
+
// 鐢熸垚鏌ヨ鍙傛暟
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<VoStClientAmountYearRecords> group = new ArrayList<>();
int count = 1 ;
@@ -117,9 +121,10 @@
this.merge(count, group, list) ;
count += 1 ;
}
- rsVo.obj = group ;
+ rsVo.records = group ;
}
- return rsVo ;
+
+ return rsQrVo ;
}
/**
--
Gitblit v1.8.0