From ec2a30075ded6eeb2d17c05af910665716f0e500 Mon Sep 17 00:00:00 2001
From: xiangZr-hhh <“2774915446@qq.com”>
Date: Sat, 20 Apr 2024 02:16:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根据项目id查询名下所有子系统
根据子系统id查询名下所有子模块
---
 .../jsl/oa/controllers/ProjectController.java | 24 +++++++++++++++++
 .../java/com/jsl/oa/mapper/ProjectMapper.java |  8 ++++++
 .../com/jsl/oa/services/ProjectService.java   |  6 +++++
 .../oa/services/impl/ProjectServiceImpl.java  | 27 +++++++++++++++++++
 4 files changed, 65 insertions(+)

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<ProjectChildDO> getAllChildByProjectId(Integer id);
+
+    @Select("select * from organize_oa.oa_project_modules where project_child_id = #{id} "
+            + "and is_delete = 0")
+    List<ProjectModuleDO> 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<ProjectChildDO> projectChildDOList = projectMapper.getAllChildByProjectId(id);
+
+        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);
@@ -290,6 +305,18 @@ public class ProjectServiceImpl implements ProjectService {
         return ResultUtil.success(returnGetVOList);
     }
 
+    @Override
+    public BaseResponse projectModuleGetById(Integer id, HttpServletRequest request) {
+        List<ProjectModuleDO> projectModuleDOList = projectMapper.getModuleByChildId(id);
+        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);