Commit 4212197a authored by hongguangwu's avatar hongguangwu

MVP1.7.16-法大大字段

parent 8a915caf
...@@ -98,6 +98,13 @@ public class TAutoContractScheme extends BaseEntity { ...@@ -98,6 +98,13 @@ public class TAutoContractScheme extends BaseEntity {
@ExcelProperty("发大大电子签模板") @ExcelProperty("发大大电子签模板")
@Schema(description = "发大大电子签模板") @Schema(description = "发大大电子签模板")
private String fadadaTemplate; private String fadadaTemplate;
/**
* 发大大电子签模板ID
*/
@ExcelAttribute(name = "发大大电子签模板ID", maxLength = 50)
@ExcelProperty("发大大电子签模板ID")
@Schema(description = "发大大电子签模板ID")
private String fadadaTemplateId;
/** /**
* 签订期限 0 固定期限 1 无固定期限 3.以完成一定工作任务为期限 * 签订期限 0 固定期限 1 无固定期限 3.以完成一定工作任务为期限
* // 电子签-签订期限(既有字典) * // 电子签-签订期限(既有字典)
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<result property="contractType" column="CONTRACT_TYPE"/> <result property="contractType" column="CONTRACT_TYPE"/>
<result property="signatory" column="SIGNATORY"/> <result property="signatory" column="SIGNATORY"/>
<result property="fadadaTemplate" column="FADADA_TEMPLATE"/> <result property="fadadaTemplate" column="FADADA_TEMPLATE"/>
<result property="fadadaTemplateId" column="FADADA_TEMPLATE_ID"/>
<result property="contractTerm" column="CONTRACT_TERM"/> <result property="contractTerm" column="CONTRACT_TERM"/>
<result property="contractDurationYear" column="CONTRACT_DURATION_YEAR"/> <result property="contractDurationYear" column="CONTRACT_DURATION_YEAR"/>
<result property="contractDurationMonth" column="CONTRACT_DURATION_MONTH"/> <result property="contractDurationMonth" column="CONTRACT_DURATION_MONTH"/>
...@@ -87,6 +88,7 @@ ...@@ -87,6 +88,7 @@
a.CONTRACT_TYPE, a.CONTRACT_TYPE,
a.SIGNATORY, a.SIGNATORY,
a.FADADA_TEMPLATE, a.FADADA_TEMPLATE,
a.FADADA_TEMPLATE_ID,
a.CONTRACT_TERM, a.CONTRACT_TERM,
a.CONTRACT_DURATION_YEAR, a.CONTRACT_DURATION_YEAR,
a.CONTRACT_DURATION_MONTH, a.CONTRACT_DURATION_MONTH,
...@@ -157,6 +159,9 @@ ...@@ -157,6 +159,9 @@
<if test="tAutoContractScheme.fadadaTemplate != null and tAutoContractScheme.fadadaTemplate.trim() != ''"> <if test="tAutoContractScheme.fadadaTemplate != null and tAutoContractScheme.fadadaTemplate.trim() != ''">
AND a.FADADA_TEMPLATE = #{tAutoContractScheme.fadadaTemplate} AND a.FADADA_TEMPLATE = #{tAutoContractScheme.fadadaTemplate}
</if> </if>
<if test="tAutoContractScheme.fadadaTemplateId != null and tAutoContractScheme.fadadaTemplateId.trim() != ''">
AND a.FADADA_TEMPLATE_ID = #{tAutoContractScheme.fadadaTemplateId}
</if>
<if test="tAutoContractScheme.contractTerm != null and tAutoContractScheme.contractTerm.trim() != ''"> <if test="tAutoContractScheme.contractTerm != null and tAutoContractScheme.contractTerm.trim() != ''">
AND a.CONTRACT_TERM = #{tAutoContractScheme.contractTerm} AND a.CONTRACT_TERM = #{tAutoContractScheme.contractTerm}
</if> </if>
......
...@@ -238,6 +238,9 @@ ...@@ -238,6 +238,9 @@
<if test="tEmployeeContractPre.signType != null and tEmployeeContractPre.signType.trim() != ''"> <if test="tEmployeeContractPre.signType != null and tEmployeeContractPre.signType.trim() != ''">
AND a.sign_type = #{tEmployeeContractPre.signType} AND a.sign_type = #{tEmployeeContractPre.signType}
</if> </if>
<if test="tEmployeeContractPre.fadadaTemplateId != null and tEmployeeContractPre.fadadaTemplateId.trim() != ''">
AND a.fadada_template_id = #{tEmployeeContractPre.fadadaTemplateId}
</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.fadadaTemplate},'%') AND a.fadada_template like CONCAT('%',#{tEmployeeContractPre.fadadaTemplate},'%')
</if> </if>
......
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