From 3301b398925d783d6bb0cd3b58f1375373285228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Sun, 24 Dec 2023 09:43:44 +0800
Subject: [PATCH] 'commit'

---
 .../Collect/Controller/CollectController.java | 36 +++++++++++++++++--
 .../QingLong/Collect/Model/CollectModel.java  | 32 +++++++++++++++++
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
index 1c00e8f5..e54d9ab8 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
@@ -921,8 +921,35 @@ public class CollectController extends Controller {
     @IsLoginInterface({})
     @IsNumericInterface({"group_id"})
     @EmptyInterface({"group_name", "bureauIds"})
-    public void updateGroup(int group_id, int group_name, String bureauIds) {
+    public void updateGroup(int group_id, String group_name, String bureauIds) {
+        cm.updateGroup(group_id, group_name, bureauIds);
+        Map map = new HashMap();
+        map.put("success", true);
+        map.put("message", "保存成功!");
+        map.put("group_id", group_id);
+        renderJson(map);
+    }
 
+    /**
+     * 功能：组列表
+     */
+    @Before({POST.class})
+    @IsLoginInterface({})
+    @IsNumericInterface({"group_id"})
+    @EmptyInterface({"group_name", "bureauIds"})
+    public void listGroup() {
+        //操作人员
+        String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
+        //检查当前登录人员是不是发布任务的角色
+        Kv kvCheck = cm.checkPublishRole(person_id);
+        if (!kvCheck.getBoolean("success")) {
+            renderJson(kvCheck);
+            return;
+        }
+        //获取登录人员第一个发布任务的角色是什么
+        int publish_role_id = kvCheck.getInt("publish_role_id");
+        List<Record> list = cm.listGroup(publish_role_id);
+        renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
     /**
@@ -934,7 +961,12 @@ public class CollectController extends Controller {
     @IsLoginInterface({})
     @IsNumericInterface({"group_id"})
     public void delGroup(int group_id) {
-
+        cm.delGroup(group_id);
+        Map map = new HashMap();
+        map.put("success", true);
+        map.put("message", "保存成功!");
+        map.put("group_id", group_id);
+        renderJson(map);
     }
 
     /**
diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
index 3419ce97..7d0e6602 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
@@ -1329,4 +1329,36 @@ public class CollectModel {
         Db.save("t_collect_group", "group_id", record);
         return record.getInt("group_id");
     }
+
+    /**
+     * 功能：更新组
+     *
+     * @param group_id
+     * @param group_name
+     * @param bureauIds
+     */
+    public void updateGroup(int group_id, String group_name, String bureauIds) {
+        Record record = Db.findById("t_collect_group", "group_id", group_id);
+        record.set("group_name", group_name);
+        record.set("bureauIds", bureauIds);
+        Db.update("t_collect_group", "group_id", record);
+    }
+
+    /**
+     * 功能：组列表
+     */
+    public List<Record> listGroup(int publish_role_id) {
+        String sql = "select * from t_collect_group where publish_role_id=?";
+        return Db.find(sql, publish_role_id);
+    }
+
+    /**
+     * 功能：删除组
+     *
+     * @param group_id
+     */
+    public void delGroup(int group_id) {
+        String sql = "delete from t_collect_group where group_id=?";
+        Db.update(sql, group_id);
+    }
 }
\ No newline at end of file