Просмотр исходного кода

Revert "导出划分"

This reverts commit 0a7026f709310356b136c0525b50291c0633cbdf.
cr 1 месяц назад
Родитель
Сommit
c03007eadd

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

@@ -1,7 +1,6 @@
 package org.springblade.manager.feign;
 
 
-import org.springblade.core.tool.api.R;
 import org.springblade.manager.entity.WbsParam;
 import org.springblade.manager.entity.WbsTreeContract;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -31,6 +30,4 @@ public interface WbsParamClient {
     void saveWbsParams(@RequestBody List<WbsParam> wbsParamList);
     @PostMapping(API_PREFIX + "/createFileTitle")
     String createFileTitle(@RequestBody WbsTreeContract contract);
-    @PostMapping(API_PREFIX + "/createFileTitle")
-    R getNameRuleByPkeyId(Long pKeyId, Long aLong);
 }

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

@@ -233,8 +233,7 @@ 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()+"");
+                    result=wbsParamClient.createFileTitle(contract);
                 }else {
                     result=nodeNameMap.get(query.getId());
                     //同时修改工程划分节点命名规则

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

@@ -2,7 +2,6 @@ package org.springblade.manager.feign;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
-import org.springblade.core.tool.api.R;
 import org.springblade.manager.entity.WbsParam;
 import org.springblade.manager.entity.WbsTreeContract;
 import org.springblade.manager.service.IWbsParamService;
@@ -35,9 +34,4 @@ public class WbsParamClientImpl implements WbsParamClient{
     public String createFileTitle(WbsTreeContract contract) {
         return iWbsParamService.createFileTitle(contract);
     }
-
-    @Override
-    public R getNameRuleByPkeyId(Long pKeyId, Long projectId) {
-        return iWbsParamService.getNameRuleByPkeyId(pKeyId,projectId);
-    }
 }