Skip to content

platform / finance_serv

Go to a project
Commit 69aa7ef5 by 王军业
Options

[导入接口]

1 parent d6e4b99d
Inline Side-by-side
Showing 1 changed file with 5 additions and 3 deletions
code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java
...@@ -639,6 +639,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -639,6 +639,7 @@ public class ContractServiceImpl implements ContractService {
String result = HttpNetClient.doGet(url, null); String result = HttpNetClient.doGet(url, null);
Map map = JavaBean2Json.Json2JavaBean(result, Map.class); Map map = JavaBean2Json.Json2JavaBean(result, Map.class);
list_data = (List<Map>) map.get("list_data"); list_data = (List<Map>) map.get("list_data");
List<String> contractIdList=contractMapper.queryList();
ContractVo contractVo = null; ContractVo contractVo = null;
ReturnInfo returnInfo=null; ReturnInfo returnInfo=null;
Receipt receipt=null; Receipt receipt=null;
...@@ -905,10 +906,11 @@ public class ContractServiceImpl implements ContractService { ...@@ -905,10 +906,11 @@ public class ContractServiceImpl implements ContractService {
projectAcceptanc_end.setAcceptanc_date(importModel.getEnd_acceptanc_date()); projectAcceptanc_end.setAcceptanc_date(importModel.getEnd_acceptanc_date());
projectAcceptanc_end.setAcceptanc_note(importModel.getEnd_acceptanc_note()); projectAcceptanc_end.setAcceptanc_note(importModel.getEnd_acceptanc_note());
} }
ContractVo contracto=contractMapper.queryOne(contractVo.getContract_unid()); //ContractVo contracto=contractMapper.queryOne(contractVo.getContract_unid());
if(contracto==null ) { if(!contractIdList.contains(contractVo.getContract_unid())) {
System.out.println("contractVo="+JavaBean2Json.javaBean2Json(contractVo)); System.out.println("contractVo="+JavaBean2Json.javaBean2Json(contractVo));
contractMapper.addOne(contractVo); contractMapper.addOne(contractVo);
contractIdList.add(contractVo.getContract_unid());
//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) {
returnInfoMapper.addReturnInfo(returnInfo); returnInfoMapper.addReturnInfo(returnInfo);
...@@ -940,7 +942,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -940,7 +942,7 @@ public class ContractServiceImpl implements ContractService {
continue; continue;
//} //}
}else { }else {
if(importModel.getSalesperson_name()!=null && contracto!=null) { if(importModel.getSalesperson_name()!=null && contractVo.getContract_unid()!=null) {
is_repeat=false; is_repeat=false;
repeatListId.add(contractVo.getContract_unid()); repeatListId.add(contractVo.getContract_unid());
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!