fix:申请模块根据名字查询项目，系统，模块

src/main/java/com/jsl/oa/controllers/ProjectController.java

@@ -349,7 +349,13 @@ public class ProjectController {
         return projectService.projectModuleDelete(request, id);
     }
 
-
+    /**
+     * 项目名模糊查询项目
+     *
+     * @param name
+     * @param request
+     * @return
+     */
     @GetMapping("/project/get/name")
     public BaseResponse projectGetName(
             @RequestParam String name,
@@ -358,4 +364,28 @@ public class ProjectController {
         return projectService.projectGetName(name, request);
     }
 
+    /**
+     * 项目名查询子系统
+     *
+     * @param name
+     * @param request
+     * @return
+     */
+    @GetMapping("/project/child/get/name")
+    public BaseResponse projectChildGetName(
+            @RequestParam String name,
+            HttpServletRequest request
+    ) {
+        return projectService.projectChildGetName(name, request);
+    }
+
+    @GetMapping("/project/module/get/name")
+    public BaseResponse projectModuleGetName(
+            @RequestParam String projectName,
+            @RequestParam String childName,
+            HttpServletRequest request
+    ) {
+        return projectService.projectModuleGetName(projectName, childName, request);
+    }
+
 }

src/main/java/com/jsl/oa/mapper/ProjectMapper.java

@@ -159,4 +159,12 @@ public interface ProjectMapper {
     List<ProjectDO> getByLikeName(String name);
 
 
+    @Select("select * from organize_oa.oa_project_child where project_id = "
+            + "(select id from organize_oa.oa_project where name =#{name})")
+    List<ProjectChildDO> getChildByLikeName(String name);
+
+    @Select("select * from organize_oa.oa_project_modules where project_child_id = "
+            + "(select id from organize_oa.oa_project_child where name =#{childName} "
+            + "and project_id = (select id from organize_oa.oa_project where name =#{projectName}))")
+    List<ProjectModuleDO> getModuleByName(String projectName, String childName);
 }

src/main/java/com/jsl/oa/services/ProjectService.java

@@ -72,4 +72,8 @@ public interface ProjectService {
     BaseResponse projectGetName(String name, HttpServletRequest request);
 
     BaseResponse projectModuleAdd(HttpServletRequest request, ProjectModuleAddVO projectModuleAddVO);
+
+    BaseResponse projectChildGetName(String name, HttpServletRequest request);
+
+    BaseResponse projectModuleGetName(String projectName, String childName, HttpServletRequest request);
 }

src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java

@@ -12,6 +12,7 @@ import com.jsl.oa.dao.RoleDAO;
 import com.jsl.oa.dao.UserDAO;
 import com.jsl.oa.mapper.ProjectMapper;
 import com.jsl.oa.mapper.UserMapper;
+import com.jsl.oa.model.dodata.ProjectChildDO;
 import com.jsl.oa.model.dodata.ProjectDO;
 import com.jsl.oa.model.dodata.ProjectModuleDO;
 import com.jsl.oa.model.dodata.UserDO;
@@ -241,6 +242,7 @@ public class ProjectServiceImpl implements ProjectService {
         for (ProjectDO projectDO : projectDOList) {
             ReturnGetVO returnGetVO = new ReturnGetVO();
             Processing.copyProperties(projectDO, returnGetVO);
+            returnGetVOList.add(returnGetVO);
         }
         return ResultUtil.success(returnGetVOList);
     }
@@ -263,6 +265,31 @@ public class ProjectServiceImpl implements ProjectService {
         return ResultUtil.success("添加成功");
     }
 
+    @Override
+    public BaseResponse projectChildGetName(String name, HttpServletRequest request) {
+
+        List<ProjectChildDO> projectChildDOList = projectMapper.getChildByLikeName(name);
+        List<ReturnGetVO> returnGetVOList = new ArrayList<>();
+        for (ProjectChildDO projectChildDO : projectChildDOList) {
+            ReturnGetVO returnGetVO = new ReturnGetVO();
+            Processing.copyProperties(projectChildDO, returnGetVO);
+            returnGetVOList.add(returnGetVO);
+        }
+        return ResultUtil.success(returnGetVOList);
+    }
+
+    @Override
+    public BaseResponse projectModuleGetName(String projectName, String childName, HttpServletRequest request) {
+        List<ProjectModuleDO> projectModuleDOList = projectMapper.getModuleByName(projectName, childName);
+        List<ReturnGetVO> returnGetVOList = new ArrayList<>();
+        for (ProjectModuleDO projectModuleDO : projectModuleDOList) {
+            ReturnGetVO returnGetVO = new ReturnGetVO();
+            Processing.copyProperties(projectModuleDO, returnGetVO);
+            returnGetVOList.add(returnGetVO);
+        }
+        return ResultUtil.success(returnGetVOList);
+    }
+
     @Override
     public BaseResponse getModuleById(Integer id) {
         ProjectModuleDO projectWorkSimpleVO = projectMapper.getModuleById(id);