福利档案列表报错问题

This commit is contained in:
MustangDeng 2022-05-13 10:31:51 +08:00
parent bdf3a422d6
commit 0750ea0f51
2 changed files with 3 additions and 3 deletions

View File

@ -36,7 +36,7 @@ public class InsuranceArchivesEmployeePO {
private UserStatusEnum userStatusEnum;
private Date hiredate;
private String hiredate;
private Date dimissionDate;

View File

@ -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