党员认证导出

epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java

@@ -29,6 +29,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.PartyMembersDTO;
 import com.elink.esua.epdc.excel.PartyMembersExcel;
+import com.elink.esua.epdc.excel.PartyMembersExcelHasAuth;
 import com.elink.esua.epdc.service.PartyMembersService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -160,7 +161,7 @@ public class PartyMembersController {
     @GetMapping("hasAuthenticationexport")
     @DataFilter(tableAlias = "eu", prefix = "AND", isPendingCreator = false)
     public void hasAuthenticationexport(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        ExcelUtils.exportExcelToTarget(response, "已认证党员", partyMembersService.exportHasMoudle(params), PartyMembersExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "已认证党员", partyMembersService.exportHasMoudle(params), PartyMembersExcelHasAuth.class);
     }
 
     /***

epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java

@@ -56,11 +56,10 @@ public class UserController {
     private UserService userService;
 
     /**
-     *
      * 功能描述: 未认证居民列表
      *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.UserDTO>>
      * @params [params]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.UserDTO>>
      * @author zhy
      * @date 2020/7/27 15:18
      */
@@ -72,11 +71,10 @@ public class UserController {
     }
 
     /**
-     *
      * 待认证党员列表
      *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.UserDTO>>
      * @params [params]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.UserDTO>>
      * @author liuchuang
      * @since 2020/3/24 15:47
      */
@@ -131,11 +129,10 @@ public class UserController {
     }
 
     /**
-     *
      * 党员认证
      *
-     * @params [dto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [dto]
      * @author liuchuang
      * @since 2020/3/24 15:58
      */
@@ -147,11 +144,10 @@ public class UserController {
     }
 
     /**
-     *
      * 党员认证通过并更新党员库信息
      *
-     * @params [dto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [dto]
      * @author liuchuang
      * @since 2020/3/24 19:38
      */
@@ -166,11 +162,10 @@ public class UserController {
     }
 
     /**
-     *
      * 新增党员信息并认证通过
      *
-     * @params [dto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [dto]
      * @author liuchuang
      * @since 2020/3/25 14:31
      */
@@ -219,11 +214,10 @@ public class UserController {
     }
 
     /**
-     *
      * 待认证党员导出
      *
-     * @params [params, response]
      * @return void
+     * @params [params, response]
      * @author liuchuang
      * @since 2020/3/24 16:00
      */
@@ -231,7 +225,7 @@ public class UserController {
     @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND")
     public void exportWaitParty(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<UserDTO> list = userService.listOfWaitParty(params);
-        ExcelUtils.exportExcelToTarget(response, "待认证党员", list, UserExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "待认证党员", list, PartyMembersExcelStateOne.class);
     }
 
     /***

epdc-cloud-user/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java

@@ -31,16 +31,15 @@ import java.util.Date;
 @Data
 public class PartyAuthenticationFailedExcel {
 
-
     @Excel(name = "姓名")
     private String realName;
 
-    @Excel(name = "身份证号")
-    private String identityNo;
-
     @Excel(name = "手机号")
     private String mobile;
 
+    @Excel(name = "身份证号")
+    private String identityNo;
+
     @Excel(name = "所属网格")
     private String allDeptNames;
 
@@ -50,5 +49,4 @@ public class PartyAuthenticationFailedExcel {
     @Excel(name = "居民住址")
     private String address;
 
-
 }

epdc-cloud-user/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java

@@ -34,7 +34,7 @@ public class PartyMembersExcel {
     @Excel(name = "姓名")
     private String realName;
 
-    @Excel(name = "联系电话")
+    @Excel(name = "手机号")
     private String mobile;
 
     @Excel(name = "身份证号")
@@ -46,15 +46,12 @@ public class PartyMembersExcel {
     @Excel(name = "干部下沉", replace = {"下沉_1", "不下沉_0"})
     private String cadreFlag;
 
-    @Excel(name = "是否注册", replace = {"是_1", "否_0"})
+    @Excel(name = "注册状态", replace = {"手动认证_2", "自动认证_1", "未认证_0"})
     private String registFlag;
 
     @Excel(name = "认证时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date registTime;
 
-    @Excel(name = "注册时间", format = "yyyy-MM-dd HH:mm:ss")
-    private Date createdTime;
-
     @Excel(name = "街道-社区-网格")
     private String allDeptNames;
 }

epdc-cloud-user/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcelHasAuth.java

@@ -0,0 +1,54 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 党员表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-02
+ */
+@Data
+public class PartyMembersExcelHasAuth {
+
+    @Excel(name = "姓名")
+    private String realName;
+
+    @Excel(name = "手机号")
+    private String mobile;
+
+    @Excel(name = "身份证号")
+    private String identityNo;
+
+    @Excel(name = "注册状态", replace = {"手动认证_2", "自动认证_1", "未认证_0"})
+    private String registFlag;
+
+    @Excel(name = "认证时间", format = "yyyy-MM-dd HH:mm:ss")
+    private Date registTime;
+
+    @Excel(name = "注册时间", format = "yyyy-MM-dd HH:mm:ss")
+    private Date createdTime;
+
+    @Excel(name = "街道-社区-网格")
+    private String allDeptNames;
+}

epdc-cloud-user/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcelStateOne.java

@@ -0,0 +1,52 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 用户信息表
+ *
+ * @author qu qu@gmail.com
+ * @since v1.0.0 2019-09-02
+ */
+@Data
+public class PartyMembersExcelStateOne {
+
+    @Excel(name = "姓名")
+    private String realName;
+
+    @Excel(name = "手机号")
+    private String mobile;
+
+    @Excel(name = "身份证号")
+    private String identityNo;
+
+    @Excel(name = "认证网格")
+    private String allDeptNames;
+
+    @Excel(name = "居民住址")
+    private String address;
+
+    @Excel(name = "提交时间", format = "yyyy-MM-dd HH:mm:ss")
+    private Date updatedTime;
+
+}

epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java

@@ -72,7 +72,10 @@ public class PartyAuthenticationFailedServiceImpl extends BaseServiceImpl<PartyA
     @DataSource(value = DataSourceNames.FIRST)
     public List<PartyAuthenticationFailedDTO> list(Map<String, Object> params) {
         // 党员认证失败页面 查询条件：姓名, 手机号, 身份证号, 后端处理前后空格
-        String[] paramKeys = new String[]{"realName", "identityNo", "mobile"};
+        String[] paramKeys = new String[]{"realName", "identityNo", "startTime", "endTime", "mobile"};
+        if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
+            return Lists.newArrayList();
+        }
         params = AppUserUtils.trimParamValue(params, paramKeys);
         List<PartyAuthenticationFailedDTO> list = baseDao.selectListDto(params);
 

epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java

@@ -156,6 +156,10 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
 
     @Override
     public List<PartyMembersDTO> list(Map<String, Object> params) {
+        // 是否是进入页面时的默认查询
+        if (isDefaultQuery(params)) {
+            return Lists.newArrayList();
+        }
         return baseDao.pageDIY(params);
     }