计算式

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

@@ -22,4 +22,6 @@ public class AdvancePaymentCertificate implements  DataModel {
     private String totalStayPay;
     @JSONField(name = "key_5", label = "附件名称", ordinal = 5)
     private String fileName;
+    @JSONField(name = "key_6", label = "计算式", ordinal = 5)
+    private String calculateFormula;
 }

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

@@ -21,4 +21,6 @@ public class StartPayForm {
     private Integer periodSort;
     /**附件名称*/
     private String fileName;
+    /**计算式*/
+    private String calculateFormula;
 }

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

@@ -258,6 +258,10 @@ public class ExecutorMeter extends FormulaExecutor {
                     FormulaUtils.elementFindByKey(fdm,"key_5").ifPresent(t->{
                         elementWriter.write(t,one.getFileName());
                     });
+                    /*计算式*/
+                    FormulaUtils.elementFindByKey(fdm,"key_6").ifPresent(t->{
+                        elementWriter.write(t,one.getCalculateFormula());
+                    });
                     /*上一期*/
                   Optional<Integer> op=startPayForms.stream().map(StartPayForm::getPeriodSort).filter(s->s<one.getPeriodSort()).max(Comparator.comparingInt(s->s));
                   if(op.isPresent()){

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

@@ -112,7 +112,7 @@ public class FormulaDaoImpl implements IFormulaDao {
     @Override
     public Function<Long, List<StartPayForm>> getStayPayFormFc() {
         return  contractId->{
-            String sql="select  a.file_names file_name,  a.meter_money meterMoney ,b.id meterPeriodId,b.sort periodSort from s_start_pay_meter_form a join s_meter_period b on a.meter_period_id =b.id  where  a.is_deleted =0  and a.contract_id="+contractId;
+            String sql="select  a.file_names file_name,a.calculate_formula,  a.meter_money meterMoney ,b.id meterPeriodId,b.sort periodSort from s_start_pay_meter_form a join s_meter_period b on a.meter_period_id =b.id  where  a.is_deleted =0  and a.contract_id="+contractId;
             return getEntityList(sql,StartPayForm.class);
         };
     }