diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceRosterController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceRosterController.java index 4f21e9e3..4f4e12fa 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceRosterController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceRosterController.java @@ -153,6 +153,7 @@ public class MutualInsuranceRosterController { List entities = new ArrayList<>(); entities.add(new ExcelExportEntity("工号", "loginName", 20)); entities.add(new ExcelExportEntity("姓名", "userName", 20)); + entities.add(new ExcelExportEntity("证件类型", "idCardType", 20)); ExportParams exportParams = new ExportParams(); exportParams.setType(ExcelType.XSSF); Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entities, Collections.emptyList()); @@ -233,10 +234,8 @@ public class MutualInsuranceRosterController { entityList.add(new ExcelExportEntity("性别", "sex", 20)); entityList.add(new ExcelExportEntity("所属工会", "unionName", 20)); entityList.add(new ExcelExportEntity("所属单位", "unitName", 20)); - if (AuthUtil.hasRoleOr("SYSADMIN", "SCHOOL_UNION_ADMIN")) { - entityList.add(new ExcelExportEntity("事项名称", "projectName", 30)); - } entityList.add(new ExcelExportEntity("手机号", "mobile", 20)); + entityList.add(new ExcelExportEntity("证件类型", "idCardType", 20)); entityList.add(new ExcelExportEntity("身份证号", "idCard", 25)); entityList.add(new ExcelExportEntity("是否确认", "isAuditText", 20)); entityList.add(new ExcelExportEntity("确认时间", "auditTimeText", 25)); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/model/MutualInsuranceRosterUser.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/model/MutualInsuranceRosterUser.java index d9707ae3..b031e095 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/model/MutualInsuranceRosterUser.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/model/MutualInsuranceRosterUser.java @@ -85,6 +85,11 @@ public class MutualInsuranceRosterUser extends BaseModel implements Serializable @ColDefine(type = ColType.VARCHAR, width = 50) private String mobile; + @Column + @Comment("证件类型") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String idCardType; + @Column @Comment("身份证号") @ColDefine(type = ColType.VARCHAR, width = 20) diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/param/MutualInsuranceRosterUserPageForm.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/param/MutualInsuranceRosterUserPageForm.java index c3735bed..ba73c88b 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/param/MutualInsuranceRosterUserPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/param/MutualInsuranceRosterUserPageForm.java @@ -43,6 +43,9 @@ public class MutualInsuranceRosterUserPageForm extends PageForm { @ApiModelProperty("人员类型") private String[] personTypes; + @ApiModelProperty("证件类型") + private String[] idCardTypes; + @ApiModelProperty("聘用方式") private String[] preparedBys; diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/service/impl/MutualInsuranceRosterUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/service/impl/MutualInsuranceRosterUserServiceImpl.java index ce928e49..57e994b5 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/service/impl/MutualInsuranceRosterUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/service/impl/MutualInsuranceRosterUserServiceImpl.java @@ -131,7 +131,8 @@ public class MutualInsuranceRosterUserServiceImpl extends BaseServiceImpl - +