2-16

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/SubprojectInterimPaymentSummary.java

@@ -113,6 +113,7 @@ public class SubprojectInterimPaymentSummary  implements  DataModel{
             count(this::setCurrentPeriodPay,data,SubprojectInterimPaymentSummary::getCurrentPeriodPay,scale);
             /*本次累计支付*/
             count(this::setCurrentPeriodEndPay,data,SubprojectInterimPaymentSummary::getCurrentPeriodEndPay,scale);
+            if(BigDecimal.ZERO.compareTo(BaseUtils.str2BigDecimal(this.contractMoney))==0)return;
             BigDecimal ra=BaseUtils.str2BigDecimal(this.currentPeriodPay).multiply(new BigDecimal(100)).divide(BaseUtils.str2BigDecimal(this.contractMoney),2,RoundingMode.HALF_UP);
             if(BigDecimal.ZERO.compareTo(ra)<0) {
                 setPayRatio(ra.stripTrailingZeros().toPlainString()+"%");

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

@@ -2461,8 +2461,9 @@ public class ExecutorMeter extends FormulaExecutor {
                 tfd.setRepeat(true);
                 /*根据依赖获取输出目标元素*/
                 elementWriter.write(tfd,pageSum);
-                tec.periodInfo.setMeterNumber(StringUtils.handleNull(pageSum));
+                //tec.periodInfo.setMeterNumber(StringUtils.handleNull(pageSum));
             });
+            tec.periodInfo.setMeterNumber(StringUtils.handleNull(pageSum));
 
         }