公式相关:currentNode

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

@@ -13,11 +13,11 @@ public class CurrentNode {
     private Long pkId;
     /**项目集id*/
     private Long privateId;
-    /**wbs_tree的流水号*/
+    /**wbs_tree的流水号 溯源*/
     private Long id;
     /**父节点的树id,注意非流水号*/
     private Long parentId;
-    /**用来构建树的id*/
+    /**用来构建树的id 父子*/
     private Long relateId;
     private Long wbsId;
 }

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

@@ -432,15 +432,15 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             currentNode.setWbsId(Long.parseLong(wtc.getWbsId()));
             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));
-            }
+            currentNode.setPrivateId(this.jdbcTemplate.queryForObject("select p_key_id from m_wbs_tree_private where id=" + currentNode.getId() + " and  project_id=" + wtc.getProjectId() + " and wbs_id=" + wtc.getWbsId() +" limit 1", Long.class));
             return currentNode;
         }
         return null;
     }
 
+
+
+
     public <T extends BaseEntity> CurrentNode createCurrentNode(T entity) {
         if (entity instanceof WbsTreeContract) {
             WbsTreeContract wtc = (WbsTreeContract) entity;
@@ -451,10 +451,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             currentNode.setWbsId(Long.parseLong(wtc.getWbsId()));
             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));
-            }
+            currentNode.setPrivateId(this.jdbcTemplate.queryForObject("select p_key_id from m_wbs_tree_private where id=" + currentNode.getId() + " and  project_id=" + wtc.getProjectId() + " and wbs_id=" + wtc.getWbsId() +" limit 1", Long.class));
             return currentNode;
         } else if (entity instanceof WbsTreePrivate) {
             WbsTreePrivate wtc = (WbsTreePrivate) entity;
@@ -465,10 +462,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             currentNode.setWbsId(Long.parseLong(wtc.getWbsId()));
             currentNode.setId(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));
-            }
+            currentNode.setPrivateId(wtc.getPKeyId());
             return currentNode;
         }
         return null;

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

@@ -1150,7 +1150,7 @@ public  List<ElementData> setScale(Integer scale,List<ElementData> data){
 
     @Override
     public List<KeyMapper> getKeyMapperList(List<Long> ids, String projectId, String nodeId, ExecuteType executeType) {
-        /**ids 表流水号 projectId项目 nodeId工序节点的pkeyId ExecuteType执行模式 质检或者试验 首件*/
+        /*ids 表流水号 projectId项目 nodeId工序节点的pkeyId ExecuteType执行模式 质检或者试验 首件*/
         if(executeType.equals(ExecuteType.INSPECTION)){
             return listForContract(ids,projectId,nodeId);
         }else if(executeType.equals(ExecuteType.TESTING)){