Skip to content

platform / finance_serv

Go to a project
Commit c336f45e by 谢明辉
Options

Merge branch 'develop' of http://192.168.9.26/platform/finance_serv into develop

2 parents 11a97140 4d3400d0
Inline Side-by-side
Showing 1 changed file with 12 additions and 24 deletions
code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml
...@@ -31,22 +31,22 @@ ...@@ -31,22 +31,22 @@
<if test="contract_type != null and contract_type != ''"> <if test="contract_type != null and contract_type != ''">
,contract_type ,contract_type
</if> </if>
<if test="contract_amount != null and contract_amount != ''"> <if test="contract_amount != null ">
,contract_amount ,contract_amount
</if> </if>
<if test="deduct_amount != null and deduct_amount != ''"> <if test="deduct_amount != null ">
,deduct_amount ,deduct_amount
</if> </if>
<if test="contract_amount_note != null and contract_amount_note != ''"> <if test="contract_amount_note != null and contract_amount_note != ''">
,contract_type ,contract_type
</if> </if>
<if test="stop_amount != null and stop_amount != ''"> <if test="stop_amount != null ">
,stop_amount ,stop_amount
</if> </if>
<if test="reback_note != null and reback_note != ''"> <if test="reback_note != null and reback_note != ''">
,reback_note ,reback_note
</if> </if>
<if test="exemptions_amount != null and exemptions_amount != ''"> <if test="exemptions_amount != null ">
,exemptions_amount ,exemptions_amount
</if> </if>
<if test="contract_remain_note != null and contract_remain_note != ''"> <if test="contract_remain_note != null and contract_remain_note != ''">
...@@ -55,13 +55,13 @@ ...@@ -55,13 +55,13 @@
<if test="is_archive != null and is_archive != ''"> <if test="is_archive != null and is_archive != ''">
,is_archive ,is_archive
</if> </if>
<if test="bad_amount != null and bad_amount != ''"> <if test="bad_amount != null ">
,bad_amount ,bad_amount
</if> </if>
<if test="bad_amount_note != null and bad_amount_note != ''"> <if test="bad_amount_note != null and bad_amount_note != ''">
,bad_amount_note ,bad_amount_note
</if> </if>
<if test="confirm_income_amount != null and confirm_income_amount != ''"> <if test="confirm_income_amount != null ">
,confirm_income_amount ,confirm_income_amount
</if> </if>
<if test="amount_state_unid != null and amount_state_unid != ''"> <if test="amount_state_unid != null and amount_state_unid != ''">
...@@ -115,22 +115,22 @@ ...@@ -115,22 +115,22 @@
<if test="contract_type != null and contract_type != ''"> <if test="contract_type != null and contract_type != ''">
,#{contract_type} ,#{contract_type}
</if> </if>
<if test="contract_amount != null and contract_amount != ''"> <if test="contract_amount != null ">
,#{contract_amount} ,#{contract_amount}
</if> </if>
<if test="deduct_amount != null and deduct_amount != ''"> <if test="deduct_amount != null ">
,#{deduct_amount} ,#{deduct_amount}
</if> </if>
<if test="contract_amount_note != null and contract_amount_note != ''"> <if test="contract_amount_note != null and contract_amount_note != ''">
,#{contract_type} ,#{contract_type}
</if> </if>
<if test="stop_amount != null and stop_amount != ''"> <if test="stop_amount != null ">
,#{stop_amount} ,#{stop_amount}
</if> </if>
<if test="reback_note != null and reback_note != ''"> <if test="reback_note != null and reback_note != ''">
,#{reback_note} ,#{reback_note}
</if> </if>
<if test="exemptions_amount != null and exemptions_amount != ''"> <if test="exemptions_amount != null ">
,#{exemptions_amount} ,#{exemptions_amount}
</if> </if>
<if test="contract_remain_note != null and contract_remain_note != ''"> <if test="contract_remain_note != null and contract_remain_note != ''">
...@@ -139,13 +139,13 @@ ...@@ -139,13 +139,13 @@
<if test="is_archive != null and is_archive != ''"> <if test="is_archive != null and is_archive != ''">
,#{is_archive} ,#{is_archive}
</if> </if>
<if test="bad_amount != null and bad_amount != ''"> <if test="bad_amount != null ">
,#{bad_amount} ,#{bad_amount}
</if> </if>
<if test="bad_amount_note != null and bad_amount_note != ''"> <if test="bad_amount_note != null and bad_amount_note != ''">
,#{bad_amount_note} ,#{bad_amount_note}
</if> </if>
<if test="confirm_income_amount != null and confirm_income_amount != ''"> <if test="confirm_income_amount != null ">
,#{confirm_income_amount} ,#{confirm_income_amount}
</if> </if>
<if test="amount_state_unid != null and amount_state_unid != ''"> <if test="amount_state_unid != null and amount_state_unid != ''">
...@@ -237,39 +237,27 @@ ...@@ -237,39 +237,27 @@
<if test="contract_type != null and contract_type != ''"> <if test="contract_type != null and contract_type != ''">
contract_type=#{contract_type}, contract_type=#{contract_type},
</if> </if>
<if test="contract_amount != null and contract_amount != ''">
contract_amount=#{contract_amount}, contract_amount=#{contract_amount},
</if>
<if test="deduct_amount != null and deduct_amount != ''">
deduct_amount=#{deduct_amount}, deduct_amount=#{deduct_amount},
</if>
<if test="contract_amount_note != null and contract_amount_note != ''"> <if test="contract_amount_note != null and contract_amount_note != ''">
contract_amount_note=#{contract_amount_note}, contract_amount_note=#{contract_amount_note},
</if> </if>
<if test="stop_amount != null and stop_amount != ''">
stop_amount=#{stop_amount}, stop_amount=#{stop_amount},
</if>
<if test="reback_note != null and reback_note != ''"> <if test="reback_note != null and reback_note != ''">
reback_note=#{reback_note}, reback_note=#{reback_note},
</if> </if>
<if test="exemptions_amount != null and exemptions_amount != ''">
exemptions_amount=#{exemptions_amount}, exemptions_amount=#{exemptions_amount},
</if>
<if test="contract_remain_note != null and contract_remain_note != ''"> <if test="contract_remain_note != null and contract_remain_note != ''">
contract_remain_note=#{contract_remain_note}, contract_remain_note=#{contract_remain_note},
</if> </if>
<if test="is_archive != null and is_archive != ''"> <if test="is_archive != null and is_archive != ''">
is_archive=#{is_archive}, is_archive=#{is_archive},
</if> </if>
<if test="bad_amount != null and bad_amount != ''">
bad_amount=#{bad_amount}, bad_amount=#{bad_amount},
</if>
<if test="bad_amount_note != null and bad_amount_note != ''"> <if test="bad_amount_note != null and bad_amount_note != ''">
bad_amount_note=#{bad_amount_note}, bad_amount_note=#{bad_amount_note},
</if> </if>
<if test="confirm_income_amount != null and confirm_income_amount != ''">
confirm_income_amount=#{confirm_income_amount}, confirm_income_amount=#{confirm_income_amount},
</if>
<if test="amount_state_unid != null and amount_state_unid != ''"> <if test="amount_state_unid != null and amount_state_unid != ''">
amount_state_unid=#{amount_state_unid}, amount_state_unid=#{amount_state_unid},
</if> </if>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!