Merge branch 'refs/heads/feature-lihb-20250922-titleFilter' into dev

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

@@ -860,8 +860,8 @@ public class WbsTreePrivateController extends BladeController {
     @GetMapping("/getTitleRange")
     @ApiOperationSupport(order = 33)
     @ApiOperation(value = "获取题名范围",notes = "获取题名范围")
-    public R<List<TitleRangeVo>> getTitleRange(@RequestParam String projectId,@RequestParam(required = false) Long nameId){
-        List<WbsTreePrivate>list=wbsTreeService.getTitleRange(projectId);
+    public R<List<TitleRangeVo>> getTitleRange(@RequestParam String projectId,@RequestParam(required = false) Long nameId,@RequestParam(required = false) Integer wbsType){
+        List<WbsTreePrivate>list=wbsTreeService.getTitleRange(projectId,wbsType);
         List<WbsParam> list1 = iWbsParamService.getBaseMapper().selectList(Wrappers.<WbsParam>lambdaQuery().eq(WbsParam::getK, "FILE_TITLE").eq(WbsParam::getProjectId, projectId));
         if(list1.size()>0){
                 //修改
@@ -920,7 +920,7 @@ public class WbsTreePrivateController extends BladeController {
                     iWbsParamService.getBaseMapper().delete(new QueryWrapper<WbsParam>().eq("name_id",dto.getNameId()));
                 }
                 if(dto.getType()==1){
-                    List<WbsTreePrivate>list=wbsTreeService.getTitleRange(dto.getProjectId()+"");
+                    List<WbsTreePrivate>list=wbsTreeService.getTitleRange(dto.getProjectId()+"",null);
                     if(list.size()>0){
                         dto.setNodeId(list.stream()
                             .map(item -> String.valueOf(item.getId()))

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

@@ -100,5 +100,6 @@ public interface WbsTreeMapper extends EasyBaseMapper<WbsTree> {
 
     int isThereAField(@Param("initTableName") String initTableName, @Param("keyId") String keyId);
 
-    List<WbsTreePrivate> getTitleRange(@Param("projectId")Long projectId);
+    List<WbsTreePrivate> getTitleRange(@Param("projectId")Long projectId,
+                                       @Param("wbsType")Integer wbsType);
 }

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

@@ -568,6 +568,9 @@
     <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 type=1
         and parent_id !=0
+        <if test="wbsType != null">
+            and wbs_type = #{wbsType}
+        </if>
     </select>
 
 </mapper>

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

@@ -78,7 +78,7 @@ public interface IWbsTreeService extends BaseService<WbsTree> {
 
     Object getQueryValueByType(String queryValue, String wbsId, String projectId, String type);
 
-    List<WbsTreePrivate> getTitleRange(String projectId);
+    List<WbsTreePrivate> getTitleRange(String projectId,Integer wbsType);
 
     Object getQueryValueByNodeType(String wbsId, String projectId, String queryValue, Integer nodeType, Integer majorDataType);
 }

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

@@ -563,8 +563,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
 
 
     @Override
-    public List<WbsTreePrivate> getTitleRange(String projectId) {
-        return this.baseMapper.getTitleRange(Long.valueOf(projectId));
+    public List<WbsTreePrivate> getTitleRange(String projectId,Integer wbsType) {
+        return this.baseMapper.getTitleRange(Long.valueOf(projectId),wbsType);
     }
 
     @Override