From 4513ef24bf9b188c2a77d6ce94f1a6b7e9ebf0e6 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期日, 27 四月 2025 20:40:19 +0800
Subject: [PATCH] fix(irrigatePlan): 修正灌溉计划开始时间逻辑

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigateGroupMapper.java |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigateGroupMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigateGroupMapper.java
index 829e58a..b2be323 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigateGroupMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigateGroupMapper.java
@@ -4,7 +4,9 @@
 import com.dy.pipIrrGlobal.pojoIr.IrIrrigateGroup;
 import com.dy.pipIrrGlobal.voIr.*;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -77,4 +79,41 @@
      * @return
      */
     List<VoGroupResult> getGroupResult(Long planId);
+
+    /**
+     * 鏍规嵁鐏屾簤璁″垝ID鑾峰彇杞亴缁勭粓姝㈢粨鏋�
+     * @param planId
+     * @param terminateTime
+     * @return
+     */
+    List<VoGroupResult> getGroupResult_terminate(@Param("planId") Long planId, @Param("terminateTime") Date terminateTime);
+
+    /**
+     * 鏍规嵁杞亴缁処D鑾峰彇杞亴缁勮鎯�
+     * @param groupId
+     * @return
+     */
+    List<VoGroupIntakes> getGroupIntakes(Long groupId);
+
+    /**
+     * 鏍规嵁杞亴缁処D鑾峰彇杞亴缁勮鎯呭垪琛�
+     * @param groupId
+     * @return
+     */
+    List<VoIntake> getGroupIntakesList(Long groupId);
+
+    /**
+     * 鏍规嵁杞亴缁勫悕绉扮粺璁¤褰曟暟
+     * @param groupCode 杞亴缁勫悕绉�
+     * @return 鍖归厤鐨勮褰曟暟
+     */
+    int countByGroupCode(@Param("groupCode") String groupCode);
+
+    /**
+     * 鏍规嵁杞亴缁勫悕绉扮粺璁¤褰曟暟锛堟帓闄ゆ寚瀹欼D锛�
+     * @param groupCode 杞亴缁勫悕绉�
+     * @param excludeId 闇�瑕佹帓闄ょ殑杞亴缁処D
+     * @return 鍖归厤鐨勮褰曟暟
+     */
+    int countByGroupCodeExcludeId(@Param("groupCode") String groupCode, @Param("excludeId") Long excludeId);
 }
\ No newline at end of file

--
Gitblit v1.8.0