【分批导入合同附属表信息】

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

@@ -908,7 +908,6 @@ public class ContractServiceImpl implements ContractService {
 				}
 				//ContractVo contracto=contractMapper.queryOne(contractVo.getContract_unid());
 				if(!contractIdList.contains(contractVo.getContract_unid())) {
-					System.out.println("contractVo="+JavaBean2Json.javaBean2Json(contractVo));
 					contractMapper.addOne(contractVo);
 					contractIdList.add(contractVo.getContract_unid());
 					//if(paymentAgreeMapper.queryPaymentAgree(importModel.getContract_unid()).size()==0 ) {
@@ -948,26 +947,26 @@ public class ContractServiceImpl implements ContractService {
 					}
 				}
 					//else {} if(paymentAgreeMapper.queryPaymentAgree(importModel.getContract_unid()).size()==0 ){
-					if( returnInfoMapper.queryReturnInfo(importModel.getContract_unid()).size()==0) {
+					//if( returnInfoMapper.queryReturnInfo(importModel.getContract_unid()).size()==0) {
 						if(returnInfo.getReback_date()!=null ||returnInfo.getActual_reback_amount()!=null ||returnInfo.getReback_note()!=null) {
 							returnInfoMapper.addReturnInfo(returnInfo);
 						}
-					}else {
+						/*}else {
 						if(importModel.getReback_date()!=null ||importModel.getReback_amount()!=null ||importModel.getReback_note()!=null) {
 							is_repeat=false;
 							repeatListId.add(contractVo.getContract_unid());
 						}
-					}
-					if( receiptMapper.queryReceipt(importModel.getContract_unid()).size()==0) {
+					}*/
+					//if( receiptMapper.queryReceipt(importModel.getContract_unid()).size()==0) {
 						if(receipt.getReceipt_amount()!=null||receipt.getOa_flow_id()!=null||receipt.getReceipt_note()!=null) {
 							receiptMapper.addReceipt(receipt);
 						}
-					}else {
+					/*}else {
 						if(importModel.getReceipt_amount()!=null||importModel.getOa_flow_id()!=null||importModel.getReceipt_note()!=null) {
 							is_repeat=false;
 							repeatListId.add(contractVo.getContract_unid());
 						}
-					}
+					}*/
 					if(/*projectAcceptanc_pre.getContract_unid() != null && projectAcceptanc_end.getContract_unid() != null &&*/ projectAcceptancMapper.queryProjectAcceptanc(importModel.getContract_unid()).size()==0) {
 						if(projectAcceptanc_pre.getAcceptanc_date()!=null ||projectAcceptanc_pre.getAcceptanc_note()!=null ||projectAcceptanc_pre.getAcceptanc_type()!=null) {
 							projectAcceptancMapper.addProjectAcceptanc(projectAcceptanc_pre);
@@ -1055,4 +1054,6 @@ public class ContractServiceImpl implements ContractService {
 		failCode.setEnote("导入异常");
 		return failCode;
 	}
+	
+	
 }