From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java
index 64031bb..8d28f5b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java
@@ -59,7 +59,7 @@
}
if(timeStop != null && !timeStop.trim().equals("")){
int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
- endId = IDLongGenerator.generateOneDayStartId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+ endId = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
}
if(startId != null && endId != null){
if(endId < startId){
@@ -121,7 +121,7 @@
}
if(timeStop != null && !timeStop.trim().equals("")){
int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
- endId = IDLongGenerator.generateOneDayStartId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+ endId = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
}
if(startId != null && endId != null){
if(endId < startId){
@@ -176,7 +176,7 @@
}
}
- /**
+ /** ok 114
* 鑾峰彇娆犲帇鍙栨按鍙�
* @param qo
* @return
@@ -195,7 +195,7 @@
}
}
- /**
+ /** ok 115
* 鑾峰彇鎸囧畾淇″彿寮哄害鐨勫彇姘村彛
* @param qo
* @return
@@ -243,7 +243,7 @@
int[] ymdStart = DateTime.yyyy_MM_dd_2_ymdGroup(timeStart) ;
int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
long startId = IDLongGenerator.generateOneDayStartId(ymdStart[0], ymdStart[1], ymdStart[2]) ;
- long endId = IDLongGenerator.generateOneDayStartId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+ long endId = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
try {
return BaseResponseUtils.buildSuccess(intakeSv.getCountByOpenType(startId, endId, qo.getOpenType()));
} catch (Exception e) {
@@ -281,7 +281,7 @@
int[] ymdStart = DateTime.yyyy_MM_dd_2_ymdGroup(timeStart) ;
int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
long startId = IDLongGenerator.generateOneDayStartId(ymdStart[0], ymdStart[1], ymdStart[2]) ;
- long endId = IDLongGenerator.generateOneDayStartId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+ long endId = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
try {
return BaseResponseUtils.buildSuccess(intakeSv.getCountByCloseType(startId, endId, qo.getCloseType()));
} catch (Exception e) {
@@ -319,7 +319,7 @@
int[] ymdStart = DateTime.yyyy_MM_dd_2_ymdGroup(timeStart) ;
int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
qo.idStart = IDLongGenerator.generateOneDayStartId(ymdStart[0], ymdStart[1], ymdStart[2]) ;
- qo.idEnd = IDLongGenerator.generateOneDayStartId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+ qo.idEnd = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
try {
QueryResultVo<List<VoIntakeOpenCount>> res = intakeSv.getOpenValveGtIntakes(qo);
return BaseResponseUtils.buildSuccess(res);
@@ -358,7 +358,7 @@
int[] ymdStart = DateTime.yyyy_MM_dd_2_ymdGroup(timeStart) ;
int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
qo.idStart = IDLongGenerator.generateOneDayStartId(ymdStart[0], ymdStart[1], ymdStart[2]) ;
- qo.idEnd = IDLongGenerator.generateOneDayStartId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+ qo.idEnd = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
try {
QueryResultVo<List<VoIntakeOpenCount>> res = intakeSv.getOpenValveLtIntakes(qo);
return BaseResponseUtils.buildSuccess(res);
@@ -480,7 +480,7 @@
int[] ymdStart = DateTime.yyyy_MM_dd_2_ymdGroup(timeStart) ;
int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
qo.idStart = IDLongGenerator.generateOneDayStartId(ymdStart[0], ymdStart[1], ymdStart[2]) ;
- qo.idEnd = IDLongGenerator.generateOneDayStartId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+ qo.idEnd = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
try {
QueryResultVo<List<VoIntake>> res = intakeSv.getHaveOpenNoCloseIntakes(qo);
return BaseResponseUtils.buildSuccess(res);
@@ -516,7 +516,7 @@
int[] ymdStart = DateTime.yyyy_MM_dd_2_ymdGroup(timeStart) ;
int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
qo.idStart = IDLongGenerator.generateOneDayStartId(ymdStart[0], ymdStart[1], ymdStart[2]) ;
- qo.idEnd = IDLongGenerator.generateOneDayStartId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+ qo.idEnd = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
try {
QueryResultVo<List<VoIntake>> res = intakeSv.getNoOpenHaveCloseIntakes(qo);
return BaseResponseUtils.buildSuccess(res);
--
Gitblit v1.8.0