183 2-8计量公式

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

@@ -1025,9 +1025,9 @@ public class ExecutorMeter extends FormulaExecutor {
                             })
                             .reduce(BigDecimal.ZERO, BigDecimal::add);
                     /*本期变更(数量)*/
-                    change.setChangePeriodUnit(totalChangeUnit+"");
+                    change.setChangePeriodUnit(totalChangeUnit.stripTrailingZeros().toPlainString());
                     /*本期变更(金额)*/
-                    change.setChangePeriodAmount(totalChangeAmount+"");
+                    change.setChangePeriodAmount(totalChangeAmount.stripTrailingZeros().toPlainString());
                     //变更令IDs
                     List<Long> changeTokenIds = ChangeTokenInventoryList.stream()
                             .map(ChangeTokenInventory::getChangeTokenId)
@@ -1061,15 +1061,15 @@ public class ExecutorMeter extends FormulaExecutor {
                             //上一期的到本期末变更数量+本期变更数量
                             /*到本期末变更累计数量*/
                             BigDecimal prechangeTotal = new BigDecimal(StringUtils.isEmpty(preChangeForm.getChangeTotal())?"0":preChangeForm.getChangeTotal());
-                            change.setChangeEndPeriodUnit(prechangeTotal.add(totalChangeUnit)+"");
+                            change.setChangeEndPeriodUnit((prechangeTotal.add(totalChangeUnit)).stripTrailingZeros().toPlainString());
                             //上一期的到本期末变更金额+本期变更金额
                             /*到本期末变更累计金额*/
                             BigDecimal prechangeMoney = new BigDecimal(StringUtils.isEmpty(preChangeForm.getChangeMoney())?"0":preChangeForm.getChangeMoney());
-                            change.setChangeEndPeriodAmount(prechangeMoney.add(totalChangeAmount)+"");
+                            change.setChangeEndPeriodAmount((prechangeMoney.add(totalChangeAmount)).stripTrailingZeros().toPlainString());
                         }
                     }else {
-                        change.setChangeEndPeriodUnit(totalChangeUnit+"");
-                        change.setChangeEndPeriodAmount(totalChangeAmount+"");
+                        change.setChangeEndPeriodUnit(totalChangeUnit.stripTrailingZeros().toPlainString());
+                        change.setChangeEndPeriodAmount(totalChangeAmount.stripTrailingZeros().toPlainString());
                     }
                     dataList.add(change);
                 }