底层节点

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

@@ -3250,7 +3250,7 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
         List<WbsTreePrivateAddVO> selectedNodeList = new ArrayList<>();
 
         //检查新增类型
-        if ("1".equals(vo.getSaveType())||"3".equals(vo.getSaveType())) {
+        if ("1".equals(vo.getSaveType())||"3".equals(vo.getSaveType())||"4".equals(vo.getSaveType())) {
             //todo 当前及子节点 当前及父节点
             //当前及父节点时，半选说明其下的子节点并不是全部选中的，所以这时候只需要根据全选的查询其全部子节点即可
             if (allSelectedNodeList.size() > 0) {
@@ -3279,7 +3279,7 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
             //处理半选
             this.disposeHalfSelectList(treeContract, halfSelectedNodeList, selectedNodeList, query);
 
-        } else if("2".equals(vo.getSaveType())||"4".equals(vo.getSaveType())){
+        } else if("2".equals(vo.getSaveType())){
             //todo 仅当前节点操作
             if (allSelectedNodeList.size() > 0) {
                 //节点划分需求：可以多对多关联
@@ -3391,7 +3391,7 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
 
                 //设置父级id
                 boolean var = true;
-                if ("1".equals(vo.getSaveType())||"3".equals(vo.getSaveType())) {
+                if ("1".equals(vo.getSaveType())||"3".equals(vo.getSaveType())||"4".equals(vo.getSaveType())) {
                     //当前节点及其子节点操作
                     if (OldIdToNewIdMap.containsKey(half.getParentId())) {
                         //跨节点
@@ -3588,6 +3588,16 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
     return R.data(true,"操作成功");
 
 }
+@GetMapping("getDICengNodeName")
+@ApiOperationSupport(order = 1)
+@ApiOperation(value = "获取底层节点文件题名")
+public R<String> getDICengNodeName(@RequestParam Long pKeyId,@RequestParam Long contractId,@RequestParam Integer classify){
+    InformationQuery informationQuery = informationQueryService.getBaseMapper().selectOne(new LambdaQueryWrapper<>(InformationQuery.class).eq(InformationQuery::getWbsId, pKeyId).eq(InformationQuery::getContractId, contractId).eq(InformationQuery::getClassify, classify).eq(InformationQuery::getType, 1));
+    if(informationQuery!=null){
+        return R.data(informationQuery.getName());
+    }
+    return R.data("");
+}
 
 public static WbsTreeContract findTopLevelNode(List<WbsTreeContract> saveList) {
     Set<Long> nodeIds = new HashSet<>();

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

@@ -562,8 +562,8 @@
     </select>
 
     <select id="getTitleRange" resultType="org.springblade.manager.entity.WbsTreePrivate">
-        SELECT id,node_name,status From m_wbs_tree_private where project_id = #{projectId} and node_type=1 and is_deleted=0
-        and parent_id in (select id from m_wbs_tree_private where project_id= #{projectId} and parent_id=0 and is_deleted=0)
+        SELECT id,node_name,status From m_wbs_tree_private where project_id = #{projectId} and node_type=1 and is_deleted=0 and type=1
+        and parent_id !=0
     </select>
 
 </mapper>

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

@@ -241,7 +241,11 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
                     if(list3.contains(param.getNodeId())){
                         result.add(param);
                     }
+                    if(param.getNameType()==1){
+                        result.add(param);
+                    }
                 }
+
                 if(result.size()>0){
                     //如果有部分节点优先部分
                     List<WbsParam> collect1 = result.stream().filter(o -> o.getNameType() == 2).collect(Collectors.toList());