From 0750ea0f51bbee64cc238edfa7d1c406e541efde Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Fri, 13 May 2022 10:31:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/siarchives/po/InsuranceArchivesEmployeePO.java     | 2 +-
 .../engine/salary/mapper/siarchives/SocialSchemeMapper.xml    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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