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

code/finance_serv/src/main/java/com/vion/financial/mapping/AppendixMapper.xml

@@ -53,7 +53,7 @@
 		</if>
 		)
 	</insert>
-	<update id="updateAppendix"  parameterType="com.vion.financial.entity.Appendix">
+	<update id="updateAppendix"  parameterType="com.vion.financial.entity.Appendix" keyColumn="appendix_unid" keyProperty="appendix_unid" useGeneratedKeys="true">
 	update tb_appendix set 
 		<if test="appendix_unid != null and appendix_unid != ''">
 		  appendix_unid=#{appendix_unid}

code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.vion.financial.mapper.ContractMapper">
-	<insert id="addOne" parameterType="com.vion.financial.vo.ContractVo">
+	<insert id="addOne" parameterType="com.vion.financial.vo.ContractVo" keyColumn="contract_unid" keyProperty="contract_unid" useGeneratedKeys="true">
 		INSERT INTO tb_contract(
 		contract_unid
 		<if test="salesperson_unid != null and salesperson_unid != ''">
@@ -204,7 +204,7 @@
 		   (select max(tb_project_acceptanc.acceptanc_date) from tb_project_acceptanc where tb_project_acceptanc.contract_unid=tb_contract.contract_unid  ) as acceptanc_date
 		 from tb_contract where contract_unid = #{contract_unid}
 	</select>
-	<update id="updateOne" parameterType="com.vion.financial.vo.ContractVo">
+	<update id="updateOne" parameterType="com.vion.financial.vo.ContractVo" keyColumn="contract_unid" keyProperty="contract_unid" useGeneratedKeys="true">
 		update tb_contract 
 		<set>
 		<if test="salesperson_unid != null and salesperson_unid != ''">

code/finance_serv/src/main/java/com/vion/financial/mapping/DeliverGoodsMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.vion.financial.mapper.DeliverGoodsMapper">
-	<insert id="addDeliverGoods" parameterType="com.vion.financial.entity.DeliverGoods">
+	<insert id="addDeliverGoods" parameterType="com.vion.financial.entity.DeliverGoods" keyColumn="deliver_unid" keyProperty="deliver_unid" useGeneratedKeys="true">
 		insert into tb_deliver_goods (contract_unid,deliver_goods_date,goods_acceptanc_date)
         values(#{contract_unid},#{deliver_goods_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler},#{goods_acceptanc_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler})
 	</insert>
-	<update id="updateDeliverGoods" parameterType="com.vion.financial.entity.DeliverGoods">
+	<update id="updateDeliverGoods" parameterType="com.vion.financial.entity.DeliverGoods" keyColumn="deliver_unid" keyProperty="deliver_unid" useGeneratedKeys="true">
 		update tb_deliver_goods set
 		<if test="deliver_goods_date !=null">
 		 deliver_goods_date = #{deliver_goods_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler},

code/finance_serv/src/main/java/com/vion/financial/mapping/ProjectAcceptancMapper.xml

@@ -5,7 +5,7 @@
 		insert into tb_project_acceptanc (contract_unid,acceptanc_type,acceptanc_date,acceptanc_note)
         values(#{contract_unid},#{acceptanc_type},#{acceptanc_date},#{acceptanc_note})
 	</insert>
-	<update id="updateProjectAcceptanc" parameterType="com.vion.financial.entity.ProjectAcceptanc">
+	<update id="updateProjectAcceptanc" parameterType="com.vion.financial.entity.ProjectAcceptanc" keyColumn="acceptanc_unid" useGeneratedKeys="true" keyProperty="acceptanc_unid">
 		update tb_project_acceptanc set contract_unid = #{contract_unid},acceptanc_type = #{acceptanc_type},acceptanc_date = #{acceptanc_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler},acceptanc_note = #{acceptanc_note}
 		where acceptanc_unid = #{acceptanc_unid}
 	</update>