|
|
@@ -2274,7 +2274,8 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
BigDecimal[] sum = contractMoney.get(k);
|
|
|
cs.setChapterNumber(k);
|
|
|
cs.setContractMoney(sum[0].toPlainString());
|
|
|
- cs.setChangeMoney(sum[1].toPlainString());
|
|
|
+ /*合同金额 2-8公式开发之前逻辑*/
|
|
|
+ //cs.setChangeMoney(sum[1].toPlainString());
|
|
|
cs.setCurrentPeriodPay(StringUtils.handleNumNull(currentMoney.get(k)));
|
|
|
cs.setCurrentPeriodEndPay(StringUtils.handleNull(endMoney.get(k)));
|
|
|
cs.setItemPercent(ratioFc.apply(cs.getChangeMoney(), baseInfo.getContractAmount().toString()));
|
|
|
@@ -2293,8 +2294,8 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
.map(BaseUtils::str2BigDecimal)
|
|
|
.reduce(BigDecimal.ZERO, BigDecimal::add)
|
|
|
.setScale(0, RoundingMode.HALF_UP); // 四舍五入保留整数
|
|
|
- //String changeMoneyAllWan = changeMoneyAll.divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP).toPlainString();
|
|
|
cs.setChangeMoneyAll(changeMoneyAll+"");
|
|
|
+ cs.setChangeMoney(BaseUtils.str2BigDecimal(cs.getContractMoney()).add(changeMoneyAll).toPlainString());
|
|
|
dataList.add(cs);
|
|
|
});
|
|
|
/*每月合计进度*/
|
cr