From 7d958bfa69c56f8ea189d700bac207d7d30f6faf Mon Sep 17 00:00:00 2001 From: 176yunxuan <362612387@qq.com~> Date: Thu, 18 Apr 2024 22:25:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=94=B3=E8=AF=B7=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=90=8D=E5=AD=97=E6=9F=A5=E8=AF=A2=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=EF=BC=8C=E7=B3=BB=E7=BB=9F=EF=BC=8C=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsl/oa/controllers/ProjectController.java | 32 ++++++++++++++++++- .../java/com/jsl/oa/mapper/ProjectMapper.java | 8 +++++ .../com/jsl/oa/services/ProjectService.java | 4 +++ .../oa/services/impl/ProjectServiceImpl.java | 27 ++++++++++++++++ 4 files changed, 70 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/jsl/oa/controllers/ProjectController.java b/src/main/java/com/jsl/oa/controllers/ProjectController.java index ce89c30..2537b38 100755 --- a/src/main/java/com/jsl/oa/controllers/ProjectController.java +++ b/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); + } + } diff --git a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java index b53e758..510a65b 100644 --- a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java +++ b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java @@ -159,4 +159,12 @@ public interface ProjectMapper { List 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 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 getModuleByName(String projectName, String childName); } diff --git a/src/main/java/com/jsl/oa/services/ProjectService.java b/src/main/java/com/jsl/oa/services/ProjectService.java index ac4ea4f..851edeb 100644 --- a/src/main/java/com/jsl/oa/services/ProjectService.java +++ b/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); } 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 ea53981..00abac7 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/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 projectChildDOList = projectMapper.getChildByLikeName(name); + 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); + 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);