计量公式相关

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/FormData.java

@@ -300,7 +300,9 @@ public class FormData {
         return this.structure==1;
     }
 
-
+    public boolean containsNull(){
+        return !isRemoveEmpty;
+    }
 
 
 }

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

@@ -42,7 +42,7 @@ import java.util.stream.IntStream;
 public class ExecutorCalc extends FormulaExecutor {
     public Function<List<String>, List<Map<String,Object>>>  tableExcelInfoFc;
     public ElementWriter elementWriter;
-    private  String checkTable= StringPool.EMPTY;
+   /* private  String checkTable= StringPool.EMPTY;*/
     public static  final String SIMPLE="simple";
     public static  final String BATCH="batch";
     public ExecutorCalc(TableElementConverter tec) {
@@ -61,8 +61,8 @@ public class ExecutorCalc extends FormulaExecutor {
     };
 
     public ExecuteFlow createExecuteFlow(){
-        Optional<NodeTable> op=tec.getTableAll().stream().filter(e->StringUtils.isEquals(1,e.getTableType())).findAny();
-        op.ifPresent(nodeTable -> this.checkTable = nodeTable.getInitTableName());
+/*        Optional<NodeTable> op=tec.getTableAll().stream().filter(e->StringUtils.isEquals(1,e.getTableType())).findAny();
+        op.ifPresent(nodeTable -> this.checkTable = nodeTable.getInitTableName());*/
         this.elementWriter=new MeterElementWriter();
         return new ExecuteFlow();
     }
@@ -163,7 +163,7 @@ public class ExecutorCalc extends FormulaExecutor {
             List<LocalVariable>  local= FormulaUtils.slice2Local(formulaStr,fdMap,tec);
             if(local.size()>0){
                 List<Object> values = FormulaUtils.slice(local,formulaStr);
-                elementWriter.write(fd,values ,!fd.getTableName().equals(checkTable));
+                elementWriter.write(fd,values);
             }
         }
 

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

@@ -1296,11 +1296,11 @@ public class ExecutorMeter extends FormulaExecutor {
             FormulaUtils.put2FormData(fdm, fieldDataFcMap,dataList);
         };
 
-        public void write(Object data){
+  /*      public void write(Object data){
             FormulaUtils.elementFindByKey(fdm,"key_24").ifPresent(t->{
                 elementWriter.write(t,data);
             });
-        }
+        }*/
     }
     interface  Special{
         /**是否满足执行条件*/

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

@@ -21,7 +21,7 @@ import java.util.stream.IntStream;
 public class MeterElementWriter implements ElementWriter {
     @Override
     public void write(FormData fd, Object data) {
-        write(fd,data,false);
+        write(fd,data,fd.containsNull());
     }
 
     @Override
@@ -63,7 +63,7 @@ public class MeterElementWriter implements ElementWriter {
                 .filter(List.class::isInstance)
                 .map(list -> (List<Object>) list)
                 .orElseGet(() -> Collections.singletonList(raw));
-        if(containsNull){
+        if(!containsNull){
             return values.stream().filter(StringUtils::isNotEmpty).collect(Collectors.toList());
         }
         return values;