From ea58523b67ad59002a1191c3c564258c5b81f6f2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:35:16 +0800
Subject: [PATCH] Revert "1、实现万用token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。"
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigateGroupMapper.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 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 9ee8d84..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
@@ -2,12 +2,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoIr.IrIrrigateGroup;
-import com.dy.pipIrrGlobal.voIr.VoGroup;
-import com.dy.pipIrrGlobal.voIr.VoGroupDetail;
-import com.dy.pipIrrGlobal.voIr.VoGroupOne;
-import com.dy.pipIrrGlobal.voIr.VoGroupSimple;
+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;
@@ -73,4 +72,48 @@
* @return
*/
VoGroupDetail getGroupDetail(Long groupId);
+
+ /**
+ * 鏍规嵁鐏屾簤璁″垝ID鑾峰彇璁″垝鍙戝竷缁撴灉
+ * @param planId
+ * @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