Skip to content

platform / finance_serv

Go to a project
Commit b9d09b36 by 熊付
Options

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

1 parent 8ef63abd
Inline Side-by-side
Showing 1 changed file with 8 additions and 7 deletions
code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java
...@@ -908,7 +908,6 @@ public class ContractServiceImpl implements ContractService { ...@@ -908,7 +908,6 @@ public class ContractServiceImpl implements ContractService {
} }
//ContractVo contracto=contractMapper.queryOne(contractVo.getContract_unid()); //ContractVo contracto=contractMapper.queryOne(contractVo.getContract_unid());
if(!contractIdList.contains(contractVo.getContract_unid())) { if(!contractIdList.contains(contractVo.getContract_unid())) {
System.out.println("contractVo="+JavaBean2Json.javaBean2Json(contractVo));
contractMapper.addOne(contractVo); contractMapper.addOne(contractVo);
contractIdList.add(contractVo.getContract_unid()); contractIdList.add(contractVo.getContract_unid());
//if(paymentAgreeMapper.queryPaymentAgree(importModel.getContract_unid()).size()==0 ) { //if(paymentAgreeMapper.queryPaymentAgree(importModel.getContract_unid()).size()==0 ) {
...@@ -948,26 +947,26 @@ public class ContractServiceImpl implements ContractService { ...@@ -948,26 +947,26 @@ public class ContractServiceImpl implements ContractService {
} }
} }
//else {} if(paymentAgreeMapper.queryPaymentAgree(importModel.getContract_unid()).size()==0 ){ //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) { if(returnInfo.getReback_date()!=null ||returnInfo.getActual_reback_amount()!=null ||returnInfo.getReback_note()!=null) {
returnInfoMapper.addReturnInfo(returnInfo); returnInfoMapper.addReturnInfo(returnInfo);
} }
}else { /*}else {
if(importModel.getReback_date()!=null ||importModel.getReback_amount()!=null ||importModel.getReback_note()!=null) { if(importModel.getReback_date()!=null ||importModel.getReback_amount()!=null ||importModel.getReback_note()!=null) {
is_repeat=false; is_repeat=false;
repeatListId.add(contractVo.getContract_unid()); 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) { if(receipt.getReceipt_amount()!=null||receipt.getOa_flow_id()!=null||receipt.getReceipt_note()!=null) {
receiptMapper.addReceipt(receipt); receiptMapper.addReceipt(receipt);
} }
}else { /*}else {
if(importModel.getReceipt_amount()!=null||importModel.getOa_flow_id()!=null||importModel.getReceipt_note()!=null) { if(importModel.getReceipt_amount()!=null||importModel.getOa_flow_id()!=null||importModel.getReceipt_note()!=null) {
is_repeat=false; is_repeat=false;
repeatListId.add(contractVo.getContract_unid()); 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.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) { if(projectAcceptanc_pre.getAcceptanc_date()!=null ||projectAcceptanc_pre.getAcceptanc_note()!=null ||projectAcceptanc_pre.getAcceptanc_type()!=null) {
projectAcceptancMapper.addProjectAcceptanc(projectAcceptanc_pre); projectAcceptancMapper.addProjectAcceptanc(projectAcceptanc_pre);
...@@ -1055,4 +1054,6 @@ public class ContractServiceImpl implements ContractService { ...@@ -1055,4 +1054,6 @@ public class ContractServiceImpl implements ContractService {
failCode.setEnote("导入异常"); failCode.setEnote("导入异常");
return failCode; return failCode;
} }
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!