解决工资单人名缺失
This commit is contained in:
parent
8430397d03
commit
f79569fe4f
|
|
@ -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;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -164,6 +164,7 @@
|
|||
t1.send_status,
|
||||
t1.employee_id,
|
||||
t1.salary_month,
|
||||
t1.employee_type,
|
||||
e.email
|
||||
</sql>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue