From 9d0ce91242eead3b8b80e6f74475ed4d1fb1a429 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 30 Sep 2021 09:55:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=94=A8=E6=88=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/controller/UserController.java | 13 +++++++++++++
 .../main/java/com/elink/esua/epdc/dao/UserDao.java |  9 +++++++++
 .../com/elink/esua/epdc/service/UserService.java   |  9 +++++++++
 .../esua/epdc/service/impl/UserServiceImpl.java    | 14 ++++++++++++++
 .../src/main/resources/mapper/UserDao.xml          | 13 +++++++++++++
 5 files changed, 58 insertions(+)

diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java
index c9b7ab7..5f86217 100644
--- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java
@@ -306,4 +306,17 @@ public class UserController {
     public Result getUserByMobile( String mobile) {
         return userService.getUserByMobile(mobile);
     }
+
+    /**
+    * @describe: 志愿组织模块获取用户列表
+    * @author wangtong
+    * @date 2021/9/29 10:33
+    * @params [mobile]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getUserListForVolunteerOrg")
+    public Result<PageData<UserDTO>> getUserListForVolunteerOrg(@RequestParam Map<String, Object> params) {
+        PageData<UserDTO> page = userService.getUserListForVolunteerOrg(params);
+        return new Result<PageData<UserDTO>>().ok(page);
+    }
 }
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java
index 8f13aa8..81271f4 100644
--- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java
@@ -256,4 +256,13 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     UserDTO getUserByMobile(@Param("mobile") String mobile);
+
+    /**
+    * @describe: 志愿组织模块获取用户列表
+    * @author wangtong
+    * @date 2021/9/29 10:35
+    * @params [dto]
+    * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+    */
+    List<UserEntity> getUserListForVolunteerOrg(Map<String, Object> params);
 }
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java
index 3ae0cea..948a2bc 100644
--- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java
@@ -421,4 +421,13 @@ public interface UserService extends BaseService<UserEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     Result getUserByMobile(String mobile);
+
+    /**
+     * @describe: 志愿组织模块获取用户列表
+     * @author wangtong
+     * @date 2021/9/29 10:33
+     * @params [mobile]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    PageData<UserDTO> getUserListForVolunteerOrg(Map<String, Object> params);
 }
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index 3dc1e53..b971e1e 100644
--- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -1566,6 +1566,20 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return new Result().ok(user);
     }
 
+    @Override
+    public PageData<UserDTO> getUserListForVolunteerOrg(Map<String, Object> params) {
+        //分页
+        IPage<UserEntity> page = getPage(params);
+        //查询
+        List<UserEntity> list = baseDao.getUserListForVolunteerOrg(params);
+        return getPageData(list, page.getTotal(), UserDTO.class);
+//
+//        int pageIndex = (dto.getPage() - NumConstant.ONE) * dto.getLimit();
+//        dto.setPage(pageIndex);
+//        List<UserDTO> user = baseDao.getUserListForVolunteerOrg(dto);
+//        return new Result().ok(user);
+    }
+
     /**
      * 用户信息校验
      *
diff --git a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
index 96268bf..323c832 100644
--- a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
+++ b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
@@ -677,5 +677,18 @@ WHERE 1 = 1
             where DEL_FLAG='0'
 			and MOBILE=#{mobile}
     </select>
+    <select id="getUserListForVolunteerOrg" resultType="com.elink.esua.epdc.entity.UserEntity">
+        select *
+        from epdc_user
+        where DEL_FLAG='0'
+			and state!='0'
+            <if test="realName != null and realName != ''">
+                and REAL_NAME like '%${realName}%'
+            </if>
+            <if test="mobile != null and mobile != ''">
+                and MOBILE like '%${mobile}%'
+            </if>
+        order by CREATED_TIME desc
+    </select>
 
 </mapper>