文件题目 模板节点延用之前的

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

@@ -222,7 +222,7 @@ public class InformationWriteQueryController extends BladeController {
         String sgSuffix="";
         String jlSuffix="";
         if(queryList.size()>0){
-            String sql1="Select sg_suffix,jl_suffix from m_project_info where id="+queryList.get(0).getProjectId()+" and is_deleted=0";
+            String sql1="Select sg_suffix,jl_suffix,template_type from m_project_info where id="+queryList.get(0).getProjectId()+" and is_deleted=0";
             List<ProjectInfo> projectInfos = jdbcTemplate.query(sql1, new BeanPropertyRowMapper<>(ProjectInfo.class));
             if(projectInfos.size()>0){
                 sgSuffix=projectInfos.get(0).getSgSuffix()==null?"":projectInfos.get(0).getSgSuffix();
@@ -238,7 +238,11 @@ public class InformationWriteQueryController extends BladeController {
                     if (nameRuleList != null && nameRuleList.getData() != null && !nameRuleList.getData().isEmpty()) {
                         nameRule = String.join("-", nameRuleList.getData());
                     }
-                    result  = nodeBaseInfoServiceClient.getNameRuleByRule(nameRule, contract.getPKeyId()+"");
+                    if(projectInfos.get(0)!=null&&projectInfos.get(0).getTemplateType()==2){
+                        result  = nodeBaseInfoServiceClient.getNameRuleByRule(nameRule, contract.getPKeyId()+"");
+                    }else {
+                        result=wbsParamClient.createFileTitle(contract);
+                    }
                 }else {
                     result=nodeNameMap.get(query.getId());
                     //同时修改工程划分节点命名规则
@@ -272,6 +276,7 @@ public class InformationWriteQueryController extends BladeController {
         return R.status(this.informationQueryService.updateBatchById(queryList));
     }
 
+
     public List<String> getNameRuleByPkeyId(Long pKeyId, Long projectId) {
         NameRuleVo vo = new NameRuleVo();
         String sql2="select * from m_wbs_param where node_id="+pKeyId+" and type=200"+" and is_deleted=0 and k='FILE_TITLE'";