121254221

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

@@ -109,7 +109,7 @@
 		<if test="county != null and county != ''">
 		<if test="county != null and county != ''">
 		  ,#{county},#{county_name}
 		  ,#{county},#{county_name}
 		</if>
 		</if>
-		<if test="guarantee_period != null and guarantee_period != ''">
+		<if test="guarantee_period != null ">
 		  ,#{guarantee_period}
 		  ,#{guarantee_period}
 		</if>
 		</if>
 		<if test="sign_date != null ">
 		<if test="sign_date != null ">
@@ -238,7 +238,7 @@
 		 county=#{county},
 		 county=#{county},
 		 county_name=#{county_name},
 		 county_name=#{county_name},
 		</if>
 		</if>
-		<if test="guarantee_period != null and guarantee_period != ''">
+		<if test="guarantee_period != null ">
 		  guarantee_period=#{guarantee_period},
 		  guarantee_period=#{guarantee_period},
 		</if>
 		</if>
 		<if test="sign_date != null ">
 		<if test="sign_date != null ">

code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java

@@ -907,6 +907,7 @@ public class ContractServiceImpl implements ContractService {
 				}
 				}
 				ContractVo contracto=contractMapper.queryOne(contractVo.getContract_unid());
 				ContractVo contracto=contractMapper.queryOne(contractVo.getContract_unid());
 				if(contracto==null ) {
 				if(contracto==null ) {
+					System.out.println("contractVo="+JavaBean2Json.javaBean2Json(contractVo));
 					contractMapper.addOne(contractVo);
 					contractMapper.addOne(contractVo);
 					//if(paymentAgreeMapper.queryPaymentAgree(importModel.getContract_unid()).size()==0 ) {
 					//if(paymentAgreeMapper.queryPaymentAgree(importModel.getContract_unid()).size()==0 ) {
 						if(returnInfo.getReback_date()!=null ||returnInfo.getActual_reback_amount()!=null ||returnInfo.getReback_note()!=null) {
 						if(returnInfo.getReback_date()!=null ||returnInfo.getActual_reback_amount()!=null ||returnInfo.getReback_note()!=null) {

code/finance_serv/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
     encoding: UTF-8
     encoding: UTF-8
     cache: false
     cache: false
   datasource: 
   datasource: 
-    url: jdbc:postgresql://192.168.9.162:5432/financial_serv
+    url: jdbc:postgresql://192.168.9.162:5432/financial_test
     username: postgres
     username: postgres
     password: authpass 
     password: authpass 
     driver-class-name: org.postgresql.Driver
     driver-class-name: org.postgresql.Driver