From 7ed9295d3b0cf25a34b2ba570e77391ce085e54a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Mon, 30 Dec 2019 09:18:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E8=AE=A4=E8=AF=81=E5=85=9A=E5=91=98?= =?UTF-8?q?=20=E8=AE=A4=E8=AF=81=E5=A4=B1=E8=B4=A5=E5=85=9A=E5=91=98?= =?UTF-8?q?=E5=8A=A0=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PartyAuthenticationFailedController.java | 1 + .../controller/PartyMembersController.java | 16 +++++ .../excel/PartyAuthenticationFailedExcel.java | 63 +------------------ .../epdc/service/PartyMembersService.java | 9 +++ .../PartyAuthenticationFailedServiceImpl.java | 25 +++++--- .../service/impl/PartyMembersServiceImpl.java | 29 +++++++++ 6 files changed, 73 insertions(+), 70 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyAuthenticationFailedController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyAuthenticationFailedController.java index 64541de09..00684a3a6 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyAuthenticationFailedController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyAuthenticationFailedController.java @@ -89,6 +89,7 @@ public class PartyAuthenticationFailedController { } @GetMapping("export") + @DataFilter(tableAlias = "epaf", deptId = "grid_id", prefix = "AND", isPendingCreator = false) public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = partyAuthenticationFailedService.list(params); ExcelUtils.exportExcelToTarget(response, null, list, PartyAuthenticationFailedExcel.class); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java index 578b86a9d..0f255a18c 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java @@ -177,4 +177,20 @@ public class PartyMembersController { ExcelUtils.exportExcelToTarget(response, "党员模板", list, PartyMembersExcel.class); } + + + /*** + * 已认证党员导出 + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2019/12/29 14:43 + */ + @GetMapping("hasAuthenticationexport") + @DataFilter(tableAlias = "pm", deptId = "grid_id", prefix = "AND", isPendingCreator = false) + public void hasAuthenticationexport(@RequestParam Map params, HttpServletResponse response) throws Exception { + ExcelUtils.exportExcelToTarget(response, "已认证党员",partyMembersService.exportHasMoudle(params), PartyMembersExcel.class); + } + + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java index 872332532..9b2065bea 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java @@ -31,8 +31,6 @@ import java.util.Date; @Data public class PartyAuthenticationFailedExcel { - @Excel(name = "主键") - private String id; @Excel(name = "姓名") private String realName; @@ -43,66 +41,11 @@ public class PartyAuthenticationFailedExcel { @Excel(name = "身份证号") private String identityNo; - @Excel(name = "职务 字典表dict_name") - private String post; - - @Excel(name = "职务ID 字典表dict_value") - private String postValue; - - @Excel(name = "干部下沉标识 0-否，1-是") - private String cadreFlag; - - @Excel(name = "注册状态 0-否，1-是") - private String registFlag; - - @Excel(name = "注册时间") - private Date registTime; - - @Excel(name = "街道名称") - private String streetName; - - @Excel(name = "街道ID") - private Long streetId; - - @Excel(name = "社区名称") - private String communityName; - - @Excel(name = "社区ID") - private Long communityId; - - @Excel(name = "网格名称") - private String gridName; - - @Excel(name = "网格ID") - private Long gridId; - - @Excel(name = "部门ID") - private Long deptId; - - @Excel(name = "状态 0-认证失败") - private Integer state; - - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") + @Excel(name = "认证时间") private Date createdTime; - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - @Excel(name = "删除标记 0-否，1-是") - private String delFlag; - - @Excel(name = "用户ID") - private String userId; + @Excel(name = "所属网格") + private String allDeptNames; @Excel(name = "居民住址") private String address; diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java index d18d867f7..d2385904c 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java @@ -69,4 +69,13 @@ public interface PartyMembersService extends BaseService { * @date 2019/11/4 10:08 */ Result insertPartyList(MultipartFile file); + + /*** + * 已认证党员 + * @param params + * @return java.util.List + * @author qushutong + * @date 2019/12/29 14:47 + */ + List exportHasMoudle(Map params); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java index fd5a16f1b..c526738b7 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java @@ -71,17 +71,22 @@ public class PartyAuthenticationFailedServiceImpl extends BaseServiceImpl list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, PartyAuthenticationFailedDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + //党员认证失败页面 查询条件：姓名, 手机号, 身份证号, 后端处理前后空格 + String realName = params.get("realName").toString(); + String mobile = params.get("mobile").toString(); + String identityNo = params.get("identityNo").toString(); + if (StringUtils.isNotBlank(realName)) { + params.put("realName", realName.trim()); + } + if (StringUtils.isNotBlank(mobile)) { + params.put("mobile", mobile.trim()); + } + if (StringUtils.isNotBlank(identityNo)) { + params.put("identityNo", identityNo.trim()); + } + List list = baseDao.selectListDto(params); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - return wrapper; + return list; } @Override diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java index 507a7ed6b..906c7fb56 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java @@ -229,6 +229,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl exportHasMoudle(Map params) { + checkParam(params); + return baseDao.hasAuthenticationPartyPage(params); + } + + /*** + * + * @param params + * @return void + * @author qushutong + * @date 2019/12/29 14:51 + */ + private void checkParam(Map params) { + String realName = (String) params.get("realName"); + String mobile = (String) params.get("mobile"); + String identityNo = (String) params.get("identityNo"); + if (StringUtils.isNotBlank(realName)) { + params.put("realName", realName.trim()); + } + if (StringUtils.isNotBlank(mobile)) { + params.put("mobile", mobile.trim()); + } + if (StringUtils.isNotBlank(identityNo)) { + params.put("identityNo", identityNo.trim()); + } + } }