公式相关:wbs、排序

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

@@ -46,6 +46,8 @@ public class FormData {
      * 允许偏差值
      */
     private String eAllowDeviation;
+    /**执行顺序*/
+    private Integer sort=0;
     /**
      * 内容：同一个groupId下List<每一页内容>
      * 用于输出

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

@@ -2571,6 +2571,4 @@ public class CustomFunction {
 	}
 
 
-
-
 }

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

@@ -385,22 +385,12 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             currentNode.setPkId(wtc.getPKeyId());
             currentNode.setParentId(wtc.getParentId());
             currentNode.setWbsId(Long.parseLong(wtc.getWbsId()));
-            List<Long> ids = this.jdbcTemplate.queryForList("select id from m_wbs_tree where id in(" + wtc.getId() + "," + wtc.getOldId() + ")", Long.class);
-            if (Func.isNotEmpty(ids)) {
-                Long id = ids.get(0);
-                currentNode.setId(id);
-                if (id.equals(wtc.getId())) {
-                    if (Func.isNotEmpty(wtc.getOldId())) {
-                        currentNode.setRelateId(Long.parseLong(wtc.getOldId()));
-                    }
-                } else {
-                    currentNode.setRelateId(wtc.getId());
-                }
-                List<Long> privateIds = this.jdbcTemplate.queryForList("select p_key_id from m_wbs_tree_private where id=" + id + " and  project_id=" + wtc.getProjectId() + " and wbs_id=" + wtc.getWbsId(), Long.class);
-                if (Func.isNotEmpty(privateIds)) {
-                    currentNode.setPrivateId(privateIds.get(0));
-                    return currentNode;
-                }
+            currentNode.setId(StringUtils.isNotEmpty(wtc.getOldId())? Long.valueOf(wtc.getOldId()) :wtc.getId());
+            currentNode.setRelateId(wtc.getId());
+            List<Long> privateIds = this.jdbcTemplate.queryForList("select p_key_id from m_wbs_tree_private where id=" + currentNode.getRelateId() + " and  project_id=" + wtc.getProjectId() + " and wbs_id=" + wtc.getWbsId(), Long.class);
+            if (Func.isNotEmpty(privateIds)) {
+                currentNode.setPrivateId(privateIds.get(0));
+                return currentNode;
             }
         }
         return null;

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

@@ -37,6 +37,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -429,6 +430,9 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             sort(rely,((rely.size()+1)/2)*rely.size());
             this.formDataList.addAll(rely);
         }
+        /*初始化排序值，每个点间隔1000，方便插入*/
+        AtomicInteger sort= new AtomicInteger();
+        this.formDataList.forEach(e->e.setSort(sort.getAndAdd(1000)));
         return this;
     }