12211

code/finance_serv/target/classes/com/vion/financial/mapping/ContractMapper.xml

@@ -302,8 +302,8 @@
 		where contract_unid=#{contract_unid}
 		where contract_unid=#{contract_unid}
 	</update>
 	</update>
 	<delete id="deleteOne" parameterType="java.lang.String">
 	<delete id="deleteOne" parameterType="java.lang.String">
-		update tb_contract set is_delete = true where contract_unid = #{contract_unid}
-		<!-- delete from tb_contract where contract_unid = #{contract_unid} -->
+		<!-- update tb_contract set is_delete = true where contract_unid = #{contract_unid} -->
+		 delete from tb_contract where contract_unid = #{contract_unid} 
 	</delete>
 	</delete>
 	
 	
 	<select id="count" parameterType="com.vion.financial.vo.SelectVo" resultType="int">
 	<select id="count" parameterType="com.vion.financial.vo.SelectVo" resultType="int">
@@ -566,6 +566,16 @@
 	
 	
 	<select id="exportContracts" parameterType="com.vion.financial.vo.SelectVo" resultType="com.vion.financial.excel.ExportModel">
 	<select id="exportContracts" parameterType="com.vion.financial.vo.SelectVo" resultType="com.vion.financial.excel.ExportModel">
 		select 
 		select 
+		<if test="columns == null">
+		*
+		</if>
+		<if test="columns !=null">
+				contract_unid,
+		<foreach collection="columns" index="index" item="column" separator=",">  
+       	${column}  
+    </foreach> 
+    </if>
+		 from (select 
 		contract_unid, salesperson_unid, province, city, county, province_name,city_name,county_name,
 		contract_unid, salesperson_unid, province, city, county, province_name,city_name,county_name,
 		guarantee_period, sign_date, product_line_type, contract_state, 
 		guarantee_period, sign_date, product_line_type, contract_state, 
 		contract_type, cast(contract_amount as decimal(18,2)), cast(deduct_amount as decimal(18,2)), contract_amount_note, 
 		contract_type, cast(contract_amount as decimal(18,2)), cast(deduct_amount as decimal(18,2)), contract_amount_note, 
@@ -710,6 +720,7 @@
 		   and is_delete=false 		   
 		   and is_delete=false 		   
 		   and project_unid is not null
 		   and project_unid is not null
 		   and customer_unid is not null
 		   and customer_unid is not null
+		   ) contract
 	</select>
 	</select>