From 43a19a4424f67c379934ed0d70e0d1b3512cd769 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 27 三月 2025 09:31:44 +0800
Subject: [PATCH] 灌溉计划表中增加项目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