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/daoBa/BaDistrictMapper.java |   75 ++++++++++++++++++++++++++-----------
 1 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDistrictMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDistrictMapper.java
index 80b0136..bf05ee2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDistrictMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDistrictMapper.java
@@ -2,33 +2,14 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dy.pipIrrGlobal.pojoBa.BaDistrict;
-import com.dy.pipIrrGlobal.pojoBa.BaPrivilege;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
-public interface BaDistrictMapper extends BaseMapper<BaPrivilege> {
-    /**
-     * delete by primary key
-     * @param id primaryKey
-     * @return deleteCount
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * insert record to table
-     * @param record the record
-     * @return insert count
-     */
-    int insert(BaDistrict record);
-
-    /**
-     * insert record to table selective
-     * @param record the record
-     * @return insert count
-     */
-    int insertSelective(BaDistrict record);
+public interface BaDistrictMapper extends BaseMapper<BaDistrict> {
 
     /**
      * select by primary key
@@ -52,6 +33,21 @@
     List<BaDistrict> selectBySupperId(Long supperId) ;
 
     /**
+     * insert record to table
+     * @param record the record
+     * @return insert count
+     */
+    int putin(BaDistrict record);
+
+    /**
+     * insert record to table selective
+     * @param record the record
+     * @return insert count
+     */
+    int insertSelective(BaDistrict record);
+
+
+    /**
      * update record selective
      * @param record the updated record
      * @return update count
@@ -64,4 +60,39 @@
      * @return update count
      */
     int updateByPrimaryKey(BaDistrict record);
+
+    /**
+     * delete by primary key
+     * @param id primaryKey
+     * @return deleteCount
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * 閫昏緫鍒犻櫎
+     * @param id primaryKey
+     * @return update count
+     */
+    int deleteLogicById(Long id);
+
+    /**
+     * 鏍规嵁鏉戠紪鍙疯幏鍙�5绾у尯鍒掍俊鎭�
+     * @param villageId 鏉戠紪鍙凤紙涓婚敭锛�
+     * @return 5绾ц鏀垮尯鍒掍俊鎭�
+     */
+    Map getDistrictsByVillageId(@Param("villageId") Long villageId);
+
+    /**
+     * 鏍规嵁绾у埆鑾峰彇琛屾斂鍖哄垝鍒楄〃
+     * @param level 琛屾斂鍖哄垝灞傜骇
+     * @return 琛屾斂鍖哄垝鍒楄〃
+     */
+    List<Map<String, Object>> getDistrictgsByLevel(@Param("level") Integer level);
+
+    /**
+     * 鏍规嵁鐖禝D鑾峰彇琛屾斂鍖哄垝鍒楄〃
+     * @param supperId 琛屾斂鍖哄垝鐖剁骇ID
+     * @return 琛屾斂鍖哄垝鍒楄〃
+     */
+    List<Map<String, Object>> getDistrictsBySupperId(@Param("supperId") Long supperId);
 }
\ No newline at end of file

--
Gitblit v1.8.0