中间计量公式

blade-service/blade-manager/src/main/java/com/mixsmart/utils/FormulaUtils.java

@@ -361,6 +361,7 @@ public class FormulaUtils {
         return vos;
     }
 
+    /*根据数据模型实例生成带数据的元素，用于修改*/
     public static <T> LinkedHashMap<String,FormData> toFormDataMap(T bean){
         LinkedHashMap<String,FormData> result = new LinkedHashMap<>();
         if(bean!=null){
@@ -387,7 +388,26 @@ public class FormulaUtils {
         }
         return result;
     }
-
+    /*根据数据模型建立空元素，待写入数据*/
+    public static <T> LinkedHashMap<String,FormData> toFormDataMap(Class<T> clazz){
+        LinkedHashMap<String,FormData> result = new LinkedHashMap<>();
+            try {
+                String TBN = (String)  clazz.getField(TBN_FN).get(null);
+                for (Field field : clazz.getDeclaredFields()) {
+                    JSONField jf = field.getAnnotation(JSONField.class);
+                    if (jf != null) {
+                        FormData fd = new FormData();
+                        fd.setCode(TBN+ StringPool.COLON +jf.name());
+                        fd.setEName(jf.label());
+                        fd.getCoordsList().add(new Coords("0","0"));
+                        result.put(fd.getCode(),fd);
+                    }
+                }
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+        return result;
+    }
     /*把结果数据回写到元素*/
     public static<T>void  put2FormData( LinkedHashMap<String,FormData> fdm,Map<String,Function<List<T>,List<Object>>> functionMap,List<T> dataList){
         fdm.values().stream()

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

@@ -1,17 +0,0 @@
-package org.springblade.manager.formula.impl;
-
-import org.springblade.manager.dto.ElementData;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author yangyj
- * @Date 2022/9/9 17:37
- * @description TODO
- */
-public class CompositeDataAccessGroup {
-    List<CompositeDataAccess> list;
-    Map<String, ElementData> dataMap;
-}

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

@@ -1,25 +1,19 @@
 package org.springblade.manager.formula.impl;
 
 import com.jfireel.expression.Expression;
-import com.mixsmart.utils.CustomFunction;
 import com.mixsmart.utils.FormulaUtils;
 import com.mixsmart.utils.StringUtils;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.RegexUtil;
-import org.springblade.manager.dto.ElementData;
 import org.springblade.manager.dto.FormData;
 import org.springblade.manager.dto.LocalVariable;
 import org.springblade.manager.entity.Formula;
-import org.springblade.manager.enums.ExecuteType;
-import org.springblade.manager.formula.FormulaExecutor;
 import org.springblade.manager.formula.FormulaLog;
 import org.springblade.manager.formula.NodeTable;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author yangyj

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

@@ -1,22 +1,12 @@
 package org.springblade.manager.formula.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.mixsmart.utils.FormulaUtils;
 import com.mixsmart.utils.StringUtils;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.common.utils.SnowFlakeUtil;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.manager.bean.TableInfo;
 import org.springblade.manager.dto.ElementData;
 import org.springblade.manager.dto.FormData;
 import org.springblade.manager.entity.Formula;
-import org.springblade.manager.entity.WbsTreeContract;
-import org.springblade.manager.formula.FormulaExecutor;
-import org.springblade.manager.formula.NodeTable;
-
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author yangyj

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

@@ -3,17 +3,12 @@ package org.springblade.manager.formula.impl;
 import com.mixsmart.utils.FormulaUtils;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.manager.dto.TreeNode;
-import org.springblade.manager.formula.FormulaExecutor;
 import org.springblade.manager.vo.*;
-import org.springframework.scheduling.annotation.Async;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
-import java.util.logging.Handler;
-import java.util.stream.Collectors;
 
 /**
  * @author yangyj

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

@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.manager.dto.FormData;
-import org.springblade.manager.formula.FormulaExecutor;
 
 import java.util.regex.Matcher;
 

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

@@ -1,17 +1,13 @@
 package org.springblade.manager.formula.impl;
 
 import com.mixsmart.utils.FormulaUtils;
-import com.mixsmart.utils.StringUtils;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.manager.dto.ElementData;
 import org.springblade.manager.dto.FormData;
-import org.springblade.manager.formula.FormulaExecutor;
-import org.springblade.manager.formula.NodeTable;
 
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

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

@@ -10,7 +10,6 @@ import org.springblade.core.tool.utils.StringPool;
 import org.springblade.manager.dto.ElementData;
 import org.springblade.manager.dto.FormData;
 import org.springblade.manager.dto.TreeNode;
-import org.springblade.manager.formula.FormulaExecutor;
 import org.springblade.manager.vo.*;
 import org.springframework.beans.BeanUtils;
 
@@ -37,19 +36,19 @@ public class ExecutorSpecial extends FormulaExecutor {
     private Function<Long, List<Payment>> paymentListFc;
     private Function<Long, List<InventoryForm>> inventoryFormFc;
     private Function<Long, List<MeterApply>> meterApplyFc;
-    public ExecutorSpecial(TableElementConverter tec) {
-        super(tec);
-    }
-    /**章节*/
-    private List<InventoryForm> chapters = new ArrayList<>();
+    /*执行链*/
     private List<Special> specialList = new ArrayList<>();
+    /**支付章节*/
+    private List<InventoryForm> chapters = new ArrayList<>();
+    /**上期累计支付信息*/
     private List<Payment>  previous =new ArrayList<>();
+    /**本期支付信息*/
     private List<Payment>   current =new ArrayList<>();
     /**计量期*/
     private  MeterPeriodInfo periodInfo;
     private List<InterimPaymentCertificate> interimPaymentCertificates =new ArrayList<>();
     /*求百分比*/
-    BinaryOperator<String> ratioFc = (a,b)->{
+    private BinaryOperator<String> ratioFc = (a,b)->{
         /*合同金额*/
         BigDecimal aBd =new BigDecimal(a);
         /*变更金额*/
@@ -60,6 +59,7 @@ public class ExecutorSpecial extends FormulaExecutor {
         return  aBd.multiply(new BigDecimal(100)).divide(bBd, 2, RoundingMode.HALF_UP).toString();
     };
 
+   /**根据清单编号获取支付项目章节编号*/
     public String getPrefix(String fn){
         for(InventoryForm itf:chapters){
             String prefix=itf.getChapter();
@@ -74,15 +74,10 @@ public class ExecutorSpecial extends FormulaExecutor {
         return fn;
     }
 
-    public Function<String,String> preFixFc= this::getPrefix;
+    Function<String,String> preFixFc= this::getPrefix;
 
-    public <T> LinkedHashMap<String,FormData>   builderFormDatas(T bean){
-        LinkedHashMap<String,FormData> fdm = FormulaUtils.toFormDataMap(bean);
-        Map<String,Function<List<T>,List<Object>>> functionMap =FormulaUtils.fieldDataFcMap(bean.getClass());
-        tec.getFormDataMap().putAll(fdm);
-        return fdm;
-    }
 
+    /*获取动态行最大行数，codeFind为相关元素码集合 */
     public Integer getLineSize(List<String> codeFind){
         int line=10;
         Optional<FormData> formDataOp=  tec.getFormDataList().stream().filter(e-> BaseUtils.inChain(codeFind,e.getCode())).findAny();
@@ -100,9 +95,16 @@ public class ExecutorSpecial extends FormulaExecutor {
         }else if(MeterType.INTERIM.equals(tec.getMeterType())){
             this.specialList.add(new InterimPayCert());
             this.specialList.add(new InterimSum());
+            this.specialList.add(new SubIPaySum());
+            this.specialList.add(new SubIMeterPay());
+            this.specialList.add(new IMeterPaySummary());
+            this.specialList.add(new IMeter());
         }
         this.specialList.stream().filter(Special::ready).forEach(Special::parse);
     }
+
+
+
     @Data
     public  class MaterialCalc implements Special{
         private FormData index;
@@ -244,8 +246,9 @@ public class ExecutorSpecial extends FormulaExecutor {
         }
     }
 
+    @EqualsAndHashCode(callSuper = true)
     @Data
-    public  class InterimPayCert implements Special{
+    public  class InterimPayCert extends   BaseSpecial<InterimPaymentCertificate> implements Special{
 
         @Override
         public boolean ready() {
@@ -276,11 +279,7 @@ public class ExecutorSpecial extends FormulaExecutor {
 
         @Override
         public void parse() {
-            LinkedHashMap<String,FormData> fdm = FormulaUtils.toFormDataMap(new InterimPaymentCertificate());
-            tec.getFormDataMap().putAll(fdm);
-            Map<String,Function<List<InterimPaymentCertificate>,List<Object>>> functionMap =FormulaUtils.fieldDataFcMap(InterimPaymentCertificate.class);
-
-            List<InterimPaymentCertificate> dataList = new ArrayList<>();
+            builderFormDatas(InterimPaymentCertificate.class);
             /*数据获取start*/
               /*支付数据*/
              List<Payment> paymentList=paymentListFc.apply(tec.getContractId());
@@ -329,14 +328,14 @@ public class ExecutorSpecial extends FormulaExecutor {
             /*本期实际支付合计计算*/
             functionMap.put(InterimPaymentCertificate.TBN+ StringPool.COLON+"key_9",(List<InterimPaymentCertificate> list)-> Collections.singletonList(list.stream().map(InterimPaymentCertificate::getCurrentPeriodPay).mapToDouble(Double::parseDouble).sum()));
             /*内容输出*/
-            FormulaUtils.put2FormData(fdm,functionMap,dataList);
-
+            putOut();
         }
 
 
     }
+    @EqualsAndHashCode(callSuper = true)
     @Data
-    public  class InterimSum implements Special{
+    public  class InterimSum extends   BaseSpecial<InterimPaymentSummary> implements Special{
         @Override
         public boolean ready() {
             return interimPaymentCertificates.size()>0;
@@ -348,10 +347,7 @@ public class ExecutorSpecial extends FormulaExecutor {
 
         @Override
         public void parse() {
-            LinkedHashMap<String,FormData> fdm = FormulaUtils.toFormDataMap(new InterimPaymentSummary());
-            Map<String,Function<List<InterimPaymentSummary>,List<Object>>> functionMap =FormulaUtils.fieldDataFcMap(InterimPaymentSummary.class);
-            tec.getFormDataMap().putAll(fdm);
-            List<InterimPaymentSummary> dataList=new ArrayList<>();
+            builderFormDatas(InterimPaymentSummary.class);
             for(InterimPaymentCertificate ipc:interimPaymentCertificates){
                 InterimPaymentSummary ips = new InterimPaymentSummary();
                 BeanUtils.copyProperties(ipc,ips);
@@ -371,14 +367,14 @@ public class ExecutorSpecial extends FormulaExecutor {
                 summary.setPayRatioA(ratioFc.apply(summary.getCurrentPeriodEndPay(),summary.getRevisedAmount()));
                 dataList.add(summary);
                 /*内容输出*/
-                FormulaUtils.put2FormData(fdm,functionMap,dataList);
+                putOut();
             }
         }
     }
 
+    @EqualsAndHashCode(callSuper = true)
     @Data
-    public  class SubIPaySum implements Special{
-         private Integer capacity=10;
+    public  class SubIPaySum extends   BaseSpecial<SubprojectInterimPaymentSummary> implements Special{
 
         @Override
         public boolean ready() {
@@ -436,7 +432,6 @@ public class ExecutorSpecial extends FormulaExecutor {
             }
         }
 
-
         /*按清单编号求和*/
         public  Map<String,Summary> toSummary(List<Payment> payments) {
             return payments.stream()
@@ -449,17 +444,12 @@ public class ExecutorSpecial extends FormulaExecutor {
         }
 
 
-
         @Override
         public void parse() {
-            LinkedHashMap<String,FormData> fdm = FormulaUtils.toFormDataMap(new SubprojectInterimPaymentSummary());
-            /*获取实际输出行数*/
-            this.capacity=getLineSize(new ArrayList<>(fdm.keySet()));
-            Map<String,Function<List<SubprojectInterimPaymentSummary>,List<Object>>> functionMap =FormulaUtils.fieldDataFcMap(SubprojectInterimPaymentSummary.class);
-            tec.getFormDataMap().putAll(fdm);
+            builderFormDatas(SubprojectInterimPaymentSummary.class);
             Map<String,Summary> currentSummary = toSummary(current);
             Map<String,Summary> preSummary = toSummary(previous);
-            List<SubprojectInterimPaymentSummary> dataList = new ArrayList<>();
+            List<SubprojectInterimPaymentSummary> totalList = new ArrayList<>();
             for(Map.Entry<String,Summary> form:currentSummary.entrySet()){
                 SubprojectInterimPaymentSummary sis = new SubprojectInterimPaymentSummary();
                 Summary pre =preSummary.get(form.getKey());
@@ -478,10 +468,9 @@ public class ExecutorSpecial extends FormulaExecutor {
                     sis.setCurrentPeriodEndPay(summary.getCurrentPeriodEndPay().toString());
                     sis.setPayRatio(ratioFc.apply(sis.getCurrentPeriodEndPay(),sis.getRevisedAmount()));
                 }
-                dataList.add(sis);
+                totalList.add(sis);
             }
-            List<SubprojectInterimPaymentSummary> outPutList= new ArrayList<>();
-            LinkedHashMap<String,List<SubprojectInterimPaymentSummary>> chapterGroup= dataList.stream().collect(Collectors.groupingBy(e->getPrefix(e.getFormNumber()),LinkedHashMap::new,Collectors.toList()));
+            LinkedHashMap<String,List<SubprojectInterimPaymentSummary>> chapterGroup= totalList.stream().collect(Collectors.groupingBy(e->getPrefix(e.getFormNumber()),LinkedHashMap::new,Collectors.toList()));
             AtomicInteger loop = new AtomicInteger(chapterGroup.size());
             chapterGroup.forEach((k,v)->{
                 int extra=loop.getAndDecrement()>0?1:2;
@@ -490,8 +479,6 @@ public class ExecutorSpecial extends FormulaExecutor {
                 /*每页小结是固定内容，需要每页保留一行*/
                 int dataAreaSize=capacity-1;
                 int pageSize=(int)Math.ceil(dataLength/(double)dataAreaSize);
-                /*总长度*/
-                int total = pageSize*capacity;
                 List<List<SubprojectInterimPaymentSummary>> ds = BaseUtils.splitList(v,capacity-1);
                 List<SubprojectInterimPaymentSummary> tmp = new ArrayList<>();
                 for(int n=0;n<pageSize;n++){
@@ -508,37 +495,35 @@ public class ExecutorSpecial extends FormulaExecutor {
                     if(placeholderSize>0){
                         tmp.addAll(Collections.nCopies(placeholderSize,new SubprojectInterimPaymentSummary()));
                     }
-                    SubprojectInterimPaymentSummary last = new SubprojectInterimPaymentSummary("本页小计");
-                    last.calculate(currentPageData);
-                    tmp.add(last);
+                    subtotal(new SubprojectInterimPaymentSummary("本页小计"),tmp,currentPageData);
                     if(m>1) {
                         /*本章小结*/
-                        SubprojectInterimPaymentSummary lastA = new SubprojectInterimPaymentSummary();
-                        lastA.calculate(v);
-                        tmp.add(lastA);
+                        subtotal(new SubprojectInterimPaymentSummary("章合计"),tmp,v);
                     }
                     if(m>2){
                         /*所有章合计*/
-                        SubprojectInterimPaymentSummary lastB = new SubprojectInterimPaymentSummary();
-                        lastB.calculate(dataList);
-                        tmp.add(lastB);
+                        subtotal(new SubprojectInterimPaymentSummary("所有章合计"),tmp,totalList);
                     }
-                    outPutList.addAll(tmp);
+                    dataList.addAll(tmp);
                     tmp.clear();
                 }
             });
             /*内容输出*/
-            FormulaUtils.put2FormData(fdm,functionMap,outPutList);
+             putOut();
         }
 
+        public void subtotal(SubprojectInterimPaymentSummary b,  List<SubprojectInterimPaymentSummary> result ,List<SubprojectInterimPaymentSummary> data){
+            b.calculate(data);
+            result.add(b);
+        }
 
 
-    }
 
+    }
 
+    @EqualsAndHashCode(callSuper = true)
     @Data
-    public class SubIMeterPay implements Special{
-        private Integer capacity=10;
+    public class SubIMeterPay extends  BaseSpecial<SubInterimMeterPaySummary> implements Special{
 
         @Override
         public boolean ready() {
@@ -561,14 +546,10 @@ public class ExecutorSpecial extends FormulaExecutor {
 
         @Override
         public void parse() {
+            builderFormDatas(SubInterimMeterPaySummary.class);
             /*按照计量单元和单元内的清单顺序排序显示计量清单，并且把计量单元的层级一并显示*/
             /*根据每一期的s_middle_meter_apply，s_inventory_form_apply 获取对应的计量清单，然后根据清单Id配合s_inventory_form_meter查找计量单元信息*/
             /*s_change_token_inventory每个清单关联的变更令，s_change_token_meter每个计量单元关联的变更令*/
-            LinkedHashMap<String,FormData> fdm = FormulaUtils.toFormDataMap(new SubInterimMeterPaySummary());
-            /*获取实际输出行数*/
-            this.capacity=getLineSize(new ArrayList<>(fdm.keySet()));
-            Map<String,Function<List<SubInterimMeterPaySummary>,List<Object>>> functionMap =FormulaUtils.fieldDataFcMap(SubInterimMeterPaySummary.class);
-            tec.getFormDataMap().putAll(fdm);
             try {
                 Map<Long, TreeNode<MeterTree>> treeNodeMap = tec.getMeterTreeMap().get();
                 Optional<TreeNode<MeterTree>> optionalTreeNode=  treeNodeMap.values().stream().filter(TreeNode::isTop).findAny();
@@ -591,7 +572,7 @@ public class ExecutorSpecial extends FormulaExecutor {
                     });
                     /*分组列表，每一组都是一个章节*/
                     List<List<SubInterimMeterPaySummary>> pageData =traversal(top);
-                    List<SubInterimMeterPaySummary> dataList=  pageData.stream().flatMap(list->{
+                    dataList=  pageData.stream().flatMap(list->{
                         List<SubInterimMeterPaySummary> tmp =new ArrayList<>(list);
                         int size = (int)Math.ceil(tmp.size()/(double)this.capacity);
                         /*每一章需要留一行做小计，其他要填充空白行*/
@@ -606,7 +587,7 @@ public class ExecutorSpecial extends FormulaExecutor {
                        return tmp.stream();
                     }).collect(Collectors.toList());
                     /*内容输出*/
-                    FormulaUtils.put2FormData(fdm,functionMap,dataList);
+                    putOut();
                 }
             }catch (Exception e){
                 e.printStackTrace();
@@ -671,9 +652,10 @@ public class ExecutorSpecial extends FormulaExecutor {
 
     }
 
+    @EqualsAndHashCode(callSuper = true)
     @Data
-    public class IMeterPaySummary implements Special{
-        private Integer capacity=20;
+    public class IMeterPaySummary extends BaseSpecial<InterimMeterPaySummary> implements Special{
+        /*private Integer capacity=20;*/
         @Override
         public boolean ready() {
             return current.size()>0;
@@ -681,12 +663,7 @@ public class ExecutorSpecial extends FormulaExecutor {
 
         @Override
         public void parse() {
-            LinkedHashMap<String,FormData> fdm = FormulaUtils.toFormDataMap(new InterimMeterPaySummary());
-            /*获取实际输出行数*/
-            this.capacity=getLineSize(new ArrayList<>(fdm.keySet()));
-            Map<String,Function<List<InterimMeterPaySummary>,List<Object>>> functionMap =FormulaUtils.fieldDataFcMap(InterimMeterPaySummary.class);
-            tec.getFormDataMap().putAll(fdm);
-            List<InterimMeterPaySummary> dataList = new ArrayList<>();
+            builderFormDatas(InterimMeterPaySummary.class);
             for(Payment payment:current){
                 InterimMeterPaySummary imps = new InterimMeterPaySummary();
                 BeanUtils.copyProperties(payment,imps);
@@ -700,7 +677,7 @@ public class ExecutorSpecial extends FormulaExecutor {
                 summary.setMoney(StringUtils.number2StringZero(sum,2));
                 dataList.add(summary);
             }
-            FormulaUtils.put2FormData(fdm,functionMap,dataList);
+            putOut();
         }
     }
 
@@ -751,11 +728,44 @@ public class ExecutorSpecial extends FormulaExecutor {
         }
     }
 
-
-    public interface  Special{
+    @Data
+    class BaseSpecial<T>{
+        /*数据模型包含的元素*/
+        public LinkedHashMap<String,FormData> fdm;
+        /*元素内容输出对应的映射函数*/
+        public Map<String,Function<List<T>,List<Object>>> functionMap;
+        /*获取实际输出行数*/
+        public Integer capacity;
+        /*输出值*/
+        List<T> dataList;
+        /*用实例去构建带有初始化数据的元素*/
+        public void  builderFormDatas(T bean){
+            fdm = FormulaUtils.toFormDataMap(bean);
+            functionMap =FormulaUtils.fieldDataFcMap(bean.getClass());
+            capacity=getLineSize(new ArrayList<>(fdm.keySet()));
+            tec.getFormDataMap().putAll(fdm);
+            dataList=new ArrayList<>();
+        }
+        /*用元类class 创建空元素*/
+        public void  builderFormDatas(Class<T> clazz){
+            fdm = FormulaUtils.toFormDataMap(clazz);
+            functionMap =FormulaUtils.fieldDataFcMap(clazz);
+            capacity=getLineSize(new ArrayList<>(fdm.keySet()));
+            tec.getFormDataMap().putAll(fdm);
+            dataList=new ArrayList<>();
+        }
+        /*写入对应的元素*/
+        public void putOut(){
+            FormulaUtils.put2FormData(fdm,functionMap,dataList);
+        };
+    }
+    interface  Special{
         /**是否满足执行条件*/
         boolean ready();
         /**解析数据*/
         void parse();
     }
+    public ExecutorSpecial(TableElementConverter tec) {
+        super(tec);
+    }
 }

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

@@ -1,7 +1,7 @@
-package org.springblade.manager.formula;
+package org.springblade.manager.formula.impl;
 
 import lombok.Data;
-import org.springblade.manager.formula.impl.TableElementConverter;
+import org.springblade.manager.formula.FormulaHandleChain;
 import java.util.regex.Pattern;
 
 
@@ -11,8 +11,8 @@ import java.util.regex.Pattern;
  * @description 公式执行器
  */
 @Data
-public abstract  class   FormulaExecutor implements FormulaHandleChain{
-    public  TableElementConverter tec;
+public abstract  class   FormulaExecutor implements FormulaHandleChain {
+    TableElementConverter tec;
     public final static String WP="WP";
     public final static String CHAIN="trees";
     public final static String FC="FC.";

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

@@ -2624,7 +2624,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         /*元素创建*/
         Map<String,String> parent=  getWtpParent(meterType.getName(),contractInfo.getPId());
         List<NodeTable> tableList=  this.getSqlList("select p_key_id pkeyId, node_name nodeName ,init_table_name initTableName,html_url htmlUrl ,excel_id excelId from  m_wbs_tree_private where ancestors like ? and LENGTH(html_url)>0 and is_deleted=0 and project_id=? and wbs_id=?",NodeTable.class,parent.get("path")+"%",contractInfo.getPId(),parent.get("wbsId"));
-        Map<String,Map<String,String>> coordinateMap=tableList.stream().collect(Collectors.toMap(NodeTable::getInitTableName,m->FormulaUtils.getElementCell(m.getHtmlUrl()),(v1,v2)->v2));
+        Map<String,Map<String,String>> coordinateMap=tableList.parallelStream().collect(Collectors.toMap(NodeTable::getInitTableName,m->FormulaUtils.getElementCell(m.getHtmlUrl()),(v1,v2)->v2));
         List<FormData> processFds = this.createFormDataByTableName(tableList.stream().map(NodeTable::getInitTableName).collect(Collectors.joining("','")));
         listForMeter(processFds,contractInfo.getPId(),parent.get("id"));