Commit 75411982 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.9' into MVP1.7.9

parents 916fc711 74c28595
...@@ -59,7 +59,7 @@ public class TEmployeeInsurancePreVo implements Serializable { ...@@ -59,7 +59,7 @@ public class TEmployeeInsurancePreVo implements Serializable {
/** /**
* 登记时间 * 登记时间
*/ */
@ExcelAttribute(name = "登记时间") @ExcelAttribute(name = "登记时间", isDate = true)
@Schema(description = "登记时间") @Schema(description = "登记时间")
@ExcelProperty("登记时间") @ExcelProperty("登记时间")
private Date registTime; private Date registTime;
......
...@@ -2116,11 +2116,11 @@ ...@@ -2116,11 +2116,11 @@
<if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''"> <if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''">
and a.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%') and a.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
</if> </if>
<if test="param.buyStandardMin != null"> <if test="param.buyStandardMin != null and param.buyStandardMin.trim() != ''">
AND a.BUY_STANDARD <![CDATA[ >= ]]> #{param.buyStandardMin} AND a.BUY_STANDARD+0 <![CDATA[ >= ]]> #{param.buyStandardMin}+0
</if> </if>
<if test="param.buyStandardMax != null"> <if test="param.buyStandardMax != null and param.buyStandardMax.trim() != ''">
AND a.BUY_STANDARD <![CDATA[ <= ]]> #{param.buyStandardMax} AND a.BUY_STANDARD+0 <![CDATA[ <= ]]> #{param.buyStandardMax}+0
</if> </if>
<if test="param.authSql != null and param.authSql.trim() != ''"> <if test="param.authSql != null and param.authSql.trim() != ''">
${param.authSql} ${param.authSql}
...@@ -2154,11 +2154,11 @@ ...@@ -2154,11 +2154,11 @@
<if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''"> <if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''">
and a.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%') and a.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
</if> </if>
<if test="param.buyStandardMin != null"> <if test="param.buyStandardMin != null and param.buyStandardMin.trim() != ''">
AND a.BUY_STANDARD <![CDATA[ >= ]]> #{param.buyStandardMin} AND a.BUY_STANDARD+0 <![CDATA[ >= ]]> #{param.buyStandardMin}+0
</if> </if>
<if test="param.buyStandardMax != null"> <if test="param.buyStandardMax != null and param.buyStandardMax.trim() != ''">
AND a.BUY_STANDARD <![CDATA[ <= ]]> #{param.buyStandardMax} AND a.BUY_STANDARD+0 <![CDATA[ <= ]]> #{param.buyStandardMax}+0
</if> </if>
<if test="param.policyEnd != null and param.policyEnd.trim() != ''"> <if test="param.policyEnd != null and param.policyEnd.trim() != ''">
AND DATE(a.POLICY_END) <![CDATA[ >= ]]> #{param.policyEnd} AND DATE(a.POLICY_END) <![CDATA[ >= ]]> #{param.policyEnd}
......
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