From 6a4f68b8f99dca3a00c297cbcff82c065575212c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 16 八月 2025 11:25:20 +0800
Subject: [PATCH] 1、完善代码；2、作物去除lat属性，采用关联气象站的lat；3、project模块增加查询全部气象站的方法。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 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 c6f6114..c7e6677 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
@@ -10,6 +10,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @author ZhuBaoMin
@@ -74,11 +75,17 @@
List<VoPlans> getNotCompletePlans();
/**
+ * 鑾峰彇宸插畬鎴愮殑璁″垝鏁伴噺
+ * @return
+ */
+ Long getCompletedPlansCount(Map<String, Object> params);
+
+ /**
* 鑾峰彇宸插畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
* 璁″垝鐘舵�侊細1-鑽夌锛�2-鏈墽琛岋紝3-鎵ц涓紝4-宸插畬鎴�
* @return
*/
- List<VoPlans> getCompletedPlans();
+ List<VoPlans> getCompletedPlans(Map<String, Object> params);
/**
* 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈣鍒掔殑缁撴潫鏃堕棿锛氭湭鍒犻櫎銆佹湭缁堟銆佸凡鍙戝竷銆佸綋鍓嶆椂闂村皬浜庤鍒掔粨鏉熸椂闂�
@@ -95,9 +102,46 @@
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);
+
+ /**
+ * 鍒ゆ柇褰撳墠璁″垝涓庢渶杩戠粓姝㈢殑璁″垝鐨勮疆鐏岀粍鏄惁鏈夐噸鍙�
+ * @param planId 褰撳墠璁″垝ID
+ * @param terminatedPlanId 鏈�杩戠粓姝㈢殑璁″垝ID
+ * @return
+ */
+ Integer hasPlanOverlapWithTerminated(@Param("planId") Long planId, @Param("terminatedPlanId") Long terminatedPlanId);
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝鏈�鏂扮姸鎬�
+ * @param planId
+ * @return
+ */
+ Integer getPlanLatestState(@Param("planId") Long planId);
}
\ No newline at end of file
--
Gitblit v1.8.0