diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserQueryFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserQueryFormDTO.java new file mode 100644 index 000000000..002bc077f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserQueryFormDTO.java @@ -0,0 +1,71 @@ +package com.elink.esua.epdc.dto.epdc.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 居民管理[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询入参DTO + * @Author yinzuomei + * @Date 2019/11/28 15:50 + */ +@Data +public class EpdcUserQueryFormDTO implements Serializable { + private static final long serialVersionUID = -6726464735906160180L; + + /** + * 姓名 + */ + private String realName; + + /** + * 手机号 + */ + private String mobile; + + /** + * 身份证号 + */ + private String identityNo; + + /** + * 注册开始日期 + */ + private String startTime; + + /** + * 注册结束日期 + */ + private String endTime; + + /** + * 是否是党员 + */ + private String partyFlag; + + /** + * 状态 + */ + private String state; + + /** + * 当前页码 + */ + private int page; + + /** + * 每页条数 + */ + private int limit; + + /** + * 所属机构 + */ + private List deptIdList; + + /** + * 所属机构字符串 + */ + private String deptIdListStr; +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserQueryResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserQueryResultDTO.java new file mode 100644 index 000000000..cac773743 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserQueryResultDTO.java @@ -0,0 +1,27 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import com.elink.esua.epdc.dto.UserDTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description TODO + * @Author yinzuomei + * @Date 2019/11/28 16:13 + */ +@Data +public class EpdcUserQueryResultDTO implements Serializable { + private static final long serialVersionUID = -7375391737870073472L; + + /** + * 总记录数 + */ + private int total; + + /** + * 居民信息列表 + */ + private List list; +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java index f43fd9e93..35e58f847 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -27,6 +27,8 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.UserDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcUserQueryFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcUserQueryResultDTO; import com.elink.esua.epdc.enums.AppUserStatesEnum; import com.elink.esua.epdc.excel.UserExcel; import com.elink.esua.epdc.service.UserService; @@ -57,6 +59,19 @@ public class UserController { return new Result>().ok(page); } + /** + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询方法 + * @Date 2019/11/28 16:01 + **/ + @PostMapping("query") + public Result query(@RequestBody EpdcUserQueryFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return userService.listUserDTO(formDTO); + } + @GetMapping("{id}") public Result get(@PathVariable("id") String id) { UserDTO data = userService.get(id); @@ -129,4 +144,4 @@ public class UserController { ExcelUtils.exportExcelToTarget(response, fileName, list, UserExcel.class); } -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java index f40974593..b87cc585b 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java @@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.epdc.form.EpdcUnauthorizedAmountFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; import com.elink.esua.epdc.dto.UserDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcUserQueryFormDTO; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; @@ -152,4 +153,22 @@ public interface UserDao extends BaseDao { * @date 2019/11/19 13:31 */ int selectOneAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto); + + /** + * @param formDTO + * @return java.util.List + * @Author yinzuomei + * @Description 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询方法 + * @Date 2019/11/28 16:23 + **/ + List selectListUserDTO(EpdcUserQueryFormDTO formDTO); + + /** + * @param formDTO + * @return int + * @Author yinzuomei + * @Description 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询总记录数 + * @Date 2019/11/28 16:23 + **/ + int selectCountOfUserDTO(EpdcUserQueryFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java index 123181322..d24cde005 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java @@ -229,7 +229,7 @@ public interface UserService extends BaseService { * @date 2019/11/18 14:00 */ Result> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto); - + /*** * 查询待认证用户数量 * @param fromDto @@ -239,4 +239,12 @@ public interface UserService extends BaseService { */ Result getAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto); + /** + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询方法 + * @Date 2019/11/28 16:17 + **/ + Result listUserDTO(EpdcUserQueryFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 420371559..14000f799 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -58,8 +58,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.validation.constraints.NotBlank; import java.util.*; +import java.util.stream.Collectors; /** * 用户信息表 @@ -643,4 +643,26 @@ public class UserServiceImpl extends BaseServiceImpl implem public Result getAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) { return new Result().ok(baseDao.selectOneAnauthorizedAmount(fromDto)); } + /** + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询方法 + * @Date 2019/11/28 16:17 + **/ + @Override + public Result listUserDTO(EpdcUserQueryFormDTO formDTO) { + EpdcUserQueryResultDTO data = new EpdcUserQueryResultDTO(); + int pageIndex = (formDTO.getPage() - NumConstant.ONE) * formDTO.getLimit(); + formDTO.setPage(pageIndex); + if (null != formDTO.getDeptIdList() && formDTO.getDeptIdList().size() > 0) { + formDTO.setDeptIdListStr(formDTO.getDeptIdList().stream().map(String::valueOf).collect(Collectors.joining(","))); + } + List userDTOList = baseDao.selectListUserDTO(formDTO); + int total = baseDao.selectCountOfUserDTO(formDTO); + data.setTotal(total); + data.setList(userDTOList); + return new Result().ok(data); + } + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 71bb1d42b..991f68153 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -304,4 +304,76 @@ + + + + + +