Просмотр исходного кода

合计取指定的小数显示

huangtf 1 год назад
Родитель
Сommit
e6c77579d4

+ 4 - 4
blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/ExecutorMeter.java

@@ -407,10 +407,10 @@ public class ExecutorMeter extends FormulaExecutor {
                 InterimPaymentSummary summary = new InterimPaymentSummary();
                 summary.setSummary(true);
                 summary.setItemName("合计");
-                summary.setContractAmount(bfc.apply(dataList,InterimPaymentSummary::getContractAmount));
-                summary.setRevisedAmount(bfc.apply(dataList,InterimPaymentSummary::getRevisedAmount));
-                summary.setCurrentPeriodPay(bfc.apply(dataList,InterimPaymentSummary::getCurrentPeriodPay));
-                summary.setCurrentPeriodEndPay(bfc.apply(dataList,InterimPaymentSummary::getCurrentPeriodEndPay));
+                summary.setContractAmount(StringUtils.number2StringZero(bfc.apply(dataList,InterimPaymentSummary::getContractAmount),tec.getScale()));
+                summary.setRevisedAmount(StringUtils.number2StringZero(bfc.apply(dataList,InterimPaymentSummary::getRevisedAmount),tec.getScale()));
+                summary.setCurrentPeriodPay(StringUtils.number2StringZero(bfc.apply(dataList,InterimPaymentSummary::getCurrentPeriodPay),tec.getScale()));
+                summary.setCurrentPeriodEndPay(StringUtils.number2StringZero(bfc.apply(dataList,InterimPaymentSummary::getCurrentPeriodEndPay),tec.getScale()));
                 summary.setPayRatioA(ratioFc.apply(summary.getCurrentPeriodEndPay(),summary.getContractAmount()));
                 summary.setPayRatioA(ratioFc.apply(summary.getCurrentPeriodEndPay(),summary.getRevisedAmount()));
                 dataList.add(summary);

+ 19 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/TableElementConverter.java

@@ -556,4 +556,23 @@ public class TableElementConverter implements ITableElementConverter {
 
 
 
+    public Integer getScale() {
+        return scale;
+    }
+
+    public void setScale(Integer scale) {
+        this.scale = scale;
+    }
+
+    public Integer getPayRadicScale() {
+        return payRadicScale;
+    }
+
+    public void setPayRadicScale(Integer payRadicScale) {
+        this.payRadicScale = payRadicScale;
+    }
+
+
+
+
 }