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-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIntakeOperateMapper.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIntakeOperateMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIntakeOperateMapper.java
index 2241e34..c79dda6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIntakeOperateMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIntakeOperateMapper.java
@@ -2,13 +2,17 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoIr.IrIntakeOperate;
+import com.dy.pipIrrGlobal.voIr.VoIntakeResult;
+import com.dy.pipIrrGlobal.voIr.VoToTerminateIntakes;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
/**
* @author ZhuBaoMin
- * @date 2025-03-25 20:41
- * @LastEditTime 2025-03-25 20:41
+ * @date 2025-04-02 10:54
+ * @LastEditTime 2025-04-02 10:54
* @Description
*/
@@ -33,4 +37,40 @@
* @return
*/
int updateByCommandId(@Param("commandId") Long commandId, @Param("commandResult") Byte commandResult, @Param("failureFactors") String failureFactors);
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍙栨按鍙D锛堝凡鍙戝竷寮�鍙戝懡浠わ紝鏃犺鏄惁鎴愬姛锛�
+ * @param planId
+ * @return
+ */
+ List<Long> getToTerminateIntakeIds(Long planId);
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍛戒护ID
+ * @param planId
+ * @return
+ */
+ List<Long> getTerminateCommandIds(Long planId);
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍙栨按鍙ｅ垪琛紙寮�闃�鎴愬姛鐨勶級
+ * @param planId
+ * @return
+ */
+ List<VoToTerminateIntakes> getToTerminateIntakes(Long planId);
+
+ /**
+ * 鏍规嵁璁″垝ID鍙婄杞粍ID鑾峰彇鍙栨按鍙ｅ彂甯冨彂甯冪粨鏋�
+ * @param planId
+ * @param groupId
+ * @return
+ */
+ List<VoIntakeResult> getIntakeResult(@Param("planId") Long planId, @Param("groupId") Long groupId);
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇鍙栨按鍙ｅ懡浠ゅ彂甯冨け璐ユ暟閲忥紝鐏屾簤璁″垝璇︽儏椤典娇鐢�
+ * @param planId
+ * @return
+ */
+ Integer getFailureCount(Long planId);
}
\ No newline at end of file
--
Gitblit v1.8.0