From 46ea49c9452002f2c01a10fd9550339a8aaa7cd1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 18 六月 2025 14:19:15 +0800
Subject: [PATCH] 1、新了解到，FBox可接多台套水肥机、气象站、墒情站，相应修改协议（主要是主题部分）； 2、编写《水肥机、气象站、墒情站协议》（未完）。
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java
index e33506e..066894a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java
@@ -84,16 +84,22 @@
List<Integer> yearGrp = new ArrayList<Integer>();
int nowYear = Integer.parseInt(DateTime.yyyy()) ;
if(qo.year == null) {
- for(int i = startYear4YearStatistics; i <= nowYear; i++) {
+ int startYear = nowYear - 4 ;//鏌�5骞寸殑
+ if(startYear < startYear4YearStatistics){
+ startYear = startYear4YearStatistics ;
+ }
+ for(int i = startYear; i <= nowYear; i++) {
yearGrp.add(i) ;
}
}else{
+ /*
if(qo.year > nowYear){
qo.year = nowYear;
}
if(qo.year < startYear4YearStatistics){
qo.year = startYear4YearStatistics;
}
+ */
yearGrp.add(qo.year) ;
}
return BaseResponseUtils.buildSuccess(this.sv.selectStClientAmountYear(qo, yearGrp));
--
Gitblit v1.8.0