|
@@ -1306,6 +1306,12 @@ public class MeterTreeContractServiceImpl extends BaseServiceImpl<MeterTreeContr
|
|
objForm.setBuildPictureMoney(objForm.getBuildPictureTotal().multiply(contractInventoryForm.getChangePrice())); //数量*变更后单价
|
|
objForm.setBuildPictureMoney(objForm.getBuildPictureTotal().multiply(contractInventoryForm.getChangePrice())); //数量*变更后单价
|
|
objForm.setChangeBuildPictureMoney(objForm.getBuildPictureMoney());
|
|
objForm.setChangeBuildPictureMoney(objForm.getBuildPictureMoney());
|
|
|
|
|
|
|
|
+ //设置清单增量
|
|
|
|
+ ContractInventoryForm form = new ContractInventoryForm();
|
|
|
|
+ form.setFormNumber(formCode);
|
|
|
|
+ form.setChangeTotal(this.parseString(buildPictureTotal));
|
|
|
|
+ InventoryFormListUpdate.add(form);
|
|
|
|
+
|
|
/*计量单元节点金额相关累加*/
|
|
/*计量单元节点金额相关累加*/
|
|
money = money.add(objForm.getBuildPictureMoney());
|
|
money = money.add(objForm.getBuildPictureMoney());
|
|
moneyChange = moneyChange.add(objForm.getChangeBuildPictureMoney());
|
|
moneyChange = moneyChange.add(objForm.getChangeBuildPictureMoney());
|
|
@@ -1363,6 +1369,11 @@ public class MeterTreeContractServiceImpl extends BaseServiceImpl<MeterTreeContr
|
|
|
|
|
|
//累加
|
|
//累加
|
|
BigDecimal bigDecimal = this.parseString(buildPictureTotal);
|
|
BigDecimal bigDecimal = this.parseString(buildPictureTotal);
|
|
|
|
+ //设置清单增量
|
|
|
|
+ ContractInventoryForm form = new ContractInventoryForm();
|
|
|
|
+ form.setFormNumber(formCode);
|
|
|
|
+ form.setChangeTotal(bigDecimal);
|
|
|
|
+ InventoryFormListUpdate.add(form);
|
|
formUpdate.setBuildPictureTotal(formUpdate.getBuildPictureTotal().add(bigDecimal));
|
|
formUpdate.setBuildPictureTotal(formUpdate.getBuildPictureTotal().add(bigDecimal));
|
|
|
|
|
|
formUpdate.setChangeBuildPictureTotal(formUpdate.getBuildPictureTotal());
|
|
formUpdate.setChangeBuildPictureTotal(formUpdate.getBuildPictureTotal());
|
|
@@ -1408,6 +1419,11 @@ public class MeterTreeContractServiceImpl extends BaseServiceImpl<MeterTreeContr
|
|
formAdd.setBuildPictureMoney(formAdd.getBuildPictureTotal().multiply(contractInventoryFormAdd.getChangePrice())); //数量*变更后单价
|
|
formAdd.setBuildPictureMoney(formAdd.getBuildPictureTotal().multiply(contractInventoryFormAdd.getChangePrice())); //数量*变更后单价
|
|
formAdd.setChangeBuildPictureMoney(formAdd.getBuildPictureMoney());
|
|
formAdd.setChangeBuildPictureMoney(formAdd.getBuildPictureMoney());
|
|
|
|
|
|
|
|
+ //设置清单增量
|
|
|
|
+ ContractInventoryForm form = new ContractInventoryForm();
|
|
|
|
+ form.setFormNumber(formCode);
|
|
|
|
+ form.setChangeTotal(this.parseString(buildPictureTotal));
|
|
|
|
+ InventoryFormListUpdate.add(form);
|
|
/*新增清单*/
|
|
/*新增清单*/
|
|
resultFormListAdd.add(formAdd);
|
|
resultFormListAdd.add(formAdd);
|
|
|
|
|
|
@@ -1494,6 +1510,11 @@ public class MeterTreeContractServiceImpl extends BaseServiceImpl<MeterTreeContr
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ //修改合同工程清单的变更后数量
|
|
|
|
+ Map<String, BigDecimal> map = InventoryFormListUpdate.stream()
|
|
|
|
+ .collect(Collectors.groupingBy(l -> l.getFormNumber(),
|
|
|
|
+ Collectors.mapping(ContractInventoryForm::getChangeTotal, Collectors.reducing(BigDecimal.ZERO, BigDecimal::add))));
|
|
|
|
+ baseMapper.batchUpdateFormByNumber(meterTreeContract.getContractId(),map);
|
|
return R.success("成功导入:节点("+addNode+")个,"+"新增清单("+addForm+")条,"+"修改清单("+updateForm+")条.");
|
|
return R.success("成功导入:节点("+addNode+")个,"+"新增清单("+addForm+")条,"+"修改清单("+updateForm+")条.");
|
|
}
|
|
}
|
|
|
|
|