From e9d04864135236c8b39b06f62d001631524197e6 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 20 六月 2025 17:02:58 +0800
Subject: [PATCH] 1、协议细化，处理小数； 2、水肥机、气象站、墒情站实体增加属性fboxId(FBox序列号)；
---
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