From 42f5453644c41d3b6ac9e381f931efdfc9da8178 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 27 五月 2024 16:09:56 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupSv.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupSv.java
index f776ad5..d1e3e50 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupSv.java
@@ -110,7 +110,6 @@
      */
     public Integer addGroupUnit(IrGroupUnit po) {
         po.setOperateDt(new Date());
-        po.setDeleted((byte) 0);
         int rows = irGroupUnitMapper.insertSelective(po);
         if (rows == 0) {
             return 0;
@@ -125,11 +124,29 @@
      * @return
      */
     public Integer deleteGroupUnit(IrGroupUnit po) {
-        po.setOperateDt(new Date());
         int rows = irGroupUnitMapper.deleteByUnitIdGroupId(po);
         if (rows == 0) {
             return 0;
         }
         return 1;
     }
+
+    /**
+     * 鏌ヤ竴涓疆鐏岀粍缁戝畾鐨勭亴婧夊崟鍏僫d
+     * @param groupId
+     * @return
+     */
+    public List<Long> getGroupBindUnits(Long groupId) {
+        List<Long> groupBindUnits = irGroupUnitMapper.getGroupBindUnits(groupId);
+        return groupBindUnits;
+    }
+
+    /**
+     *     //鏌ユ湭缁戝畾杞亴缁勭殑鐏屾簤鍗曞厓id
+     * @return
+     */
+    public List<Long> getNotBindUnits() {
+        List<Long> notBindUnits = irGroupUnitMapper.getNotBindUnits();
+        return notBindUnits;
+    }
 }

--
Gitblit v1.8.0