Merge pull request '人员简历相关接口开发' (#119) from feature/dxf into develop

Reviewed-on: #119

src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java

@@ -113,25 +113,22 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
         tables.add(PersonnelResumeTable.builder().title("二、社会保险及住房公积金缴纳情况（单位/元）").columns(insurancesTitles).datas(Collections.singletonList(insuranceDatas)).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(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());
+        familyInfoTitles.add(PersonnelResumeColumn.builder().name("住址").colspans(2).rowspans(1).build());
+
 
         List<HrmFamilyInfoPO> hrmFamilyInfoByUser = getHrmResourceMapper().getHrmFamilyInfoByUser(uId);
         List<List<PersonnelResumeColumn>> objects = new ArrayList<>();
         for (HrmFamilyInfoPO hrmFamilyInfoPO : hrmFamilyInfoByUser) {
             List<PersonnelResumeColumn> 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.getMember()).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(familyInfoTitles).datas(objects).build());
@@ -151,15 +148,15 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
         // 新增
         topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("screening").menuIcon("icon-coms-man").menuName("人员筛选").type("BTN_Screening").build());
         topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("currentExport").menuIcon("icon-coms-export").menuName("导出当前").type("BTN_CurrentExport").build());
-        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("MergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build());
-        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("AllExport").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_AllExport").build());
+        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("mergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build());
+        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("allExport").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_AllExport").build());
 
         resultMap.put("topMenu", topMenuList);
         // 新增
         rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("screening").menuIcon("icon-coms-man").menuName("人员筛选").type("BTN_Screening").build());
         rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("currentExport").menuIcon("icon-coms-export").menuName("导出当前").type("BTN_CurrentExport").build());
-        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("MergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build());
-        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("AllExport").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_AllExport").build());
+        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("mergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build());
+        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("allExport").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_AllExport").build());
 
         resultMap.put("rightMenu", rightMenuList);
         return resultMap;