|
@@ -326,18 +326,18 @@ public class ContractInventoryFormServiceImpl extends BaseServiceImpl<ContractIn
|
|
|
//查询下级节点集合,并统计合同金额,变更后金额
|
|
|
List<ContractInventoryFormVO> list = baseMapper.getChildList(id,vo.getContractId());
|
|
|
//统计合同金额,变更后金额给当前节点设置
|
|
|
- BigDecimal contractTotal = new BigDecimal(0);
|
|
|
- BigDecimal changeTotal = new BigDecimal(0);
|
|
|
+ BigDecimal contractMoney = new BigDecimal(0);
|
|
|
+ BigDecimal changeMoney = new BigDecimal(0);
|
|
|
for (ContractInventoryFormVO formVO : list) {
|
|
|
if (formVO.getContractMoney() != null){
|
|
|
- contractTotal = changeTotal.add(formVO.getContractMoney());
|
|
|
+ contractMoney = contractMoney.add(formVO.getContractMoney());
|
|
|
}
|
|
|
if (formVO.getChangeMoney() != null){
|
|
|
- changeTotal = changeTotal.add(formVO.getChangeMoney());
|
|
|
+ changeMoney = changeMoney.add(formVO.getChangeMoney());
|
|
|
}
|
|
|
}
|
|
|
- vo.setContractMoney(contractTotal);
|
|
|
- vo.setChangeMoney(changeTotal);
|
|
|
+ vo.setContractMoney(contractMoney);
|
|
|
+ vo.setChangeMoney(changeMoney);
|
|
|
vo.setList(list);
|
|
|
return vo;
|
|
|
}
|