From fcfc31bb9110ce12a3a85cb65dfaa1ace7945722 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Wed, 4 Sep 2024 09:15:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E7=AE=A1=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/MaTypeController.java     |  9 +++++++
 .../bonus/sgzb/base/domain/MaKeeperUser.java  | 26 +++++++++++++++++++
 .../bonus/sgzb/base/mapper/MaTypeMapper.java  |  7 +++++
 .../bonus/sgzb/base/service/ITypeService.java |  7 +++++
 .../base/service/impl/MaTypeServiceImpl.java  |  9 +++++++
 .../mapper/base/MaMachineTypeMapper.xml       | 11 ++++++++
 6 files changed, 69 insertions(+)
 create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaKeeperUser.java

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java
index b4b62d88..9dcd3bdf 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java
@@ -1,6 +1,7 @@
 package com.bonus.sgzb.base.controller;
 
 import com.bonus.sgzb.base.api.domain.MaType;
+import com.bonus.sgzb.base.domain.MaKeeperUser;
 import com.bonus.sgzb.base.domain.vo.TreeSelect;
 import com.bonus.sgzb.base.mapper.MaTypeMapper;
 import com.bonus.sgzb.base.service.ITypeService;
@@ -42,6 +43,14 @@ public class MaTypeController extends BaseController {
         return AjaxResult.success(maTypeList);
     }
 
+
+    @ApiOperation(value = "查询全部库管员信息")
+    @GetMapping("/getMaTypeKeeper")
+    public AjaxResult getMaTypeKeeper(){
+        List<MaKeeperUser> maTypeList = iTypeService.getMaTypeKeeper();
+        return AjaxResult.success(maTypeList);
+    }
+
     /**
      * 工机具类型下拉树
      * @return 结果
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaKeeperUser.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaKeeperUser.java
new file mode 100644
index 00000000..7244f2e4
--- /dev/null
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaKeeperUser.java
@@ -0,0 +1,26 @@
+package com.bonus.sgzb.base.domain;
+
+import lombok.Data;
+
+/**
+ * @Author ma_sh
+ * @create 2024/7/30 11:04
+ */
+@Data
+public class MaKeeperUser {
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+}
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java
index d0d1ae21..8598b4ea 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java
@@ -2,6 +2,7 @@ package com.bonus.sgzb.base.mapper;
 
 import com.bonus.sgzb.base.api.domain.MaMachine;
 import com.bonus.sgzb.base.api.domain.MaType;
+import com.bonus.sgzb.base.domain.MaKeeperUser;
 import com.bonus.sgzb.base.domain.MaPropSet;
 import com.bonus.sgzb.base.domain.MaTypeKeeper;
 import com.bonus.sgzb.base.domain.MaTypeRepair;
@@ -83,5 +84,11 @@ public interface MaTypeMapper {
 
     int deletePropSetByTypeId(Long typeId);
 
+    /**
+     * 查询全部库管员信息
+     * @return
+     */
+    List<MaKeeperUser> getMaTypeKeeper();
+
     int updateTypeNum(MaMachine maMachine);
 }
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java
index 6eff718d..04b3cede 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java
@@ -1,6 +1,7 @@
 package com.bonus.sgzb.base.service;
 
 import com.bonus.sgzb.base.api.domain.MaType;
+import com.bonus.sgzb.base.domain.MaKeeperUser;
 import com.bonus.sgzb.base.domain.vo.TreeSelect;
 
 import java.util.List;
@@ -69,4 +70,10 @@ public interface ITypeService {
 
     List<MaType> getEquipmentType(Long typeId, String typeName);
 
+    /**
+     * 查询全部库管员信息
+     * @return
+     */
+    List<MaKeeperUser> getMaTypeKeeper();
+
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java
index 9e8e6343..097efc42 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java
@@ -333,6 +333,15 @@ public class MaTypeServiceImpl implements ITypeService {
         return list;
     }
 
+    /**
+     * 查询全部库管员信息
+     * @return
+     */
+    @Override
+    public List<MaKeeperUser> getMaTypeKeeper() {
+        return maTypeMapper.getMaTypeKeeper();
+    }
+
 
     /**
      * @Author dingjie
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
index f09641a7..9ad58fd2 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
@@ -417,5 +417,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
     </select>
+    <select id="getMaTypeKeeper" resultType="com.bonus.sgzb.base.domain.MaKeeperUser">
+        SELECT
+            mtk.user_id AS userId,
+            su.user_name AS userName,
+            su.nick_name AS nickName
+        FROM
+            ma_type_keeper mtk
+                LEFT JOIN sys_user su ON mtk.user_id = su.user_id
+        GROUP BY
+            mtk.user_id
+    </select>
 
 </mapper>
\ No newline at end of file