diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java index 8734f3b..b3b17e7 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java @@ -259,24 +259,37 @@ public class MemberChangeManageController { Sql sql = memberCommonService.getSql(pageForm); List list = memberCommonService.listMap(sql); - List exportEntities = new ArrayList<>(); - exportEntities.add(new ExcelExportEntity("工号", "loginname", 20)); - exportEntities.add(new ExcelExportEntity("姓名", "username", 20)); - exportEntities.add(new ExcelExportEntity("性别", "sex", 20)); - exportEntities.add(new ExcelExportEntity("出生年月", "birthday", 20)); - exportEntities.add(new ExcelExportEntity("联系电话", "mobile", 20)); - exportEntities.add(new ExcelExportEntity("福利号码", "welfareMobile", 20)); - exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20)); - exportEntities.add(new ExcelExportEntity("聘用方式", "preparedBy", 20)); - exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20)); - exportEntities.add(new ExcelExportEntity("所属工会", "unionName", 20)); - exportEntities.add(new ExcelExportEntity("所属单位", "unitName", 30)); - - ExportParams exportParams = new ExportParams(); - exportParams.setType(ExcelType.XSSF); - try { - Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, list); + Workbook workbook = null; + if (Lang.isNotEmpty(pageForm.getColumns())) { + List exportEntities = new ArrayList<>(); + + pageForm.getColumns().forEach(column -> { + exportEntities.add(new ExcelExportEntity(column.get("label"), column.get("prop"), 20)); + }); + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + + workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, list); + } else { + List exportEntities = new ArrayList<>(); + exportEntities.add(new ExcelExportEntity("工号", "loginname", 20)); + exportEntities.add(new ExcelExportEntity("姓名", "username", 20)); + exportEntities.add(new ExcelExportEntity("性别", "sex", 20)); + exportEntities.add(new ExcelExportEntity("出生年月", "birthday", 20)); + exportEntities.add(new ExcelExportEntity("联系电话", "mobile", 20)); + exportEntities.add(new ExcelExportEntity("福利号码", "welfareMobile", 20)); + exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20)); + exportEntities.add(new ExcelExportEntity("聘用方式", "preparedBy", 20)); + exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20)); + exportEntities.add(new ExcelExportEntity("所属工会", "unionName", 20)); + exportEntities.add(new ExcelExportEntity("所属单位", "unitName", 30)); + + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, list); + } + CommonDownloadUtil.download("会员名单.xlsx", workbook, response); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/statistics/MemberComprehensiveController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/statistics/MemberComprehensiveController.java index 7d08614..5994005 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/statistics/MemberComprehensiveController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/statistics/MemberComprehensiveController.java @@ -1,5 +1,9 @@ package com.budwk.app.zhgh.staffmanage.member.controller.statistics; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.DesensitizedUtil; import com.budwk.app.base.page.Pagination; @@ -12,11 +16,13 @@ import org.apache.poi.ss.usermodel.Workbook; import org.nutz.dao.sql.Sql; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -63,9 +69,24 @@ public class MemberComprehensiveController { List list = memberStatisticsService.listMap(sql); for (NutMap row : list) { row.put("mobile", DesensitizedUtil.mobilePhone(row.getString("mobile"))); + row.put("idCard", DesensitizedUtil.idCardNum(row.getString("idCard"), 3, 4)); } try { - Workbook workbook = memberInfoService.setHistoryExcelData(list); + Workbook workbook = null; + if (Lang.isNotEmpty(pageForm.getColumns())) { + List exportEntities = new ArrayList<>(); + + pageForm.getColumns().forEach(column -> { + exportEntities.add(new ExcelExportEntity(column.get("label"), column.get("prop"), 20)); + }); + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + + workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, list); + } else { + workbook = memberInfoService.setHistoryExcelData(list); + } + CommonDownloadUtil.download("会员综合统计表.xlsx", workbook, response); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberManagePageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberManagePageForm.java index 7f1dd50..10b96c4 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberManagePageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberManagePageForm.java @@ -6,6 +6,7 @@ import com.budwk.app.base.param.PageForm; import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.nutz.dao.Cnd; @@ -14,6 +15,7 @@ import org.nutz.dao.util.cri.Static; import org.nutz.lang.Lang; import java.util.List; +import java.util.Map; /** * @version 1.0 @@ -59,6 +61,9 @@ public class MemberManagePageForm extends PageForm { //变更来源 private List changeOrigins; + @ApiModelProperty("导出的数据") + private List> columns; + public static void buildSearch(Cnd cnd, MemberManagePageForm pageForm) { if (cnd == null) { cnd = Cnd.NEW(); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberStatisticsPageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberStatisticsPageForm.java index 9f6d84f..e42c457 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberStatisticsPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberStatisticsPageForm.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.util.List; +import java.util.Map; /** * @version 1.0 @@ -97,4 +98,7 @@ public class MemberStatisticsPageForm extends PageForm { @ApiModelProperty(value = "结束离会时间(会员)") private String endLeaveDate; + + @ApiModelProperty("导出的数据") + private List> columns; } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java index d84537d..19426e3 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java @@ -71,21 +71,35 @@ public class MemberCommonServiceImpl extends BaseServiceImpl implement Sql sql = Sqls.create(""" SELECT u.id, - u.sex, u.loginname, u.username, - u.mobile, - u.unitId, - u.unitName, - u.unionId, - u.unionName, + u.sex, u.birthday, - u.manyUnit, - u.member, - u.userState, - u.preparedBy, + u.political, + u.joinPartyDate, + u.nation, + u.nativePlace, + u.nationality, + u.idCardType, + u.idCard, + u.mobile, + u.welfareMobile, + u.education, + u.academicDegree, + u.technicalTitle, + u.technicalTitleLevel, + u.position, + u.positionLevel, + u.employeeLevel, + u.arrivalAtSchoolDate, u.personType, - u.welfareMember, + u.preparedBy, + u.identityType, + u.userState, + u.unionName, + u.unitName, + u.member, + u.postDoctoralJoinDate, his.id hisId, his.changeTypes, his.changeTime diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java index 3b5cd18..51389fd 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java @@ -145,6 +145,7 @@ public class MemberStatisticsServiceImpl extends BaseServiceImpl imple u.idCardType, u.idCard, u.mobile, + u.welfareMobile, u.education, u.academicDegree, u.technicalTitle, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html index 2bdff55..df087d4 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html @@ -74,15 +74,48 @@ layout("/layouts/platform.html"){ 导出会员福利号码不一致名单 + + + +
+ 全选 + 反选 +
+ +
+ + + {{ f.label }} + + +
+ + + 列设置 + +
+ label="序号" type="index" width="80px" fixed="left">