From 7221a3e51bb9825cbea9b4fd15b8fe73922f0256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Wed, 18 Mar 2020 16:11:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E8=AE=A4=E8=AF=81=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/UserController.java | 38 +++++++++++++------ .../epdc/service/impl/UserServiceImpl.java | 9 ++++- 2 files changed, 33 insertions(+), 14 deletions(-) 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 2a9a6f324..66c368e58 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 @@ -118,18 +118,32 @@ public class UserController { String auditState = (String) params.get("state"); // 状态(0-未审核，1-审核通过，2-审核未通过) String fileName = null; - if (AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.equals(auditState)) { - fileName = "未审核"; - } else if (AppUserStatesEnum.STATE_INFORMATION_PASSED.equals(auditState)) { - fileName = "审核通过"; - } else if (AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.equals(auditState)) { - fileName = "审核未通过"; - }else if (AppUserStatesEnum.STATE_REGISTERED.equals(auditState)) { - fileName = "已注册"; + if (AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value().equals(auditState)) { + fileName = "待认证居民"; + } else if (AppUserStatesEnum.STATE_INFORMATION_PASSED.value().equals(auditState)) { + fileName = "已认证居民"; + } else if (AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value().equals(auditState)) { + fileName = "居民认证失败"; + } else if (AppUserStatesEnum.STATE_REGISTERED.value().equals(auditState)) { + fileName = "未认证居民"; } ExcelUtils.exportExcelToTarget(response, fileName, list, UserExcel.class); } + /*** + * 未认证导出 + * @param params + * @param response + * @return void + * @author qushutong + * @date 2020/3/18 15:59 + */ + @GetMapping("unauthorizedexport") + @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND") + public void unauthorizedExport(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = userService.list(params); + ExcelUtils.exportExcelToTarget(response, "未认证居民", list, UserExcel.class); + } /*** * 批量导入 @@ -139,14 +153,14 @@ public class UserController { * @date 2019/10/24 14:55 */ @PostMapping("importExcel") - public Result importExcel(@RequestParam("file") MultipartFile file,@RequestParam Map params) { - return userService.insertUserList(file,params); + public Result importExcel(@RequestParam("file") MultipartFile file, @RequestParam Map params) { + return userService.insertUserList(file, params); } /*** * 展示所有的 * @param params - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2020/3/16 10:51 */ @@ -160,7 +174,7 @@ public class UserController { /*** * 已认证居民 * @param params - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2020/3/16 16:54 */ 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 dbb7a60f9..66b43edac 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 @@ -129,7 +129,12 @@ public class UserServiceImpl extends BaseServiceImpl implem @Override public List list(Map params) { this.verifyParams(params); - return this.baseDao.selectAuthenticatedListUserDto(params); + String auditState = (String) params.get("state"); + if (AppUserStatesEnum.STATE_REGISTERED.value().equals(auditState)) { + return this.baseDao.selectListUserDto(params); + } else { + return this.baseDao.selectAuthenticatedListUserDto(params); + } } private Map verifyParams(Map params) { @@ -862,7 +867,7 @@ public class UserServiceImpl extends BaseServiceImpl implem /** * @param gridIdList - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Author yinzuomei * @Description 根据网格id查询网格下所有的用户 * @Date 2019/12/19 15:03