公式相关

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

@@ -2009,6 +2009,7 @@ public class CustomFunction {
 
 	public static Object tree(List<String>nodes,String param){
 		if(CollectionUtil.isNotEmpty(nodes)&& Func.isNotBlank(param)){
+			Collections.reverse(nodes);
 			List<String> result = new ArrayList<>();
 			param=param.replaceAll("(?i:c)","");
 			List<String> list = Arrays.asList(param.split("[^.\\d]"));

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -752,7 +752,7 @@ public class ExcelTabController extends BladeController {
                     .eq(WbsTreeContract::getId, wbsTreeContract.getParentId()).eq(WbsTreeContract::getContractId,contractId));
 
             //处理文件提名
-            String fileName = this.wbsParamService.createFileTitle(wbsTreeContractByP.getPKeyId(), Long.parseLong(wbsTreeContractByP.getContractId()));
+            String fileName = this.wbsParamService.createFileTitle(Func.isNotEmpty(wbsTreeContractByP.getOldId())? Long.valueOf(wbsTreeContractByP.getOldId()) :wbsTreeContractByP.getId(), Long.parseLong(wbsTreeContractByP.getContractId()));
             fileName = StringUtils.isNotEmpty(fileName) ? fileName : "缺少文件提名配置";
 
             //huangjn 保存成功后调用生成资料查询列表数据

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

@@ -318,7 +318,7 @@
                    and contract_id=#{contractId} LIMIT 1)
              ) T1
                  JOIN m_wbs_tree_contract T2 ON T1._id = T2.id
-        where T2.contract_id=#{contractId}
+        where T2.contract_id=#{contractId} and T2.type<>2
     </select>
 
     <select id="updateAllNodeTabById" resultType="org.springblade.manager.entity.WbsTreeContract">

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

@@ -263,7 +263,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 				WbsTreeContract wbsTreeContractByP = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
 							.eq(WbsTreeContract::getId, wbsTreeContract.getParentId()).eq(WbsTreeContract::getContractId,tableInfo.getContractId()));
 					//处理文件提名
-				String fileName = this.wbsParamService.createFileTitle(wbsTreeContractByP.getPKeyId(), Long.parseLong(wbsTreeContractByP.getContractId()));
+				String fileName = this.wbsParamService.createFileTitle(Func.isNotEmpty(wbsTreeContractByP.getOldId())? Long.valueOf(wbsTreeContractByP.getOldId()) :wbsTreeContractByP.getId(), Long.parseLong(wbsTreeContractByP.getContractId()));
 					fileName = StringUtils.isNotEmpty(fileName) ? fileName : "缺少文件提名配置";
 
 					//huangjn 保存成功后调用生成资料查询列表数据

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

@@ -19,6 +19,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -44,7 +45,7 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
             if(Func.isNotEmpty(nodes)){
                 WbsParam wp = this.getOne(Wrappers.<WbsParam>lambdaQuery().eq(WbsParam::getWbsId,nodeId).eq(WbsParam::getK,FILE_TITLE));
                 if(Func.isNotEmpty(wp)){
-                    CustomFunction.tree(nodes.stream().map(WbsTreeContract::getFullName).collect(Collectors.toList()), wp.getV());
+                    return CustomFunction.tree(nodes.stream().map(WbsTreeContract::getFullName).collect(Collectors.toList()), wp.getV()).toString();
                 }
                 return NOT_SET;
             }