5245542112542

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

@@ -885,8 +885,9 @@ public class ContractServiceImpl implements ContractService {
 					projectAcceptanc_end.setAcceptanc_date(importModel.getEnd_acceptanc_date());
 					projectAcceptanc_end.setAcceptanc_note(importModel.getEnd_acceptanc_note());
 				}
-				if(contractMapper.queryOne(contractVo.getContract_unid())==null) {
+				if(contractMapper.queryOne(contractVo.getContract_unid())==null && importModel.getSalesperson_name()!=null) {
 					contractMapper.addOne(contractVo);
+					if(paymentAgreeMapper.queryPaymentAgree(importModel.getContract_unid()).size()==0 ) {
 						if(returnInfo.getReback_date()!=null ||returnInfo.getActual_reback_amount()!=null ||returnInfo.getReback_note()!=null) {
 							returnInfoMapper.addReturnInfo(returnInfo);
 						}
@@ -914,7 +915,37 @@ public class ContractServiceImpl implements ContractService {
 						if(deliverGoods.getDeliver_goods_date()!=null || deliverGoods.getGoods_acceptanc_date()!=null) {
 							deliverGoodsMapper.addDeliverGoods(deliverGoods);
 						}
-				}else {
+					}
+				}else if(paymentAgreeMapper.queryPaymentAgree(importModel.getContract_unid()).size()==0 ){
+					if(returnInfo.getReback_date()!=null ||returnInfo.getActual_reback_amount()!=null ||returnInfo.getReback_note()!=null) {
+						returnInfoMapper.addReturnInfo(returnInfo);
+					}
+					if(receipt.getReceipt_amount()!=null||receipt.getOa_flow_id()!=null||receipt.getReceipt_note()!=null) {
+						receiptMapper.addReceipt(receipt);
+					}
+					if(projectAcceptanc_pre.getContract_unid() != null) {
+						ProjectAcceptancMapper.addProjectAcceptanc(projectAcceptanc_pre);
+					}
+					if(projectAcceptanc_end.getContract_unid() != null) {
+						ProjectAcceptancMapper.addProjectAcceptanc(projectAcceptanc_end);
+					}
+					if(pre_aymentAgree.getPayment_propority()!=null ||pre_aymentAgree.getPayment_requirement()!=null||pre_aymentAgree.getDays()!=null) {
+						paymentAgreeMapper.addPaymentAgree(pre_aymentAgree);
+					}
+					if(arrival_aymentAgree.getPayment_propority()!=null ||arrival_aymentAgree.getPayment_requirement()!=null||arrival_aymentAgree.getDays()!=null) {
+						paymentAgreeMapper.addPaymentAgree(arrival_aymentAgree);
+					}
+					if(acceptanc_aymentAgree.getPayment_propority()!=null ||acceptanc_aymentAgree.getPayment_requirement()!=null||acceptanc_aymentAgree.getDays()!=null) {
+						paymentAgreeMapper.addPaymentAgree(acceptanc_aymentAgree);
+					}
+					if(mainten_aymentAgree.getPayment_propority()!=null ||mainten_aymentAgree.getPayment_requirement()!=null||mainten_aymentAgree.getDays()!=null) {
+						paymentAgreeMapper.addPaymentAgree(mainten_aymentAgree);
+					}
+					if(deliverGoods.getDeliver_goods_date()!=null || deliverGoods.getGoods_acceptanc_date()!=null) {
+						deliverGoodsMapper.addDeliverGoods(deliverGoods);
+					}
+				}
+				else {
 					is_repeat=false;
 					repeatListId.add(contractVo.getContract_unid());
 				}