公式相关:元素公式编辑

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

@@ -4,8 +4,6 @@ import lombok.Data;
 import org.springblade.manager.entity.Formula;
 import org.springframework.beans.BeanUtils;
 
-import javax.validation.constraints.Size;
-
 /**
  * @author yangyj
  * @Date 2022/6/14 16:27

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

@@ -88,13 +88,6 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
 
 
 
-
-
-    /**
-     * @Param [list: 源数据, contractId: 合同段id, primaryKeyId: wbs节点id]
-     * @Author yangyj
-     * @Date 2022.08.03 14:03
-     **/
     @Override
     public void execute(TableElementConverter tec) {
         this.tec=tec;
@@ -292,9 +285,6 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
 
     /**
      * @Description 获取节点参数
-     * @return java.util.Map<java.lang.String,java.lang.Object>
-     * @Author yangyj
-     * @Date 2022.10.09 11:11
      **/
     public Map<String,Object> getWpMap(CurrentNode currentNode){
         Map<String,Object> result = new HashMap<>(100);
@@ -514,18 +504,6 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
 
 
 
-    /**对比内容再觉得是否刷新，如果允许牺牲部分性能，也可以不做判断进行全部刷新*/
-    public boolean notEquals(List<ElementData> old,List<ElementData> enw){
-        List<Object> a=old.stream().map(ElementData::getValue).collect(Collectors.toList());
-        List<Object> b=enw.stream().map(ElementData::getValue).collect(Collectors.toList());
-        if(a.size()!=b.size()){
-            return true;
-        }else if(!a.containsAll(b)){
-            return true;
-        }else {
-            return !a.stream().map(Func::toStr).collect(Collectors.joining()).equals(b.stream().map(Func::toStr).collect(Collectors.joining()));
-        }
-    }
 
     @Override
     public void format() {
@@ -709,8 +687,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                             String key ="HA"+HashUtil.identityHashCode(data);
                             this.constantMap.put(key,data);
                             f = f.replace(CustomFunction.CLASS_CALL + m.group(), key);
-                            fd.getFormula().setFormula(f);
                         }
+                        fd.getFormula().setFormula(f);
                     }else if(f.contains(CustomFunction.CLASS_CALL+"proportion(")||f.contains(CustomFunction.CLASS_CALL+"ladder(")||f.contains(CustomFunction.CLASS_CALL+"major(")||f.contains(CustomFunction.CLASS_CALL+"reasonable(")
                             ||f.contains(CustomFunction.CLASS_CALL+"goodSize(")){
                         String tf=f.replaceAll("^T\\(com.mixsmart.utils.CustomFunction\\)\\.\\w+\\(","").replaceAll("[)]$","");

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

@@ -336,10 +336,10 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
             if (escapeChar != null) {
                 elements.setEAllowDeviation(escapeChar);
             }
-            if (nodeId != null && elements.getNodeId() != null && com.mixsmart.utils.StringUtils.isNotEquals(nodeId, elements.getNodeId())) {
-                /*与当前节点不相同，则认为是跨节点取数，当然跨节点位置的标记不仅有绑定节点id一种方式*/
-                elements.setTableElementKey(elements.getNodeId() + StringPool.COLON + elements.getTableElementKey());
-            }
+//            if (nodeId != null && elements.getNodeId() != null && com.mixsmart.utils.StringUtils.isNotEquals(nodeId, elements.getNodeId())) {
+//                /*与当前节点不相同，则认为是跨节点取数，当然跨节点位置的标记不仅有绑定节点id一种方式*/
+//                elements.setTableElementKey(elements.getNodeId() + StringPool.COLON + elements.getTableElementKey());
+//            }
         });
         String elementIds = wbsFormElements.stream().map(WbsFormElement::getId).map(String::valueOf).collect(Collectors.joining(","));
         if (Func.isNotEmpty(elementIds)) {