Commit 9c373e0c authored by huyuchen's avatar huyuchen

huych-入离职登记调整

parent 9acf4fc6
...@@ -124,6 +124,8 @@ public class EmployeeRegistration extends BaseEntity { ...@@ -124,6 +124,8 @@ public class EmployeeRegistration extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private List<TCspAttaInfo> attaInfoList; private List<TCspAttaInfo> attaInfoList;
@TableField(exist = false)
@Schema(description = "离职处理状态:0待确认1待处理2处理中3已处理")
private String leaveStatus;
} }
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<result property="dataSource" column="data_source"/> <result property="dataSource" column="data_source"/>
<result property="customerUsernameNew" column="customer_username_new"/> <result property="customerUsernameNew" column="customer_username_new"/>
<result property="customerUserLoginNameNew" column="customer_user_login_name_new"/> <result property="customerUserLoginNameNew" column="customer_user_login_name_new"/>
<result property="leaveStatus" column="leave_status"/>
</resultMap> </resultMap>
<resultMap id="employeeRegistrationExportMap" type="com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationExportVo"> <resultMap id="employeeRegistrationExportMap" type="com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationExportVo">
...@@ -236,8 +237,9 @@ ...@@ -236,8 +237,9 @@
<!--employeeRegistration简单分页查询--> <!--employeeRegistration简单分页查询-->
<select id="getEmployeeRegistrationPage" resultMap="employeeRegistrationMap"> <select id="getEmployeeRegistrationPage" resultMap="employeeRegistrationMap">
SELECT SELECT
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>,b.leave_status
FROM employee_registration a FROM employee_registration a
left join employee_registration_leave b on a.id = b.id
<where> <where>
1=1 1=1
<include refid="employeeRegistration_where"/> <include refid="employeeRegistration_where"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment