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/daoPr/PrIntakeMapper.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
index 9789d67..35a5b41 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
@@ -2,8 +2,7 @@
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
-import com.dy.pipIrrGlobal.voPr.VoIntake;
-import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
+import com.dy.pipIrrGlobal.voPr.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -24,13 +23,13 @@
* @param id primary key
* @return object by primary key
*/
- PrIntake selectByPrimaryKey(Long id);
+ VoAllIntake selectByPrimaryKey(Long id);
/**
* 寰楀埌鍏ㄩ儴瀹炰綋
* @return 鍏ㄩ儴瀹炰綋
* */
- List<PrIntake> selectAll();
+ List<VoAllIntake> selectAll();
/**
* 閫昏緫鍒犻櫎
@@ -91,6 +90,13 @@
* @return address
*/
Integer getRecordCountOfIntake(@Param("intakeId") Long intakeId);
+
+ /**
+ * 鏍规嵁鏉慖d鑾峰彇鍏ㄩ儴鍦板潃
+ * @param intakeId 鏉慖d
+ * @return intakeName 鍙栨按鍙ｇ紪鍙�
+ */
+ String getNameById(@Param("intakeId") Long intakeId);
/**
* 鏍规嵁鏉慖d鑾峰彇鍏ㄩ儴鍦板潃
@@ -156,7 +162,7 @@
* 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛
* @return
*/
- List<VoOnLineIntake> getUsedIntakes(@Param("onLineMap") String onLineMap, @Param("operator") Long operator);
+ List<VoOnLineIntake> getUsedIntakes(@Param("onLineMap") String onLineMap, @Param("operatorId") Long operatorId);
/**
* 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛屾壂鐮佸紑闃�浣跨敤
@@ -180,4 +186,23 @@
*/
List<Long> getIntakeIdByNameExcludeId(@Param("id")Long id, @Param("intakeName")String intakeName);
+
+ /**
+ * app淇敼鍙栨按鍙ｇ粡绾害
+ * @param record
+ * @return
+ */
+ int updateByPrimaryKeySelective1(IntakeUpdateLngLat record);
+
+ /**
+ * 鑾峰彇鏈粦瀹氬埌杞亴缁勭殑鍙栨按鍙ｅ垪琛�
+ * @return
+ */
+ List<VoIntakeSimple> getFreeIntakes(Map<?, ?> params);
+
+ /**
+ * 鑾峰彇鏈粦瀹氳櫄鎷熷崱鐨勫彇姘村彛鍒楄〃锛岀粰鍙栨按鍙ｇ粦铏氭嫙鍗′娇鐢�
+ * @return
+ */
+ List<VoIntakeSimple> getNotLinkVcIntakes();
}
--
Gitblit v1.8.0