diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java index a69102c8c..eef707af7 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java @@ -36,7 +36,7 @@ public class InsuranceArchivesEmployeePO { private UserStatusEnum userStatusEnum; - private Date hiredate; + private String hiredate; private Date dimissionDate; diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml index e09549236..97def1157 100644 --- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml @@ -315,7 +315,7 @@ e.jobtitle AS jobNum, e.departmentid AS departmentId, d.departmentname AS departmentName, - e.`STATUS` AS userStatus, + e.STATUS AS userStatus, e.jobtitle AS position, e.companystartdate AS hiredate, e.ID AS employeeId, @@ -338,7 +338,7 @@ log.dismissdate DESC )t GROUP BY - t.resource_n + t.resource_n, t.dimissionDate )l ON a.employeeId = l.resource_n LEFT JOIN( SELECT