From 1129cc278ec2f7f1fd3eb325b11974bd884346da Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 09 四月 2025 13:48:49 +0800
Subject: [PATCH] 灌溉计划详情增加计划状态

---
 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java |  319 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 261 insertions(+), 58 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 6a999b5..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
@@ -1,6 +1,8 @@
 package com.dy.pipIrrStatistics.intake;
 
 import com.dy.common.aop.SsoAop;
+import com.dy.common.util.DateTime;
+import com.dy.common.util.IDLongGenerator;
 import com.dy.common.webUtil.BaseResponse;
 import com.dy.common.webUtil.BaseResponseUtils;
 import com.dy.common.webUtil.QueryResultVo;
@@ -17,6 +19,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -35,7 +38,7 @@
 public class IntkeCtrl {
     private final IntakeSv intakeSv;
 
-    /**
+    /** ok 111
      * 鑾峰彇鎸囧畾鏃堕棿娈靛唴鏈笂绾跨殑鍙栨按鍙�
      * @param qo
      * @return
@@ -46,16 +49,96 @@
         if(bindingResult != null && bindingResult.hasErrors()){
             return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
-
+        String timeStart = qo.getTimeStart();
+        String timeStop = qo.getTimeStop();
+        Long startId = null ;
+        Long endId = null ;
+        if(timeStart != null && !timeStart.trim().equals("")){
+            int[] ymdStart = DateTime.yyyy_MM_dd_2_ymdGroup(timeStart) ;
+            startId = IDLongGenerator.generateOneDayStartId(ymdStart[0], ymdStart[1], ymdStart[2]) ;
+        }
+        if(timeStop != null && !timeStop.trim().equals("")){
+            int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
+            endId = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+        }
+        if(startId != null && endId != null){
+            if(endId < startId){
+                return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+            }
+        }
         try {
-            return BaseResponseUtils.buildSuccess(intakeSv.getNotOnlineIntakes(qo));
+            return BaseResponseUtils.buildSuccess(intakeSv.getNotOnlineIntakes(qo, startId, endId));
         } catch (Exception e) {
-            log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
+            log.error("鑾峰彇璁板綍寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage()) ;
         }
     }
 
-    /**
+    /** ok 112
+     * 鏈�杩戞湭鎶ユ暟鐨勫彇姘村彛
+     * @param
+     * @return
+     */
+    @GetMapping(path = "/getUnReportedIntakes")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoIntakeUnReported>>> getUnReportedIntakes(@Valid CommonQO qo, BindingResult bindingResult) {
+        if(bindingResult != null && bindingResult.hasErrors()){
+            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+        }
+        String timeStart = qo.getTimeStart();
+        if(timeStart != null && !timeStart.trim().equals("")) {
+            qo.setTimeStart(timeStart + " 00:00:00") ;
+        }
+        try {
+            QueryResultVo<List<VoIntakeUnReported>> res = intakeSv.getUnReportedIntakes(qo);
+            return BaseResponseUtils.buildSuccess(res);
+        } catch (Exception e) {
+            log.error("鑾峰彇璁板綍寮傚父", e);
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
+
+
+
+    /** ok 113
+     * 鑾峰彇浠庢湭寮�杩囬榾鐨勫彇姘村彛
+     * @param
+     * @return
+     */
+    @GetMapping(path = "/getNeverOpenValveIntakes")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoIntakeUnOpenValve>>> getNeverOpenValveIntakes(@Valid CommonQO qo, BindingResult bindingResult) {
+        if(bindingResult != null && bindingResult.hasErrors()){
+            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+        }
+        String timeStart = qo.getTimeStart();
+        String timeStop = qo.getTimeStop();
+        Long startId = null ;
+        Long endId = null ;
+        if(timeStart != null && !timeStart.trim().equals("")){
+            int[] ymdStart = DateTime.yyyy_MM_dd_2_ymdGroup(timeStart) ;
+            startId = IDLongGenerator.generateOneDayStartId(ymdStart[0], ymdStart[1], ymdStart[2]) ;
+        }
+        if(timeStop != null && !timeStop.trim().equals("")){
+            int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
+            endId = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+        }
+        if(startId != null && endId != null){
+            if(endId < startId){
+                return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+            }
+        }
+        try {
+            QueryResultVo<List<VoIntakeUnOpenValve>> res = intakeSv.getNeverOpenValveIntakes(qo, startId, endId) ;
+            return BaseResponseUtils.buildSuccess(res);
+        } catch (Exception e) {
+            log.error("鑾峰彇璁板綍寮傚父", e);
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
+
+
+    /** ok 1
      * 鑾峰彇绱娴侀噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
      * @param qo
      * @return
@@ -69,12 +152,12 @@
         try {
             return BaseResponseUtils.buildSuccess(intakeSv.getLargeFlowIntakes(qo));
         } catch (Exception e) {
-            log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
+            log.error("鑾峰彇璁板綍寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage()) ;
         }
     }
 
-    /**
+    /** ok 2
      * 鑾峰彇绱娴侀噺浣庝簬鎸囧畾鍊肩殑鍙栨按鍙�
      * @param qo
      * @return
@@ -88,12 +171,12 @@
         try {
             return BaseResponseUtils.buildSuccess(intakeSv.getSmallFlowIntakes(qo));
         } catch (Exception e) {
-            log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
+            log.error("鑾峰彇璁板綍寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage()) ;
         }
     }
 
-    /**
+    /** ok 114
      * 鑾峰彇娆犲帇鍙栨按鍙�
      * @param qo
      * @return
@@ -107,12 +190,12 @@
         try {
             return BaseResponseUtils.buildSuccess(intakeSv.getUnderVoltIntakes(qo));
         } catch (Exception e) {
-            log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
+            log.error("鑾峰彇璁板綍寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage()) ;
         }
     }
 
-    /**
+    /** ok 115
      * 鑾峰彇鎸囧畾淇″彿寮哄害鐨勫彇姘村彛
      * @param qo
      * @return
@@ -126,75 +209,117 @@
         try {
             return BaseResponseUtils.buildSuccess(intakeSv.getSpecifiedSignalIntakes(qo));
         } catch (Exception e) {
-            log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
+            log.error("鑾峰彇璁板綍寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage()) ;
         }
     }
 
-    /**
+    /** ok 11
      * 鏍规嵁寮�闃�绫诲瀷鑾峰彇鎿嶄綔娆℃暟
      * @param qo
      * @return
      */
     @GetMapping(path = "/getCountByOpenType")
     @SsoAop()
-    public BaseResponse<QueryResultVo<VoCountOfOpenType>> getCountByOpenType(@Valid OpenTypeQO qo, BindingResult bindingResult) {
+    public BaseResponse<QueryResultVo<VoCountOfOpenType>> getCountByOpenType(@Valid OpenTypeQO qo, BindingResult bindingResult) throws Exception{
         if(bindingResult != null && bindingResult.hasErrors()){
             return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
-        try {
-            return BaseResponseUtils.buildSuccess(intakeSv.getCountByOpenType(qo));
-        } catch (Exception e) {
-            log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+        String timeStart = qo.getTimeStart();
+        String timeStop = qo.getTimeStop();
+        if(timeStart == null || timeStart.trim().equals("")){
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
         }
-    }
-
-    /**
-     * 鏍规嵁鍏抽榾绫诲瀷鑾峰彇鎿嶄綔娆℃暟
-     * @param qo
-     * @return
-     */
-    @GetMapping(path = "/getCountByCloseType")
-    @SsoAop()
-    public BaseResponse<QueryResultVo<VoCountOfCloseType>> getCountByCloseType(@Valid CloseTypeQo qo, BindingResult bindingResult) {
-        if(bindingResult != null && bindingResult.hasErrors()){
-            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+        if(timeStop == null || timeStop.trim().equals("")){
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
         }
-        try {
-            return BaseResponseUtils.buildSuccess(intakeSv.getCountByCloseType(qo));
-        } catch (Exception e) {
-            log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+        long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
+        if(dur < 0){
+            return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
         }
-    }
-
-    /**
-     * 鑾峰彇浠庢湭寮�杩囬榾鐨勫彇姘村彛
-     * @param
-     * @return
-     */
-    @GetMapping(path = "/getNeverOpenValveIntakes")
-    @SsoAop()
-    public BaseResponse<QueryResultVo<List<VoIntake>>> getNeverOpenValveIntakes(CommonQO qo) {
+        if(dur > 366){
+            return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
+        }
+        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.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
         try {
-            QueryResultVo<List<VoIntake>> res = intakeSv.getNeverOpenValveIntakes(qo);
-            return BaseResponseUtils.buildSuccess(res);
+            return BaseResponseUtils.buildSuccess(intakeSv.getCountByOpenType(startId, endId, qo.getOpenType()));
         } catch (Exception e) {
             log.error("鑾峰彇璁板綍寮傚父", e);
             return BaseResponseUtils.buildException(e.getMessage()) ;
         }
     }
 
+    /** ok 12
+     * 鏍规嵁鍏抽榾绫诲瀷鑾峰彇鎿嶄綔娆℃暟
+     * @param qo
+     * @return
+     */
+    @GetMapping(path = "/getCountByCloseType")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<VoCountOfCloseType>> getCountByCloseType(@Valid CloseTypeQo qo, BindingResult bindingResult) throws Exception{
+        if(bindingResult != null && bindingResult.hasErrors()){
+            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+        }
+        String timeStart = qo.getTimeStart();
+        String timeStop = qo.getTimeStop();
+        if(timeStart == null || timeStart.trim().equals("")){
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
+        }
+        if(timeStop == null || timeStop.trim().equals("")){
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
+        }
+        long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
+        if(dur < 0){
+            return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+        }
+        if(dur > 366){
+            return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
+        }
+        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.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+        try {
+            return BaseResponseUtils.buildSuccess(intakeSv.getCountByCloseType(startId, endId, qo.getCloseType()));
+        } catch (Exception e) {
+            log.error("鑾峰彇璁板綍寮傚父", e);
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
 
-    /**
+    /** ok 13
      * 鑾峰彇鎸囧畾鏃堕棿娈靛唴寮�闃�娆℃暟瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
      * @param
      * @return
      */
     @GetMapping(path = "/getOpenValveGtIntakes")
     @SsoAop()
-    public BaseResponse<QueryResultVo<List<VoIntakeOpenCount>>> getOpenValveGtIntakes(IntakeCountValueQO qo) {
+    public BaseResponse<QueryResultVo<List<VoIntakeOpenCount>>> getOpenValveGtIntakes(@Valid IntakeCountValueQO qo, BindingResult bindingResult) throws Exception {
+        if(bindingResult != null && bindingResult.hasErrors()){
+            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+        }
+        String timeStart = qo.getTimeStart();
+        String timeStop = qo.getTimeStop();
+        if(timeStart == null || timeStart.trim().equals("")){
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
+        }
+        if(timeStop == null || timeStop.trim().equals("")){
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
+        }
+        long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
+        if(dur < 0){
+            return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+        }
+        if(dur > 366){
+            return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
+        }
+        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.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
         try {
             QueryResultVo<List<VoIntakeOpenCount>> res = intakeSv.getOpenValveGtIntakes(qo);
             return BaseResponseUtils.buildSuccess(res);
@@ -204,14 +329,36 @@
         }
     }
 
-    /**
+    /** ok 14
      * 鑾峰彇鎸囧畾鏃堕棿娈靛唴寮�闃�娆℃暟浣庝簬鎸囧畾鍊肩殑鍙栨按鍙�
      * @param
      * @return
      */
     @GetMapping(path = "/getOpenValveLtIntakes")
     @SsoAop()
-    public BaseResponse<QueryResultVo<List<VoIntakeOpenCount>>> getOpenValveLtIntakes(IntakeCountValueQO qo) {
+    public BaseResponse<QueryResultVo<List<VoIntakeOpenCount>>> getOpenValveLtIntakes(@Valid IntakeCountValueQO qo, BindingResult bindingResult) throws Exception {
+        if(bindingResult != null && bindingResult.hasErrors()){
+            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+        }
+        String timeStart = qo.getTimeStart();
+        String timeStop = qo.getTimeStop();
+        if(timeStart == null || timeStart.trim().equals("")){
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
+        }
+        if(timeStop == null || timeStop.trim().equals("")){
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
+        }
+        long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
+        if(dur < 0){
+            return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+        }
+        if(dur > 366){
+            return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
+        }
+        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.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
         try {
             QueryResultVo<List<VoIntakeOpenCount>> res = intakeSv.getOpenValveLtIntakes(qo);
             return BaseResponseUtils.buildSuccess(res);
@@ -220,6 +367,7 @@
             return BaseResponseUtils.buildException(e.getMessage()) ;
         }
     }
+
 
     /**
      * 鎸囧畾鏃堕棿娈靛唴绱Н娴侀噺(瀹氭椂鎶ラ噷鐨勭疮绉祦閲�)瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
@@ -238,7 +386,7 @@
         }
     }
 
-    /**
+    /** ok 3
      * 鎸囧畾鏃堕棿娈靛唴鐢ㄦ按閲忚秴杩囨寚瀹氬�肩殑鍙栨按鍙�
      * @param
      * @return
@@ -255,7 +403,7 @@
         }
     }
 
-    /**
+    /** ok 4
      * 鎸囧畾鏃堕棿娈靛唴娑堣垂閲戦瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
      * @param
      * @return
@@ -272,6 +420,22 @@
         }
     }
 
+    /**
+     * 鎸囧畾鏃堕棿娈靛唴鐢ㄦ按娆℃暟瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
+     * @param
+     * @return
+     */
+    @GetMapping(path = "/getUseWaterTimesGtValueIntakes")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoIntakeAccumulateAmount>>> getUseWaterTimesGtValueIntakes(IntakeCountValueQO qo) {
+        try {
+            QueryResultVo<List<VoIntakeAccumulateAmount>> res = intakeSv.getUseWaterTimesGtValueIntakes(qo);
+            return BaseResponseUtils.buildSuccess(res);
+        } catch (Exception e) {
+            log.error("鑾峰彇璁板綍寮傚父", e);
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
 
     /**
      * 鎸囧畾鏃堕棿娈靛唴鐢ㄦ按鏃堕暱瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
@@ -290,14 +454,33 @@
         }
     }
 
-    /**
+    /** ok 15
      * 鎸囧畾鏃堕棿娈� 鏈夊紑闃� 鏃犲叧闃�鐨勫彇姘村彛
      * @param
      * @return
      */
     @GetMapping(path = "/getHaveOpenNoCloseIntakes")
     @SsoAop()
-    public BaseResponse<QueryResultVo<List<VoIntake>>> getHaveOpenNoCloseIntakes(CommonQO qo) {
+    public BaseResponse<QueryResultVo<List<VoIntake>>> getHaveOpenNoCloseIntakes(IntakeCountValueQO qo) throws Exception {
+        String timeStart = qo.getTimeStart();
+        String timeStop = qo.getTimeStop();
+        if(timeStart == null || timeStart.trim().equals("")){
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
+        }
+        if(timeStop == null || timeStop.trim().equals("")){
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
+        }
+        long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
+        if(dur < 0){
+            return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+        }
+        if(dur > 366){
+            return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
+        }
+        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.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
         try {
             QueryResultVo<List<VoIntake>> res = intakeSv.getHaveOpenNoCloseIntakes(qo);
             return BaseResponseUtils.buildSuccess(res);
@@ -307,14 +490,33 @@
         }
     }
 
-    /**
+    /** ok 16
      * 鎸囧畾鏃堕棿娈� 鏃犲紑闃� 鏈夊叧闃�鐨勫彇姘村彛
      * @param
      * @return
      */
     @GetMapping(path = "/getNoOpenHaveCloseIntakes")
     @SsoAop()
-    public BaseResponse<QueryResultVo<List<VoIntake>>> getNoOpenHaveCloseIntakes(CommonQO qo) {
+    public BaseResponse<QueryResultVo<List<VoIntake>>> getNoOpenHaveCloseIntakes(IntakeCountValueQO qo) throws Exception {
+        String timeStart = qo.getTimeStart();
+        String timeStop = qo.getTimeStop();
+        if(timeStart == null || timeStart.trim().equals("")){
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
+        }
+        if(timeStop == null || timeStop.trim().equals("")){
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
+        }
+        long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
+        if(dur < 0){
+            return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+        }
+        if(dur > 366){
+            return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
+        }
+        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.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
         try {
             QueryResultVo<List<VoIntake>> res = intakeSv.getNoOpenHaveCloseIntakes(qo);
             return BaseResponseUtils.buildSuccess(res);
@@ -419,4 +621,5 @@
             return BaseResponseUtils.buildException(e.getMessage()) ;
         }
     }
+
 }

--
Gitblit v1.8.0