From df57b4e71fa4e0dcf8395c3cf5b7251d3186b76c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 30 Dec 2022 10:20:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=80=E5=8E=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PersonnelResumeServiceImpl.java | 74 +++++++++---------- 1 file changed, 35 insertions(+), 39 deletions(-) diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java index ca98eb7f..05d465b0 100644 --- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java @@ -93,52 +93,48 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu // 简历相关表格，待拓展 List tables = new ArrayList<>(); - List columns1 = new ArrayList<>(); - List columns2 = new ArrayList<>(); - - List datas1 = new ArrayList<>(); - List datas2 = new ArrayList<>(); - List datas3 = new ArrayList<>(); - List datas4 = new ArrayList<>(); - columns1.add(PersonnelResumeColumn.builder().name("首次参保时间").colspans(2).rowspans(1).build()); - columns1.add(PersonnelResumeColumn.builder().name("养老保险").colspans(1).rowspans(1).build()); - columns1.add(PersonnelResumeColumn.builder().name("医疗保险").colspans(1).rowspans(1).build()); - columns1.add(PersonnelResumeColumn.builder().name("失业保险").colspans(1).rowspans(1).build()); - columns1.add(PersonnelResumeColumn.builder().name("住房公积金").colspans(1).rowspans(1).build()); - columns1.add(PersonnelResumeColumn.builder().name("企业年金").colspans(1).rowspans(1).build()); - - datas1.add(PersonnelResumeColumn.builder().value("2022-10-02").colspans(2).rowspans(1).build()); - datas1.add(PersonnelResumeColumn.builder().value("80").colspans(1).rowspans(1).build()); - datas1.add(PersonnelResumeColumn.builder().value("36").colspans(1).rowspans(1).build()); - datas1.add(PersonnelResumeColumn.builder().value("360").colspans(1).rowspans(1).build()); - datas1.add(PersonnelResumeColumn.builder().value("180").colspans(1).rowspans(1).build()); - datas1.add(PersonnelResumeColumn.builder().value("20000").colspans(1).rowspans(1).build()); - tables.add(PersonnelResumeTable.builder().title("二、社会保险及住房公积金缴纳情况（单位/元）").columns(columns1).datas(Collections.singletonList(datas1)).build()); + List insurancesTitles = new ArrayList<>(); + List familyInfoTitles = new ArrayList<>(); + + List insuranceDatas = new ArrayList<>(); + insurancesTitles.add(PersonnelResumeColumn.builder().name("首次参保时间").colspans(2).rowspans(1).build()); + insurancesTitles.add(PersonnelResumeColumn.builder().name("养老保险").colspans(1).rowspans(1).build()); + insurancesTitles.add(PersonnelResumeColumn.builder().name("医疗保险").colspans(1).rowspans(1).build()); + insurancesTitles.add(PersonnelResumeColumn.builder().name("失业保险").colspans(1).rowspans(1).build()); + insurancesTitles.add(PersonnelResumeColumn.builder().name("住房公积金").colspans(1).rowspans(1).build()); + insurancesTitles.add(PersonnelResumeColumn.builder().name("企业年金").colspans(1).rowspans(1).build()); + + insuranceDatas.add(PersonnelResumeColumn.builder().value("2022-10-02").colspans(2).rowspans(1).build()); + insuranceDatas.add(PersonnelResumeColumn.builder().value("80").colspans(1).rowspans(1).build()); + insuranceDatas.add(PersonnelResumeColumn.builder().value("36").colspans(1).rowspans(1).build()); + insuranceDatas.add(PersonnelResumeColumn.builder().value("360").colspans(1).rowspans(1).build()); + insuranceDatas.add(PersonnelResumeColumn.builder().value("180").colspans(1).rowspans(1).build()); + insuranceDatas.add(PersonnelResumeColumn.builder().value("20000").colspans(1).rowspans(1).build()); + tables.add(PersonnelResumeTable.builder().title("二、社会保险及住房公积金缴纳情况（单位/元）").columns(insurancesTitles).datas(Collections.singletonList(insuranceDatas)).build()); // 家庭情况 - columns2.add(PersonnelResumeColumn.builder().name("成员").colspans(1).rowspans(1).build()); - columns2.add(PersonnelResumeColumn.builder().name("称谓").colspans(1).rowspans(1).build()); - columns2.add(PersonnelResumeColumn.builder().name("工作单位").colspans(2).rowspans(1).build()); - columns2.add(PersonnelResumeColumn.builder().name("职务").colspans(1).rowspans(1).build()); - columns2.add(PersonnelResumeColumn.builder().name("地址").colspans(2).rowspans(1).build()); - columns2.add(PersonnelResumeColumn.builder().name("出生日期").colspans(1).rowspans(1).build()); - columns2.add(PersonnelResumeColumn.builder().name("是否子女").colspans(1).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("成员").colspans(1).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("称谓").colspans(1).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("工作单位").colspans(2).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("职务").colspans(1).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("地址").colspans(2).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("出生日期").colspans(1).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("是否子女").colspans(1).rowspans(1).build()); List hrmFamilyInfoByUser = getHrmResourceMapper().getHrmFamilyInfoByUser(uId); List> objects = new ArrayList<>(); - for (HrmFamilyInfoPO hrmFamilyInfoPO : hrmFamilyInfoByUser) { - List datas = new ArrayList<>(); - datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getMember()).colspans(1).rowspans(1).build()); - datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getTitle()).colspans(1).rowspans(1).build()); - datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getCompany()).colspans(2).rowspans(1).build()); - datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getJobTitle()).colspans(1).rowspans(1).build()); - datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getAddress()).colspans(2).rowspans(1).build()); - datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getBirthday()).colspans(1).rowspans(1).build()); - datas.add(PersonnelResumeColumn.builder().value(1 == hrmFamilyInfoPO.getWhetherChildren() ? "是" : "否").colspans(1).rowspans(1).build()); - objects.add(datas); + List familyInfoDatas = new ArrayList<>(); + familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getMember()).colspans(1).rowspans(1).build()); + familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getTitle()).colspans(1).rowspans(1).build()); + familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getCompany()).colspans(2).rowspans(1).build()); + familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getJobTitle()).colspans(1).rowspans(1).build()); + familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getAddress()).colspans(2).rowspans(1).build()); + familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getBirthday()).colspans(1).rowspans(1).build()); + familyInfoDatas.add(PersonnelResumeColumn.builder().value(1 == hrmFamilyInfoPO.getWhetherChildren() ? "是" : "否").colspans(1).rowspans(1).build()); + objects.add(familyInfoDatas); } - tables.add(PersonnelResumeTable.builder().title("三、家庭成员信息（包括父母、配偶、子女）").columns(columns2).datas(objects).build()); + tables.add(PersonnelResumeTable.builder().title("三、家庭成员信息（包括父母、配偶、子女）").columns(familyInfoTitles).datas(objects).build()); resultMap.put("tables", tables);