Commit a44409d5 authored by huyuchen's avatar huyuchen

huych-入离职登记提交

parent d2a27561
...@@ -93,6 +93,9 @@ public class EmployeeRegistration extends BaseEntity { ...@@ -93,6 +93,9 @@ public class EmployeeRegistration extends BaseEntity {
@Schema(description = "数据来源") @Schema(description = "数据来源")
private String dataSource; private String dataSource;
@Schema(description = "最新的客服名称")
private String customerUsernameNew;
@Schema(description = "入职登记人数") @Schema(description = "入职登记人数")
@TableField(exist = false) @TableField(exist = false)
private int inNum; private int inNum;
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<result property="customerUsername" column="customer_username"/> <result property="customerUsername" column="customer_username"/>
<result property="customerUserLoginname" column="customer_user_loginname"/> <result property="customerUserLoginname" column="customer_user_loginname"/>
<result property="dataSource" column="data_source"/> <result property="dataSource" column="data_source"/>
<result property="customerUsernameNew" column="customer_username_new"/>
</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">
...@@ -86,7 +87,8 @@ ...@@ -86,7 +87,8 @@
a.customer_username, a.customer_username,
a.customer_phone, a.customer_phone,
a.customer_user_loginname, a.customer_user_loginname,
a.data_source a.data_source,
a.customer_username_new
</sql> </sql>
<sql id="employeeRegistration_where"> <sql id="employeeRegistration_where">
<if test="employeeRegistration != null"> <if test="employeeRegistration != null">
...@@ -168,6 +170,9 @@ ...@@ -168,6 +170,9 @@
<if test="employeeRegistration.dataSource != null and employeeRegistration.dataSource.trim() != ''"> <if test="employeeRegistration.dataSource != null and employeeRegistration.dataSource.trim() != ''">
AND a.data_source = #{employeeRegistration.dataSource} AND a.data_source = #{employeeRegistration.dataSource}
</if> </if>
<if test="employeeRegistration.customerUsernameNew != null and employeeRegistration.customerUsernameNew.trim() != ''">
AND a.customer_username_new = #{employeeRegistration.customerUsernameNew}
</if>
<if test="employeeRegistration.departIdSet != null and employeeRegistration.departIdSet.size > 0"> <if test="employeeRegistration.departIdSet != null and employeeRegistration.departIdSet.size > 0">
AND a.emp_deptid in AND a.emp_deptid in
<foreach item="idStr" index="index" collection="employeeRegistration.departIdSet" open="(" separator="," <foreach item="idStr" index="index" collection="employeeRegistration.departIdSet" open="(" separator=","
......
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