diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/GroupUserDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/GroupUserDTO.java new file mode 100644 index 000000000..344dc490f --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/GroupUserDTO.java @@ -0,0 +1,27 @@ +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: esua-epdc + * @description: 帮扶小组搜索 + * @author: wangtong + * @create: 2021-07-19 14:20 + **/ +@Data +public class GroupUserDTO implements Serializable { + private static final long serialVersionUID = 254494600958965032L; + + private String username; + + private String realname; + + private String mobile; + + private String email; + + private String[] userIdList; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java index 2e4a052d6..56c8cc563 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java @@ -83,6 +83,19 @@ public class SysUserController { return new Result>().ok(page); } + /** + * @describe: 获取帮扶小组关联干部信息 + * @author wangtong + * @date 2021/7/19 10:43 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping("getGroupUser") + public Result> getGroupUserList(@RequestParam Map params) { + PageData page = sysUserService.getGroupUserList(params); + return new Result>().ok(page); + } + @GetMapping("{id}") @ApiOperation("信息") public Result get(@PathVariable("id") Long id) { diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java index 9e97df7de..9ec56fa5e 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java @@ -142,4 +142,13 @@ public interface SysUserDao extends BaseDao { */ ListselectListOpenIds(@Param("userIds") List userIds, @Param("type")String type); + + /** + * @describe: 获取帮扶小组关联干部信息 + * @author wangtong + * @date 2021/7/19 10:43 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + List getGroupUserList(Map params); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java index 1816f08ca..a2baf92e6 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java @@ -184,4 +184,12 @@ public interface SysUserService extends BaseService { */ Result selectOpenId(List userList); + /** + * @describe: 获取帮扶小组关联干部信息 + * @author wangtong + * @date 2021/7/19 10:43 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + PageData getGroupUserList(Map params); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index c300b1e2f..c8ddc6c1e 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java @@ -44,6 +44,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -369,5 +370,25 @@ public class SysUserServiceImpl extends BaseServiceImpl().ok(openIdDto); } + @Override + public PageData getGroupUserList(Map params) { + String userIds = params.get("userIds").toString(); + String[] userIdsArr = userIds.split(","); + List userIdList = Arrays.asList(userIdsArr); + params.put("userIdList",userIdList); + //转换成like + paramsToLike(params, "username"); + paramsToLike(params, "realname"); + paramsToLike(params, "mobile"); + paramsToLike(params, "email"); + //分页 + IPage page = getPage(params, Constant.CREATE_DATE, false); + + //查询 + List list = baseDao.getGroupUserList(params); + + return getPageData(list, page.getTotal(), SysUserDTO.class); + } + } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml index 00685b287..0248b6de9 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml @@ -208,5 +208,29 @@ and analysis_open_id!='' +