公式相关

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

@@ -134,6 +134,7 @@ public class TableElementConverter implements ITableElementConverter {
     }
 
     /**格式化回写内容*/
+    @Deprecated
     public String recovery(List<ElementData> dataList,String position){
         List<Coords> coordsList = CoordsBuilder.getInstance().build(position);
         StringBuilder sb = new StringBuilder();
@@ -187,9 +188,12 @@ public class TableElementConverter implements ITableElementConverter {
                 ElementData ed = dataList.get(i);
                 if(list.size()>i){
                      Coords c=list.get(i);
-                     sb.append(ed.stringValue()).append("__").append(c.getY()).append("_").append(c.getX());
+                     sb.append(ed.stringValue()).append("_^_").append(c.getY()).append("_").append(c.getX()).append("☆");
                 }
             }
+            if(sb.length()>5){
+                sb.deleteCharAt(sb.length()-1);
+            }
         }
         return sb.toString();
     }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -305,7 +305,7 @@
     </select>
 
     <select id="searchParentAllNode" resultType="org.springblade.manager.entity.WbsTreeContract">
-        SELECT DISTINCT T2.id, T2.full_name, T2.parent_id, T2.p_key_id
+        SELECT DISTINCT T2.id, T2.node_name, T2.parent_id, T2.p_key_id
         FROM (
                  SELECT @r AS _id,(SELECT @r := parent_id FROM m_wbs_tree_contract WHERE id = _id and contract_id = h.contract_id ) AS pid, @l := @l + 1 AS lvl
                  FROM (SELECT @r := #{primaryKeyId}, @l := 0) vars, m_wbs_tree_contract h

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

@@ -254,7 +254,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 	public void formulaFillData(List<TableInfo> tableInfoList) {
 		StopWatch stopWatch = new StopWatch();
 		String ids =tableInfoList.stream().map(TableInfo::getPkeyId).collect(Collectors.joining(","));
-		List<Map<String,Object>> list=this.jdbcTemplate.queryForList("SELECT   a.p_key_id as nodeId,b.id as fieldId,b.e_key as field,c.init_table_name as tableName  from m_wbs_tree_contract a LEFT JOIN m_wbs_form_element b on a.id=b.f_id left JOIN m_wbs_tree c on a.id=c.id where a.p_key_id in ("+ids+")");
+		List<Map<String,Object>> list=this.jdbcTemplate.queryForList("SELECT   a.p_key_id as nodeId,b.id as fieldId,b.e_key as field,c.init_table_name as tableName  from m_wbs_tree_contract a LEFT JOIN m_wbs_form_element b on a.id=b.f_id left JOIN m_wbs_tree c on a.id=c.id where b.is_deleted=0 and a.p_key_id in ("+ids+")");
 		List<KeyMapper> keyMappers = JSON.parseArray(JSONArray.toJSONString(list), KeyMapper.class);
 		if(Func.isNotEmpty(keyMappers)) {
 			Map<String,Map<String,String>> coordinateMap = new HashMap<>(keyMappers.size()*2);

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

@@ -83,7 +83,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         this.env.formDataList=list;
         this.env.constantMap.put("contractId",contractId);
         List<WbsTreeContract> nodes = treeContractService.searchParentAllNode(primaryKeyId,contractId);
-        this.env.constantMap.put(CHAIN,nodes.stream().map(WbsTreeContract::getFullName).collect(Collectors.toList()));
+        this.env.constantMap.put(CHAIN,nodes.stream().map(WbsTreeContract::getNodeName).collect(Collectors.toList()));
         List<WbsParam> wps = this.wpService.list(Wrappers.<WbsParam>lambdaQuery().eq(WbsParam::getWbsId,primaryKeyId));
         Map<String,Object> wpMap= new HashMap<>(wps.size()*2);
         if(CollectionUtil.isNotEmpty(wps)){
@@ -231,7 +231,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                     E.put(e.getKey(),e.getValue().get(i));
                 }
 
-                lvab.add(new LocalVariable(i,formula,currentMap));
+                lvab.add(new LocalVariable(0,formula,currentMap));
             }
             /*并发执行*/
             List<ElementData>   r= lvab.parallelStream().map(e->{

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

@@ -46,7 +46,7 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
                 nodes.set(0,wbsTreeContract);
                 WbsParam wp = this.getOne(Wrappers.<WbsParam>lambdaQuery().eq(WbsParam::getWbsId,nodeId).eq(WbsParam::getK,FILE_TITLE));
                 if(Func.isNotEmpty(wp)){
-                    return CustomFunction.tree(nodes.stream().map(WbsTreeContract::getFullName).collect(Collectors.toList()), wp.getV()).toString();
+                    return CustomFunction.tree(nodes.stream().map(WbsTreeContract::getNodeName).collect(Collectors.toList()), wp.getV()).toString();
                 }
                 return NOT_SET;
             }