diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 22665b1c6..eea301b40 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -1042,6 +1042,10 @@ public class SIArchivesBiz { list.add(new WeaTableColumn("150px", "手机号", "mobile")); list.add(new WeaTableColumn("150px", "员工状态", "status")); list.add(new WeaTableColumn("150px", "工号", "jobNum")); + + list.add(new WeaTableColumn("150px", "入职日期", "companystartdate")); + list.add(new WeaTableColumn("150px", "离职日期", "dismissdate")); + list.add(new WeaTableColumn("150px", "社保方案名称", "socialName")); titleMap.get(WelfareTypeEnum.SOCIAL_SECURITY.getValue()).forEach((k, v) -> list.add(new WeaTableColumn("150px", v, k))); list.add(new WeaTableColumn("150px", "社保账号", "socialAccount")); @@ -1215,6 +1219,8 @@ public class SIArchivesBiz { map.put("departmentName", item.getDepartmentName()); map.put("departmentId", item.getDepartmentId()); map.put("jobNum", item.getJobNum()); + map.put("companystartdate", item.getCompanystartdate()); + map.put("dismissdate", item.getDimissionDate()); map.put("mobile", item.getTelephone()); map.put("siSchemeId", item.getSiSchemeId()); map.put("fundSchemeId", item.getFundSchemeId()); diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java index 42e58dfc9..6fb3c615e 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java @@ -44,6 +44,14 @@ public class InsuranceArchivesEmployeePO { private String hiredate; + /** + * 入职日期 + */ + private String companystartdate; + + /** + * 离职日期 + */ private String dimissionDate; private Long siSchemeId; diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml index 1d3f9f49d..4df4edbf9 100644 --- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml @@ -343,7 +343,9 @@ other.otherSchemeId, social.id AS socialId, fund.id AS fundId, - other.id AS otherId + other.id AS otherId, + e.companystartdate as companystartdate, + e.enddate as dismissdate FROM hrsa_insurance_base_info base LEFT JOIN hrmresource e ON base.employee_id = e.id