From e19630f9cc1d34f6dd76b7dccb5bf621ef0c9c0c Mon Sep 17 00:00:00 2001 From: 176yunxuan <362612387@qq.com~> Date: Tue, 12 Mar 2024 12:43:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E5=AE=A2=E6=9F=A5=E8=AF=A2=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsl/oa/controllers/ProjectController.java | 6 +++-- src/main/java/com/jsl/oa/dao/ProjectDAO.java | 9 ++++++-- .../java/com/jsl/oa/mapper/ProjectMapper.java | 6 +++++ .../com/jsl/oa/services/ProjectService.java | 2 +- .../oa/services/impl/ProjectServiceImpl.java | 16 +++++++++++-- .../com/jsl/oa/mapper/ProjectMapper.xml | 23 ++++++++++++------- 6 files changed, 47 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/jsl/oa/controllers/ProjectController.java b/src/main/java/com/jsl/oa/controllers/ProjectController.java index f738fa2..43a9bdd 100755 --- a/src/main/java/com/jsl/oa/controllers/ProjectController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectController.java @@ -46,9 +46,11 @@ public class ProjectController { * @return */ @GetMapping("/project/get/custom") - public BaseResponse projectGetCustom(@RequestParam(required = false) Integer id){ + public BaseResponse projectGetCustom(@RequestParam(required = false) Integer id, + @RequestParam(required = false) List tags, + @RequestParam(required = false) Integer isFinish){ log.info("请求接口[GET]: /project/all/get"); - return projectService.tget(id); + return projectService.tget(id,tags,isFinish); } diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java index eaf1743..e9fc2c5 100644 --- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java +++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java @@ -9,7 +9,6 @@ import com.jsl.oa.model.doData.ProjectWorkDO; import com.jsl.oa.model.doData.info.ProjectShowDO; import com.jsl.oa.model.voData.ProjectInfoVO; import com.jsl.oa.model.voData.ProjectWorkVO; -import com.jsl.oa.utils.BaseResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; @@ -199,8 +198,14 @@ public class ProjectDAO { } - public List tget(Integer id) { + public List tget(Integer id, List tags, Integer isFinish) { log.info("DAO层"); + if(isFinish != null){ + return projectMapper.tgetByIsfinish(isFinish); + } + if(tags != null && !tags.isEmpty()){ + return projectMapper.tgetByTags(tags); + } return projectMapper.tget(id); } } diff --git a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java index 723c22f..fca131a 100644 --- a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java +++ b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java @@ -98,4 +98,10 @@ public interface ProjectMapper { //@Select("select * from organize_oa.oa_project where is_delete=false and status=1") List tget(Integer id); + + @Select("select * from organize_oa.oa_project where is_finish=#{isFinish} and is_delete=false") + List tgetByIsfinish(Integer isFinish); + + + List tgetByTags(List tags); } diff --git a/src/main/java/com/jsl/oa/services/ProjectService.java b/src/main/java/com/jsl/oa/services/ProjectService.java index 0f270fe..b3d66d2 100644 --- a/src/main/java/com/jsl/oa/services/ProjectService.java +++ b/src/main/java/com/jsl/oa/services/ProjectService.java @@ -43,5 +43,5 @@ public interface ProjectService { BaseResponse projecWorktAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO); - BaseResponse tget(Integer id); + BaseResponse tget(Integer id, List tags, Integer isFinish); } 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 ed732f2..51e485b 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -65,9 +65,21 @@ public class ProjectServiceImpl implements ProjectService { } @Override - public BaseResponse tget(Integer id) { + public BaseResponse tget(Integer id, List tags, Integer isFinish) { log.info("\t> 执行 Service 层 ProjectService.tget 方法"); - List projectDOList = projectDAO.tget(id); + + //根据状态查询 + if(isFinish != null){ + List projectDOList = projectDAO.tget(id,tags,isFinish); + return ResultUtil.success(projectDOList); + } + //根据标签查询 + if(tags != null && !tags.isEmpty()){ + List projectDOList = projectDAO.tget(id,tags,isFinish); + return ResultUtil.success(projectDOList); + } + + List projectDOList = projectDAO.tget(id,tags,isFinish); return ResultUtil.success(projectDOList); } diff --git a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml index cc1e00c..84157ec 100644 --- a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml +++ b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml @@ -48,22 +48,21 @@ + + + \ No newline at end of file