报表原始数据

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

@@ -28,4 +28,6 @@ public class AdvancePaymentCertificate implements  DataModel {
     private String applyCause;
     @JSONField(name = "key_8", label = "支付期限", ordinal = 12)
     private String payDate;
+    @JSONField(name = "key_9", label = "业务日期", ordinal = 12)
+    private String busDate;
 }

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

@@ -3,6 +3,8 @@ package org.springblade.manager.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
+
 
 /**
  * @author yangyj
@@ -27,4 +29,7 @@ public class StartPayForm {
     private String applyCause;
     /**支付期限*/
     private String payDate;
+    /**业务日期*/
+    private LocalDate busDate;
+
 }

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

@@ -280,6 +280,8 @@ public class ExecutorMeter extends FormulaExecutor {
                     dataMap.put("key_7",one.getApplyCause());
                     /*支付期限*/
                     dataMap.put("key_8",one.getPayDate());
+                    /*业务日期*/
+                    dataMap.put("key_9",one.getPayDate());
                     /*上一期*/
                   Optional<Integer> op=startPayForms.stream().map(StartPayForm::getPeriodSort).filter(s->s<one.getPeriodSort()).max(Comparator.comparingInt(s->s));
                   if(op.isPresent()){
@@ -1098,7 +1100,7 @@ public class ExecutorMeter extends FormulaExecutor {
                      }
                      InterimPaymentCertificate finalThblj = thblj;
                      dataList.stream().filter(e->e.getChapterSeq().equals("合计")).findFirst().ifPresent(t->{
-                         finalThblj.setCurrentPeriodPay(multiFc.apply(t.getCurrentPeriodPay(),"10"));
+                         finalThblj.setCurrentPeriodPay(multiFc.apply(t.getCurrentPeriodPay(),"0.1"));
                      });
 
                      /*排序*/