diff --git a/src/main/java/com/jsl/oa/controllers/ProjectController.java b/src/main/java/com/jsl/oa/controllers/ProjectController.java index 4940c2c..776d7e4 100755 --- a/src/main/java/com/jsl/oa/controllers/ProjectController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectController.java @@ -379,6 +379,21 @@ public class ProjectController { return projectService.projectChildGetName(name, request); } + /** + * id查询子系统 + * + * @param id + * @param request + * @return + */ + @GetMapping("/project/child/get/id") + public BaseResponse projectChildById( + @RequestParam Integer id, + HttpServletRequest request + ) { + return projectService.projectChildGetById(id, request); + } + @GetMapping("/project/module/get/name") public BaseResponse projectModuleGetName( @RequestParam String projectName, @@ -388,4 +403,13 @@ public class ProjectController { return projectService.projectModuleGetName(projectName, childName, request); } + + @GetMapping("/project/module/get/id") + public BaseResponse projectModuleGetName( + @RequestParam Integer childId, + HttpServletRequest request + ) { + return projectService.projectModuleGetById(childId, request); + } + } diff --git a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java index a675d3a..576004a 100644 --- a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java +++ b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java @@ -170,4 +170,12 @@ public interface ProjectMapper { void projectModuleUpdate(ProjectModuleDO projectModuleDO); void projectChildEdit(ProjectChildDO projectChildDO); + + @Select("select * from organize_oa.oa_project_child where project_id = #{id} " + + "and is_delete = 0") + List getAllChildByProjectId(Integer id); + + @Select("select * from organize_oa.oa_project_modules where project_child_id = #{id} " + + "and is_delete = 0") + List getModuleByChildId(Integer id); } diff --git a/src/main/java/com/jsl/oa/services/ProjectService.java b/src/main/java/com/jsl/oa/services/ProjectService.java index 851edeb..8122819 100644 --- a/src/main/java/com/jsl/oa/services/ProjectService.java +++ b/src/main/java/com/jsl/oa/services/ProjectService.java @@ -71,9 +71,15 @@ public interface ProjectService { BaseResponse projectGetName(String name, HttpServletRequest request); + + BaseResponse projectModuleAdd(HttpServletRequest request, ProjectModuleAddVO projectModuleAddVO); BaseResponse projectChildGetName(String name, HttpServletRequest request); + BaseResponse projectChildGetById(Integer id, HttpServletRequest request); + BaseResponse projectModuleGetName(String projectName, String childName, HttpServletRequest request); + + BaseResponse projectModuleGetById(Integer id, HttpServletRequest request); } diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java index 00abac7..582a3d8 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -278,6 +278,21 @@ public class ProjectServiceImpl implements ProjectService { return ResultUtil.success(returnGetVOList); } + @Override + public BaseResponse projectChildGetById(Integer id, HttpServletRequest request) { + + List projectChildDOList = projectMapper.getAllChildByProjectId(id); + + List 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 projectModuleDOList = projectMapper.getModuleByName(projectName, childName); @@ -290,6 +305,18 @@ public class ProjectServiceImpl implements ProjectService { return ResultUtil.success(returnGetVOList); } + @Override + public BaseResponse projectModuleGetById(Integer id, HttpServletRequest request) { + List projectModuleDOList = projectMapper.getModuleByChildId(id); + List 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);