From 62956c14ebef087dc2863fb6deb3d538aedf902d Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Mon, 2 Dec 2024 18:42:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E8=80=83?=
 =?UTF-8?q?=E5=8B=A4=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../att/controller/OrgChangeController.java       | 15 +++++++++++++++
 .../com/bonus/system/att/dao/OrgChangeDao.java    |  3 +++
 .../system/att/service/OrgChangeService.java      |  3 +++
 .../system/att/service/OrgChangeServiceImpl.java  |  6 ++++++
 .../main/resources/mapper/att/OrgChangeMapper.xml |  9 +++++++++
 5 files changed, 36 insertions(+)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/OrgChangeController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/OrgChangeController.java
index 45ca97e..6420454 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/OrgChangeController.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/OrgChangeController.java
@@ -141,4 +141,19 @@ public class OrgChangeController extends BaseController {
         return error("系统异常");
     }
 
+    /**
+     * 获取考勤组
+     */
+    @RequiresPermissions("att:org:change:edit")
+    @PutMapping("getAttGroupList")
+    @Log(title = "考勤设置->组织架构变更->组织架构审核", businessType = BusinessType.UPDATE)
+    public AjaxResult getAttGroupList() {
+        try{
+            return success(orgChangeService.getAttGroupList());
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return error("系统异常");
+    }
+
 }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/OrgChangeDao.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/OrgChangeDao.java
index db28861..11de650 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/OrgChangeDao.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/OrgChangeDao.java
@@ -1,5 +1,6 @@
 package com.bonus.system.att.dao;
 
+import com.bonus.system.api.domain.MapVo;
 import com.bonus.system.att.entity.AttGroupBean;
 import com.bonus.system.att.entity.AttGroupCheckOrgBean;
 import com.bonus.system.att.entity.OrgChangeBean;
@@ -61,4 +62,6 @@ public interface OrgChangeDao {
      * @return
      */
     int orgChangeCheck(OrgChangeBean o);
+
+    MapVo getAttGroupList();
 }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeService.java
index 73caded..f4022f4 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeService.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeService.java
@@ -1,5 +1,6 @@
 package com.bonus.system.att.service;
 
+import com.bonus.system.api.domain.MapVo;
 import com.bonus.system.att.entity.AttGroupBean;
 import com.bonus.system.att.entity.OrgChangeBean;
 import com.bonus.system.basic.domain.SysTree;
@@ -54,4 +55,6 @@ public interface OrgChangeService {
      * @return
      */
     int orgChangeCheck(OrgChangeBean o);
+
+    MapVo getAttGroupList();
 }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeServiceImpl.java
index d9c33e7..b08d213 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.cloud.commons.lang.StringUtils;
 import com.bonus.common.core.constant.Constants;
 import com.bonus.common.security.utils.SecurityUtils;
+import com.bonus.system.api.domain.MapVo;
 import com.bonus.system.api.domain.SysUser;
 import com.bonus.system.att.dao.OrgChangeDao;
 import com.bonus.system.att.entity.AttGroupBean;
@@ -91,5 +92,10 @@ public class OrgChangeServiceImpl implements OrgChangeService {
         return i;
     }
 
+    @Override
+    public MapVo getAttGroupList() {
+        return orgChangeDao.getAttGroupList();
+    }
+
 
 }
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml
index b9a010f..c9906d6 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml
@@ -55,6 +55,15 @@
             oc.is_active = '1'
             and oc.id = #{id}
     </select>
+    <select id="getAttGroupList" resultType="com.bonus.system.api.domain.MapVo">
+        SELECT
+            id,
+            group_name AS `name`
+        FROM
+            att_group
+        WHERE
+            is_active = '1'
+    </select>
 
     <delete id="deleteAttGroup">
         update org_change