From f79569fe4f30715f0cfb42bf3d3f8aab754c3389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 16 Mar 2023 17:19:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B7=A5=E8=B5=84=E5=8D=95?= =?UTF-8?q?=E4=BA=BA=E5=90=8D=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/salaryBill/dto/SalarySendInfoListDTO.java | 9 +++++++++ .../salary/mapper/extemp/ExternalEmployeeMapper.xml | 1 + .../salary/mapper/salarybill/SalarySendInfoMapper.xml | 1 + 3 files changed, 11 insertions(+) diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalarySendInfoListDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalarySendInfoListDTO.java index 89bde7d45..52f197bbf 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalarySendInfoListDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalarySendInfoListDTO.java @@ -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; + + } diff --git a/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.xml b/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.xml index 9b34541e1..0a8ac06b9 100644 --- a/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.xml +++ b/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.xml @@ -241,6 +241,7 @@ e.mobile, e.workcode from hrsa_external_employee e + left join hrmdepartment d on e.department_id = d.id