Commit 195a77e7 by 谢明辉

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

2 parents b5c6deb0 595df9e5
...@@ -16,9 +16,7 @@ ...@@ -16,9 +16,7 @@
<if test="payment_propority !=null and payment_propority !=''"> <if test="payment_propority !=null and payment_propority !=''">
payment_propority, payment_propority,
</if> </if>
<if test="payment_requirement !=null and payment_requirement !=''">
payment_requirement payment_requirement
</if>
) )
values( values(
#{contract_unid}, #{contract_unid},
...@@ -34,9 +32,7 @@ ...@@ -34,9 +32,7 @@
<if test="payment_propority !=null and payment_propority !=''"> <if test="payment_propority !=null and payment_propority !=''">
#{payment_propority}, #{payment_propority},
</if> </if>
<if test="payment_requirement !=null and payment_requirement !=''">
#{payment_requirement} #{payment_requirement}
</if>
) )
</insert> </insert>
<update id="updatePaymentAgree" parameterType="com.vion.financial.entity.PaymentAgree"> <update id="updatePaymentAgree" parameterType="com.vion.financial.entity.PaymentAgree">
...@@ -54,9 +50,7 @@ ...@@ -54,9 +50,7 @@
<if test="payment_propority !=null and payment_propority !=''"> <if test="payment_propority !=null and payment_propority !=''">
payment_propority = #{payment_propority} , payment_propority = #{payment_propority} ,
</if> </if>
<if test="payment_requirement !=null and payment_requirement !=''">
payment_requirement = #{payment_requirement} payment_requirement = #{payment_requirement}
</if>
where payment_unid = #{payment_unid} where payment_unid = #{payment_unid}
</update> </update>
<select id="queryPaymentAgree" parameterType="String" resultType="com.vion.financial.entity.PaymentAgree"> <select id="queryPaymentAgree" parameterType="String" resultType="com.vion.financial.entity.PaymentAgree">
......
...@@ -24,9 +24,7 @@ ...@@ -24,9 +24,7 @@
<if test="oa_flow_id !=null and oa_flow_id !=''"> <if test="oa_flow_id !=null and oa_flow_id !=''">
oa_flow_id = #{oa_flow_id}, oa_flow_id = #{oa_flow_id},
</if> </if>
<if test="receipt_note !=null and receipt_note !=''">
receipt_note = #{receipt_note} receipt_note = #{receipt_note}
</if>
<!-- <if test="create_date !=null "> <!-- <if test="create_date !=null ">
create_date = now() create_date = now()
</if> --> </if> -->
......
...@@ -13,9 +13,7 @@ ...@@ -13,9 +13,7 @@
<if test="actual_reback_amount !=null and actual_reback_amount !=''"> <if test="actual_reback_amount !=null and actual_reback_amount !=''">
actual_reback_amount, actual_reback_amount,
</if> </if>
<if test="reback_note !=null and reback_note !=''">
reback_note reback_note
</if>
) )
values ( values (
#{contract_unid}, #{contract_unid},
...@@ -28,9 +26,7 @@ ...@@ -28,9 +26,7 @@
<if test="actual_reback_amount !=null and actual_reback_amount !=''"> <if test="actual_reback_amount !=null and actual_reback_amount !=''">
#{actual_reback_amount}, #{actual_reback_amount},
</if> </if>
<if test="reback_note !=null and reback_note !=''">
#{reback_note} #{reback_note}
</if>
) )
</insert> </insert>
<update id="updateReturnInfo" parameterType="com.vion.financial.entity.ReturnInfo"> <update id="updateReturnInfo" parameterType="com.vion.financial.entity.ReturnInfo">
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!