公有节点参数、元素表相关

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

@@ -24,10 +24,7 @@ import org.springblade.manager.excel.WbsTreeExcel;
 import org.springblade.manager.mapper.WbsInfoMapper;
 import org.springblade.manager.mapper.WbsTreePrivateMapper;
 import org.springblade.manager.service.IWbsFormElementService;
-import org.springblade.manager.vo.WbsFormElementVO;
-import org.springblade.manager.vo.WbsNodeTableVO;
-import org.springblade.manager.vo.WbsTreeVO;
-import org.springblade.manager.vo.WbsTreeVO2;
+import org.springblade.manager.vo.*;
 import org.springblade.system.cache.DictCache;
 import org.springblade.system.enums.DictEnum;
 import org.springframework.transaction.annotation.Transactional;
@@ -333,6 +330,17 @@ public class WbsTreeController extends BladeController {
         return R.status(wbsTreeService.updateBatchById(WbsTrees));
     }
 
+    /**
+     * 查询公有wbs节点元素表与节点参数
+     */
+    @ApiOperationSupport(order = 12)
+    @ApiOperation(value = "查询节点元素表与节点参数", notes = "传入父节点id")
+    @RequestMapping(value = "/getNodeTabAndParam", method = RequestMethod.GET)
+    public R<WbsNodeTabAndParamVO> getNodeTabAndParam(@ApiParam(value = "父节点id", required = true) @RequestParam String id) {
+        WbsNodeTabAndParamVO rs = wbsTreeService.getNodeTabAndParam(id);
+        return R.data(rs);
+    }
+
 
 }
 

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

@@ -366,10 +366,10 @@ public class WbsTreePrivateController extends BladeController {
     }
 
     /**
-     * 查询节点元素表与节点参数
+     * 查询私有wbs节点元素表与节点参数
      */
     @ApiOperationSupport(order = 12)
-    @ApiOperation(value = "查询节点元素表与节点参数", notes = "传入节点parentId、wbsId、projectId")
+    @ApiOperation(value = "查询私有wbs节点元素表与节点参数", notes = "传入节点parentId、wbsId、projectId")
     @RequestMapping(value = "/getNodeTabAndParam", method = RequestMethod.GET)
     public R<WbsNodeTabAndParamVO> getNodeTabAndParam(@RequestParam("parentId") String parentId,
                                                       @RequestParam("wbsId") String wbsId,

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeService.java

@@ -64,4 +64,6 @@ public interface IWbsTreeService extends BaseService<WbsTree> {
 
     boolean deleteLogicById(String id);
 
+    WbsNodeTabAndParamVO getNodeTabAndParam(String id);
+
 }

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

@@ -51,6 +51,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     private final TextdictInfoServiceImpl textDictInfoService;
     private final FormulaMapper formulaMapper;
     private final BladeRedis bladeRedis;
+    private final WbsParamServiceImpl wbsParamService;
 
 
     @Override
@@ -277,6 +278,18 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         return baseMapper.deleteLogicById(id) > 0;
     }
 
+    @Override
+    public WbsNodeTabAndParamVO getNodeTabAndParam(String id) {
+        WbsNodeTabAndParamVO result = new WbsNodeTabAndParamVO();
+        //获取元素表
+        List<WbsNodeTableVO> tableVOList = selectByNodeTable(id);
+        result.setTabData(tableVOList);
+        //获取节点参数
+        List<WbsParam> paramList = wbsParamService.findByNodeId(Long.valueOf(id));
+        result.setParamData(paramList);
+        return result;
+    }
+
     private Boolean initTable(String tableName) {
         Integer row = baseMapper.createTable(tableName);
         if (row >= 0) {