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 d6510112c..232578ad7 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 @@ -155,4 +155,19 @@ public class UserController { PageData page = userService.allUserPage(params); return new Result>().ok(page); } + + + /*** + * 已认证居民 + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/3/16 16:54 + */ + @GetMapping("authenticatedpage") + @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND") + public Result> authenticatedpage(@RequestParam Map params) { + PageData page = userService.authenticatedpage(params); + return new Result>().ok(page); + } } 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 202fde7ce..28ad8486c 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 @@ -189,4 +189,14 @@ public interface UserDao extends BaseDao { */ List selectListOfOrganizationInfo(String deptId); + + /*** + * 已认证用户 + * @param params + * @return java.util.List + * @author qushutong + * @date 2020/3/16 16:18 + */ + List selectAuthenticatedListUserDto(Map params); + } 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 6cd43b92c..533035a03 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 @@ -319,4 +319,14 @@ public interface UserService extends BaseService { */ PageData allUserPage(Map params); + + /*** + * 已认证列表 + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @author qushutong + * @date 2020/3/16 16:16 + */ + PageData authenticatedpage(Map params); + } 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 47f211d84..29a85f07c 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 @@ -1180,4 +1180,18 @@ public class UserServiceImpl extends BaseServiceImpl implem return new PageData<>(userDtoList, iPage.getTotal()); } + @Override + public PageData authenticatedpage(Map params) { + String[] paramKeys = new String[]{"streetId", "communityId", "gridId", "realName", "identityNo", "startTime", "endTime", "nickname", "mobile"}; + if (AppUserUtils.isDefaultQuery(params, paramKeys)) { + List userDtoList = Lists.newArrayList(); + return new PageData<>(userDtoList, NumConstant.ZERO); + } + this.verifyParams(params); + // 查询当前用户所具有的的数据权限 + IPage iPage = this.getPage(params); + List userDtoList = this.baseDao.selectAuthenticatedListUserDto(params); + return new PageData<>(userDtoList, iPage.getTotal()); + } + } 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 ad3d2c4d8..ade0566b3 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 @@ -410,4 +410,45 @@ FIND_IN_SET( #{deptId}, ALL_DEPT_IDS ) + +