Commit fea597b5 authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent 685a32c1
...@@ -71,7 +71,7 @@ public class TEmployeeContractPre extends BaseEntity { ...@@ -71,7 +71,7 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema(description = "前端客服登录名") @Schema(description = "前端客服登录名")
private String customerUserLoginname; private String customerUserLoginname;
@Schema(description = "签署方式0线下签1电子签") @Schema(description = "签署方式1线下签0电子签")
private String signType; private String signType;
@Schema(description = "是否撤销签署0是1否") @Schema(description = "是否撤销签署0是1否")
......
...@@ -127,7 +127,6 @@ ...@@ -127,7 +127,6 @@
a.SETTLEMENT_CYCLE, a.SETTLEMENT_CYCLE,
a.PAYMENT_TIME, a.PAYMENT_TIME,
a.PAYMENT_TYPE, a.PAYMENT_TYPE,
a.DISPATCH_PERIOD,
a.DISPATCH_PERIOD_START, a.DISPATCH_PERIOD_START,
a.DISPATCH_PERIOD_END, a.DISPATCH_PERIOD_END,
a.WORK_TYPE, a.WORK_TYPE,
...@@ -146,7 +145,7 @@ ...@@ -146,7 +145,7 @@
a.create_name, a.create_name,
a.create_time, a.create_time,
a.update_by,a.contract_term,a.sign_flag,a.error_info,a.contract_id,a.revoke_reason, a.update_by,a.contract_term,a.sign_flag,a.error_info,a.contract_id,a.revoke_reason,
a.working_hours,a.working_reward,DISPATCH_PERIOD_YEAR,DISPATCH_PERIOD_MONTH a.working_hours,a.working_reward,a.DISPATCH_PERIOD_YEAR,a.DISPATCH_PERIOD_MONTH
</sql> </sql>
<sql id="tEmployeeContractPre_where"> <sql id="tEmployeeContractPre_where">
<if test="tEmployeeContractPre != null"> <if test="tEmployeeContractPre != null">
...@@ -160,7 +159,7 @@ ...@@ -160,7 +159,7 @@
</foreach> </foreach>
</if> </if>
<if test="tEmployeeContractPre.deptName != null and tEmployeeContractPre.deptName.trim() != ''"> <if test="tEmployeeContractPre.deptName != null and tEmployeeContractPre.deptName.trim() != ''">
AND a.dept_name like CONCAT('%',#{tEmployeeContractPre.dept_name},'%') AND a.dept_name like CONCAT('%',#{tEmployeeContractPre.deptName},'%')
</if> </if>
<if test="tEmployeeContractPre.deptNo != null and tEmployeeContractPre.deptNo.trim() != ''"> <if test="tEmployeeContractPre.deptNo != null and tEmployeeContractPre.deptNo.trim() != ''">
AND a.dept_no = #{tEmployeeContractPre.deptNo} AND a.dept_no = #{tEmployeeContractPre.deptNo}
...@@ -211,7 +210,7 @@ ...@@ -211,7 +210,7 @@
AND a.sign_type = #{tEmployeeContractPre.signType} AND a.sign_type = #{tEmployeeContractPre.signType}
</if> </if>
<if test="tEmployeeContractPre.fadadaTemplate != null and tEmployeeContractPre.fadadaTemplate.trim() != ''"> <if test="tEmployeeContractPre.fadadaTemplate != null and tEmployeeContractPre.fadadaTemplate.trim() != ''">
AND a.fadada_template like CONCAT('%',#{tEmployeeContractPre.fadada_template},'%') AND a.fadada_template like CONCAT('%',#{tEmployeeContractPre.fadadaTemplate},'%')
</if> </if>
<if test="tEmployeeContractPre.dataSource != null and tEmployeeContractPre.dataSource.trim() != ''"> <if test="tEmployeeContractPre.dataSource != null and tEmployeeContractPre.dataSource.trim() != ''">
AND a.data_source = #{tEmployeeContractPre.dataSource} AND a.data_source = #{tEmployeeContractPre.dataSource}
......
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