未认证居民导出

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<String, Object> params, HttpServletResponse response) throws Exception {
+        List<UserDTO> list = userService.list(params);
+        ExcelUtils.exportExcelToTarget(response, "未认证居民", list, UserExcel.class);
+    }
 
     /***
      * 批量导入

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -129,8 +129,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     public List<UserDTO> list(Map<String, Object> params) {
         this.verifyParams(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<String, Object> verifyParams(Map<String, Object> params) {