解决工资单人名缺失

This commit is contained in:
钱涛 2023-03-16 17:19:02 +08:00
parent 8430397d03
commit f79569fe4f
3 changed files with 11 additions and 0 deletions

View File

@ -1,6 +1,7 @@
package com.engine.salary.entity.salaryBill.dto;
import com.engine.salary.annotation.TableTitle;
import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.AllArgsConstructor;
@ -48,4 +49,12 @@ public class SalarySendInfoListDTO {
private String sendStatus;
/**
* 人员类型,0或null组织架构,1非系统人员
*
* @see DataCollectionEmployeeTypeEnum
*/
private Integer employeeType;
}

View File

@ -241,6 +241,7 @@
e.mobile,
e.workcode
from hrsa_external_employee e
left join hrmdepartment d on e.department_id = d.id
</select>
<select id="getEmployeeByIdsAll"

View File

@ -164,6 +164,7 @@
t1.send_status,
t1.employee_id,
t1.salary_month,
t1.employee_type,
e.email
</sql>