Skip to content

Y
yifu-mvp
Commit c499925c authored by 李灿灿's avatar 李灿灿
Browse files
Options

Merge branch 'feature-licancan' into 'feature/insurance-1.3.0' 

Feature licancan

See merge request !304
parents a5e52536 a4cd4349
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 82 deletions
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EkpUpdateParam.java
View file @ c499925c
...@@ -39,7 +39,7 @@ public class EkpUpdateParam implements Serializable { ...@@ -39,7 +39,7 @@ public class EkpUpdateParam implements Serializable {
private String fd_3b5bf031b52314; private String fd_3b5bf031b52314;
/** /**
* 商险ID * 商险ID:商险id_结算id
*/ */
private String fd_3b5bf032d7a822; private String fd_3b5bf032d7a822;
......
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsurancePolicyMapper.xml
View file @ c499925c
...@@ -35,12 +35,18 @@ ...@@ -35,12 +35,18 @@
<if test="param.policyNo != null and param.policyNo.trim() != ''"> <if test="param.policyNo != null and param.policyNo.trim() != ''">
and POLICY_NO like concat('%',replace(replace(#{param.policyNo},'_','\_'),'%','\%'),'%') and POLICY_NO like concat('%',replace(replace(#{param.policyNo},'_','\_'),'%','\%'),'%')
</if> </if>
<if test="param.policyStart != null and param.policyStart.trim() != ''"> <if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd == null">
AND DATE(POLICY_START) <![CDATA[ >= ]]> #{param.policyStart} AND DATE(POLICY_START) <![CDATA[ >= ]]> #{param.policyStart}
</if> </if>
<if test="param.policyEnd != null and param.policyEnd.trim() != ''"> <if test="param.policyEnd != null and param.policyEnd.trim() != '' and param.policyStart == null">
AND DATE(POLICY_END) <![CDATA[ <= ]]> #{param.policyEnd} AND DATE(POLICY_END) <![CDATA[ <= ]]> #{param.policyEnd}
</if> </if>
<if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd != null and param.policyEnd.trim() != ''">
and (
(DATE(POLICY_START) <![CDATA[ >= ]]> #{param.policyStart} and DATE(POLICY_START) <![CDATA[ <= ]]> #{param.policyEnd}) OR
(DATE(POLICY_END) <![CDATA[ >= ]]> #{param.policyStart} and DATE(POLICY_END) <![CDATA[ <= ]]> #{param.policyEnd})
)
</if>
<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''"> <if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
and INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%') and INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')
</if> </if>
...@@ -61,12 +67,18 @@ ...@@ -61,12 +67,18 @@
<if test="param.policyNo != null and param.policyNo.trim() != ''"> <if test="param.policyNo != null and param.policyNo.trim() != ''">
and POLICY_NO like concat('%',replace(replace(#{param.policyNo},'_','\_'),'%','\%'),'%') and POLICY_NO like concat('%',replace(replace(#{param.policyNo},'_','\_'),'%','\%'),'%')
</if> </if>
<if test="param.policyStart != null and param.policyStart.trim() != ''"> <if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd == null">
AND DATE(POLICY_START) <![CDATA[ >= ]]> #{param.policyStart} AND DATE(POLICY_START) <![CDATA[ >= ]]> #{param.policyStart}
</if> </if>
<if test="param.policyEnd != null and param.policyEnd.trim() != ''"> <if test="param.policyEnd != null and param.policyEnd.trim() != '' and param.policyStart == null">
AND DATE(POLICY_END) <![CDATA[ <= ]]> #{param.policyEnd} AND DATE(POLICY_END) <![CDATA[ <= ]]> #{param.policyEnd}
</if> </if>
<if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd != null and param.policyEnd.trim() != ''">
and (
(DATE(POLICY_START) <![CDATA[ >= ]]> #{param.policyStart} and DATE(POLICY_START) <![CDATA[ <= ]]> #{param.policyEnd}) OR
(DATE(POLICY_END) <![CDATA[ >= ]]> #{param.policyStart} and DATE(POLICY_END) <![CDATA[ <= ]]> #{param.policyEnd})
)
</if>
<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''"> <if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
and INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%') and INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')
</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