文件题名

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/WbsParamClient.java

@@ -28,5 +28,5 @@ public interface WbsParamClient {
     @PostMapping(API_PREFIX + "/createFileTitle")
     String createFileTitle(@RequestBody WbsTreeContract contract);
     @PostMapping(API_PREFIX + "/getNameRuleByPkeyId")
-    R getNameRuleByPkeyId(Long pKeyId, Long aLong);
+    R<List<String>> getNameRuleByPkeyId(@RequestParam Long pKeyId, @RequestParam Long projectId);
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -233,8 +233,12 @@ public class InformationWriteQueryController extends BladeController {
                 String sql="select * from m_wbs_tree_contract where p_key_id="+query.getWbsId()+" and is_deleted=0";
                 WbsTreeContract contract = jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(WbsTreeContract.class));
                 if(dto.getType()==1){
-                    R nameRule = wbsParamClient.getNameRuleByPkeyId(contract.getPKeyId(), Long.valueOf(contract.getProjectId()));
-                    result  = nodeBaseInfoServiceClient.getNameRuleByRule(nameRule.getData()+"", contract.getPKeyId()+"");
+                    R<List<String>>  nameRuleList = wbsParamClient.getNameRuleByPkeyId(contract.getPKeyId(), Long.valueOf(contract.getProjectId()));
+                    String nameRule = "";
+                    if (nameRuleList != null && nameRuleList.getData() != null && !nameRuleList.getData().isEmpty()) {
+                        nameRule = String.join("-", nameRuleList.getData());
+                    }
+                    result  = nodeBaseInfoServiceClient.getNameRuleByRule(nameRule, contract.getPKeyId()+"");
                 }else {
                     result=nodeNameMap.get(query.getId());
                     //同时修改工程划分节点命名规则

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsParamClientImpl.java

@@ -30,7 +30,7 @@ public class WbsParamClientImpl implements WbsParamClient{
     }
 
     @Override
-    public R getNameRuleByPkeyId(Long pKeyId, Long projectId) {
+    public R<List<String>> getNameRuleByPkeyId(Long pKeyId, Long projectId) {
         return iWbsParamService.getNameRuleByPkeyId(pKeyId,projectId);
     }
 }