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 deleted file mode 100644 index 002bc077f..000000000 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserQueryFormDTO.java +++ /dev/null @@ -1,71 +0,0 @@ -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 deleted file mode 100644 index 0481f06e7..000000000 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserQueryResultDTO.java +++ /dev/null @@ -1,27 +0,0 @@ -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 居民管理[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询返参DTO - * @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/UserAuthenticateHistoryController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserAuthenticateHistoryController.java index 627841bdb..94db73b55 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserAuthenticateHistoryController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserAuthenticateHistoryController.java @@ -48,7 +48,7 @@ import java.util.Map; * @since v1.0.0 2019-11-21 */ @RestController -@RequestMapping(Constant.EPDC_APP+"userauthenticatehistory") +@RequestMapping("userauthenticatehistory") public class UserAuthenticateHistoryController { @Autowired 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 35e58f847..0a56c1aed 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,8 +27,6 @@ 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; @@ -59,19 +57,6 @@ 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); 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 b87cc585b..bd02252ff 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 @@ -18,17 +18,11 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.UserDTO; 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; -import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO; +import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.entity.UserEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -154,21 +148,4 @@ public interface UserDao extends BaseDao { */ 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/entity/UserGridRelationEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java index 0f8514f36..1addcae49 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java @@ -28,7 +28,7 @@ import java.util.Date; /** * 网格长与网格关系表 * - * @author work@yujt.net.cn + * @author work@yujt.net.cn * @since v1.0.0 2019-10-23 */ @Data @@ -63,4 +63,23 @@ public class UserGridRelationEntity extends BaseEpdcEntity { */ private String leaderFlag; -} \ No newline at end of file + /*** + *所有部门名称 + */ + private String allDeptNames; + + /*** + *所有部门ID + */ + private String allDeptIds; + + /*** + *父所有部门 + */ + private String parentDeptNames; + + /*** + *父所有部门 + */ + private String parentDeptIds; +} 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 d24cde005..eaff0357f 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 @@ -238,13 +238,4 @@ public interface UserService extends BaseService { * @date 2019/11/19 13:28 */ 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 d0fba42af..1955f39e3 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 @@ -645,26 +645,5 @@ 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 991f68153..ac714d80a 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 @@ -66,11 +66,7 @@ ADDRESS, STATE, PARTY_FLAG, - CONCAT( - ifnull(ug.STREET,''), - '-',ug.COMMUNITY, - '-',ug.GRID - ) AS myGridName + ug.ALL_DEPT_NAMES AS myGridName FROM epdc_user u LEFT JOIN epdc_user_grid_relation ug ON u.ID = ug.USER_ID @@ -82,9 +78,18 @@ and u.mobile like '%${mobile}%' and u.identity_no like '%${identityNo}%' and u.party_flag = #{partyFlag} - and ug.street_id = #{streetId} - and ug.community_id = #{communityId} - and ug.grid_id = #{gridId} + + AND (find_in_set(#{streetId},ug.PARENT_DEPT_IDS) + OR find_in_set(#{streetId},ug.ALL_DEPT_IDS)) + + + AND (find_in_set(#{communityId},ug.PARENT_DEPT_IDS) + OR find_in_set(#{communityId},ug.ALL_DEPT_IDS)) + + + and (ug.grid_id = #{gridId} + OR find_in_set(#{gridId},ug.ALL_DEPT_IDS)) + GROUP BY u.ID ORDER BY @@ -305,75 +310,4 @@ - - - - -