|
@@ -78,7 +78,7 @@ public class ContractReturnMoneyServiceImpl implements ContractReturnMoneyServic
|
|
|
if(contractReturnMoney.getRelationList() != null && !contractReturnMoney.getRelationList().isEmpty()){
|
|
|
contractInvoiceRelationService.updateAmount(contractReturnMoney.getRelationList());
|
|
|
}
|
|
|
- if(contractReturnMoney.getRelationList()!=null){
|
|
|
+ if(contractReturnMoney.getRelationList()!=null&&contractReturnMoney.getRelationList().size()>0){
|
|
|
for(ContractInvoiceRelation list: contractReturnMoney.getRelationList()){
|
|
|
Contract contract = contractService.selectByPrimaryKey(list.getContractId());
|
|
|
if(StringUtils.isNotBlank(contract.getProjectId())) {
|
|
@@ -86,12 +86,17 @@ public class ContractReturnMoneyServiceImpl implements ContractReturnMoneyServic
|
|
|
projectService.updateProjectAmount(contract.getProjectId(),list.getContractId());
|
|
|
}
|
|
|
}
|
|
|
+ }else{
|
|
|
+ Contract contract = contractService.selectByPrimaryKey(contractReturnMoney.getContractId());
|
|
|
+ if(StringUtils.isNotBlank(contract.getProjectId())) {
|
|
|
+ projectService.calcProject(contract.getProjectId());
|
|
|
+ }
|
|
|
}
|
|
|
contractInvoiceService.updateAmountStatus(contractReturnMoney.getContractInvoiceId());
|
|
|
contractService.updateAmountStatus(contractReturnMoney.getContractId());
|
|
|
if(!"冲红".equals(contractReturnMoney.getBz())){
|
|
|
BigDecimal sum=BigDecimal.ZERO;
|
|
|
- if(contractReturnMoney.getRelationList()!=null&&contractReturnMoney.getRelationList().size()>1){
|
|
|
+ if(contractReturnMoney.getRelationList()!=null&&contractReturnMoney.getRelationList().size()>0){
|
|
|
for(ContractInvoiceRelation list: contractReturnMoney.getRelationList()){
|
|
|
sum=sum.add(list.getInvoiceAmount());
|
|
|
}
|
|
@@ -102,6 +107,8 @@ public class ContractReturnMoneyServiceImpl implements ContractReturnMoneyServic
|
|
|
contractReturnMoney.setContractId(list.getContractId());
|
|
|
contractMessageService.addByReturnMoney(contractReturnMoney);
|
|
|
}
|
|
|
+ }else{
|
|
|
+ contractMessageService.addByReturnMoney(contractReturnMoney);
|
|
|
}
|
|
|
}
|
|
|
return contractReturnMoney.getId();
|