From b3224cb2f306eae664deea797936fdf63f8916de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Tue, 8 Aug 2023 15:31:53 +0800
Subject: [PATCH] =?UTF-8?q?2023-08-08=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/controller/EamController.java | 13 ++++++++++++
 .../sys/modules/pms/data/EamAdminData.java    |  9 ++++++++
 .../sys/modules/pms/mapper/EamMapper.java     |  2 ++
 .../sys/modules/pms/service/EamService.java   |  2 ++
 .../pms/service/Impl/EamServiceImpl.java      | 13 ++++++++++++
 src/main/resources/mapper/pms/EamMapper.xml   | 21 +++++++++++++++++++
 6 files changed, 60 insertions(+)

diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java
index ef43bc77..f35d4de8 100644
--- a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java
+++ b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java
@@ -1136,6 +1136,19 @@ public class EamController {
         return R.ok().put("rows", list);
     }
 
+    /**
+     * @description: 获取审核人员列表
+     * @author: fengyuan_yang
+     * @date: 2023/5/24 13:10
+     * @param: [inData]
+     * @return: com.xujie.sys.common.utils.R
+     **/
+    @PostMapping("/getCheckerList")
+    public R getCheckerList(@RequestBody EamAdminData data){
+        List<EamAdminData> list = eamService.getCheckerList(data);
+        return R.ok().put("rows", list);
+    }
+
 
     //---------------点检工单-------------------
 
diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java
index ef65acdb..a62217ed 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java
@@ -9,6 +9,7 @@ import java.util.Date;
 
 public class EamAdminData extends QueryPage {
     private String site;
+    private Integer userId;
     private String adminID;
     private String adminName;
     private String phone;
@@ -31,6 +32,14 @@ public class EamAdminData extends QueryPage {
     // 更新人
     private String updateBy;
 
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
     public String getDepartmentName() {
         return departmentName;
     }
diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
index 6c938152..69c00757 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
@@ -1114,4 +1114,6 @@ public interface EamMapper {
     void saveWorkPlanItemAvailable(EamWorkOrderItemInData data);
 
     void cancelOrderAll(EamWorkOrderInData inData);
+
+    List<EamAdminData> getCheckerList(EamAdminData data);
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java b/src/main/java/com/xujie/sys/modules/pms/service/EamService.java
index 6e268433..39e6f1ac 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/EamService.java
@@ -1086,4 +1086,6 @@ public interface EamService {
     void imageDelete(SysOssEntity data);
 
     void refreshItem(EamWorkOrderItemInData data);
+
+    List<EamAdminData> getCheckerList(EamAdminData data);
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
index bb2dee77..905db7a3 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
@@ -1904,6 +1904,19 @@ public class EamServiceImpl implements EamService {
         return list;
     }
 
+    /**
+     * @description: 获取审核人员列表
+     * @author: fengyuan_yang
+     * @date: 2023/5/24 13:12
+     * @param: [data]
+     * @return: java.util.List<com.xujie.sys.modules.pms.data.EamAdminData>
+     **/
+    @Override
+    public List<EamAdminData> getCheckerList(EamAdminData data) {
+        List<EamAdminData> list = eamMapper.getCheckerList(data);
+        return list;
+    }
+
     /**
      * @description: 点检工单审核
      * @author: fengyuan_yang
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index df7e58b9..89b9b187 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -1293,6 +1293,27 @@ b.MinValue,b.ItemRemark,b.ItemType
         </where>
     </select>
 
+    <!-- 获取审核人员列表 -->
+    <select id="getCheckerList" resultType="EamAdminData" parameterType="EamAdminData">
+        SELECT
+            site,
+            user_id,
+            username as adminID,
+            email,
+            mobile as phone,
+            user_display as adminName
+        FROM sys_user
+        <where>
+            AND site = #{site}
+            <if test = "adminID != null and adminID != ''">
+                AND username LIKE '%' + #{adminID}+'%'
+            </if>
+            <if test = "adminName != null and adminName != ''">
+                AND user_display LIKE '%' + #{adminName}+'%'
+            </if>
+        </where>
+    </select>
+
     <!-- 点检工单审核 -->
     <update id="checkWorkOrder" parameterType="EamWorkOrderInData">
         UPDATE eam_workOrder