From e5c29d6ac2b210a9385723598d79a42ae5a9679e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 23 四月 2025 15:20:13 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java | 111 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 92 insertions(+), 19 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java
index ab4c01e..a0d9f99 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java
@@ -2,16 +2,20 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoIr.IrIrrigatePlan;
-import com.dy.pipIrrGlobal.voIr.VoIrrigatePlan;
+import com.dy.pipIrrGlobal.voIr.VoPlanDetails;
+import com.dy.pipIrrGlobal.voIr.VoPlanSimple;
+import com.dy.pipIrrGlobal.voIr.VoPlans;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @author ZhuBaoMin
- * @date 2025-02-25 14:59
- * @LastEditTime 2025-02-25 14:59
+ * @date 2025-03-27 8:54
+ * @LastEditTime 2025-03-27 8:54
* @Description
*/
@@ -37,30 +41,99 @@
Byte getStartupMode(Long planId);
/**
- * 鏍规嵁鎸囧畾鐨勮鍒扞D鑾峰彇宸插彂甯冪殑鐏屾簤璁″垝鏁伴噺
- * @param planId
- * @return
- */
- Integer getPublishedCount(Long planId);
-
- /**
- * 鍙戝竷鎸囧畾鐨勭亴婧夎鍒�
- * @param planId
- * @return
- */
- int publishIrrigatePlan(Long planId);
-
- /**
* 鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栬鍒掓暟閲�
* @param params
* @return
*/
- Long getIrrigatePlanCount(Map<?, ?> params);
+ //Long getIrrigatePlanCount(Map<?, ?> params);
/**
* 鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栬鍒掑垪琛�
* @param params
* @return
*/
- List<VoIrrigatePlan> getIrrigatePlans(Map<?, ?> params);
+ //List<VoIrrigatePlan> getIrrigatePlans(Map<?, ?> params);
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝绠�鍗曚俊鎭�
+ * @return
+ */
+ VoPlanSimple getPlanSimple(Long planId);
+
+ /**
+ * 鏍规嵁璁″垝ID鏇存柊璁″垝淇℃伅锛堣捣姝㈡椂闂淬�佽鍒掔姸鎬侊級
+ * @param planId
+ * @return
+ */
+ Integer updatePlanTimes(@Param("planStartTime") Date planStartTime, @Param("planStopTime") Date planEndTime, @Param("planId") Long planId);
+
+ /**
+ * 鑾峰彇鏈畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
+ * 璁″垝鐘舵�侊細1-鑽夌锛�2-鏈墽琛岋紝3-鎵ц涓紝4-宸插畬鎴�
+ * @return
+ */
+ List<VoPlans> getNotCompletePlans();
+
+ /**
+ * 鑾峰彇宸插畬鎴愮殑璁″垝鏁伴噺
+ * @return
+ */
+ Long getCompletedPlansCount(Map<String, Object> params);
+
+ /**
+ * 鑾峰彇宸插畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
+ * 璁″垝鐘舵�侊細1-鑽夌锛�2-鏈墽琛岋紝3-鎵ц涓紝4-宸插畬鎴�
+ * @return
+ */
+ List<VoPlans> getCompletedPlans(Map<String, Object> params);
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈣鍒掔殑缁撴潫鏃堕棿锛氭湭鍒犻櫎銆佹湭缁堟銆佸凡鍙戝竷銆佸綋鍓嶆椂闂村皬浜庤鍒掔粨鏉熸椂闂�
+ * @param planId
+ * @return
+ */
+ Date getToTerminatePlan(@Param("planId") Long planId);
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝璇︽儏锛屽寘鎷鍒掑悕绉帮紝椤圭洰鍚嶏紝璁″垝寮�濮嬫椂闂达紝璁″垝缁撴潫鏃堕棿锛岃鍒掕鎯呴〉浣跨敤
+ * @param planId
+ * @return
+ */
+ VoPlanDetails getPlanDetails(@Param("planId") Long planId);
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇宸茬粓姝㈣鍒掔殑璇︽儏锛岀粨鏉熸椂闂翠负瀹為檯缁堟鏃堕棿
+ * @param planId
+ * @param terminateTime
+ * @return
+ */
+ VoPlanDetails getPlanDetails_terminate(@Param("planId") Long planId, @Param("terminateTime") Date terminateTime);
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝鐘舵�侊紝鐢ㄤ簬鍒ゆ柇鏄惁鍙互鍒犻櫎璁″垝
+ * @param planId
+ * @return
+ */
+ Integer getPlanState(@Param("planId") Long planId);
+
+ /**
+ * 鍒ゆ柇褰撳墠椤圭洰鏄惁瀛樺湪宸插彂甯冦�佹湭缁堟銆佹湭鍒犻櫎銆佹湭瀹屾垚鐨勮鍒掞紝鍙戝竷璁″垝鍓嶅垽鏂娇鐢�
+ * @param planId
+ * @return
+ */
+ Integer hasPlan_CurrentProject(Long planId);
+
+ /**
+ * 鍒ゆ柇褰撳墠璁″垝鍖呭惈鐨勮疆鐏岀粍鏄惁涓庡叾浠栭」鐩笅璁″垝鍖呭惈鐨勮疆鐏岀粍鏈変氦闆嗭紝涓斿叾浠栭」鐩殑璁″垝鐘舵�佷负宸插彂甯冦�佹湭缁堟銆佹湭鍒犻櫎銆佹湭瀹屾垚锛屽彂甯冭鍒掑墠鍒ゆ柇浣跨敤
+ * @param planId
+ * @return
+ */
+ Integer hasPlan_OtherProject(Long planId);
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝鏈�鏂扮姸鎬�
+ * @param planId
+ * @return
+ */
+ Integer getPlanLatestState(@Param("planId") Long planId);
}
\ No newline at end of file
--
Gitblit v1.8.0