From 5075426bcf707c3589684d527e73d3f956c5419b Mon Sep 17 00:00:00 2001
From: 176yunxuan <362612387@qq.com~>
Date: Fri, 15 Mar 2024 17:07:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/jsl/oa/dao/ProjectDAO.java  | 26 +++++++----
 .../java/com/jsl/oa/mapper/ProjectMapper.java |  6 +--
 .../oa/services/impl/ProjectServiceImpl.java  | 34 +++++++++------
 .../com/jsl/oa/mapper/ProjectMapper.xml       | 43 ++++++++++++++-----
 4 files changed, 73 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java
index af26e32..683e55a 100644
--- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java
+++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java
@@ -128,12 +128,16 @@ public class ProjectDAO {
     public List<ProjectDO> get(Long userId,Integer listAll,List<String> tags,List<Integer> isFinish) {
         log.info("\t> 执行 DAO 层 ProjectDAO.get 方法");
         log.info("\t\t> 从 MySQL 获取数据");
+        if(tags != null && !tags.isEmpty()){
+            log.info("tags");
+            return projectMapper.getByTags(userId,tags,isFinish);
+        }
+
         if(isFinish != null && !isFinish.isEmpty()){
+            log.info("finish");
             return projectMapper.getByIsfinish(userId,isFinish);
         }
-        if(tags != null && !tags.isEmpty()){
-            return projectMapper.getByTags(userId,tags);
-        }
+
         if(listAll == 0) {
             return projectMapper.get(userId);
         }else {
@@ -144,12 +148,14 @@ public class ProjectDAO {
     public List<ProjectDO> workget(Long userId, Integer listAll, List<String> tags, List<Integer> isFinish, Integer is) {
         log.info("\t> 执行 DAO 层 ProjectDAO.workget 方法");
         log.info("\t\t> 从 MySQL 获取数据");
+        if(tags != null && !tags.isEmpty()){
+            return projectMapper.workgetByTags(userId,tags,is,isFinish);
+        }
+
         if(isFinish != null && !isFinish.isEmpty()){
             return projectMapper.workgetByIsfinish(userId,isFinish,is);
         }
-        if(tags != null && !tags.isEmpty()){
-            return projectMapper.workgetByTags(userId,tags,is);
-        }
+
         if(listAll == 0) {
             return projectMapper.workget(userId,is);
         }else {
@@ -220,12 +226,14 @@ public class ProjectDAO {
 
     public List<ProjectDO> tget(Integer id,List<Integer> isFinish,List<String> tags) {
         log.info("DAO层");
+
+        if(tags != null && !tags.isEmpty()){
+            return projectMapper.tgetBytags(tags,isFinish);
+        }
+
         if(isFinish != null && !isFinish.isEmpty()){
             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 8c15166..ee280a9 100644
--- a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java
+++ b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java
@@ -52,7 +52,7 @@ public interface ProjectMapper {
     //@Select("select * from organize_oa.oa_project where is_finish=#{isFinish} and is_delete=false and principal_id=#{userId}")
     List<ProjectDO>getByIsfinish(Long userId,List<Integer> isFinish);
 
-    List<ProjectDO>getByTags(Long userId,List<String> tags);
+    List<ProjectDO>getByTags(Long userId,List<String> tags,List<Integer> isFinish);
 
     @Select("select * from organize_oa.oa_project where is_delete=false and status=1 and principal_id=#{userId}")
     List<ProjectDO> get(Long userId);
@@ -88,7 +88,7 @@ public interface ProjectMapper {
     //@Select("select * from organize_oa.oa_project_work where is_finish=#{isFinish} and is_delete=false and principal_id =#{userId}")
     List<ProjectDO> workgetByIsfinish(Long userId, List<Integer> isFinish, Integer is);
 
-    List<ProjectDO> workgetByTags(Long userId, List<String> tags, Integer is);
+    List<ProjectDO> workgetByTags(Long userId, List<String> tags, Integer is,List<Integer> isFinish);
 
     //@Select("select * from organize_oa.oa_project where id in(select project_id from " +
             //"organize_oa.oa_project_work where is_delete=false and status =1 and principal_id=#{userId} and type=0)")
@@ -102,5 +102,5 @@ public interface ProjectMapper {
 
     List<ProjectDO> tgetByIsfinish(List<Integer> isFinish);
 
-    List<ProjectDO> tgetBytags(List<String> tags);
+    List<ProjectDO> tgetBytags(List<String> tags,List<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 6c976b7..f16e40b 100644
--- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
@@ -64,13 +64,14 @@ public class ProjectServiceImpl implements ProjectService {
     @Override
     public BaseResponse tget(Integer id, List<String> tags, List<Integer> isFinish) {
         log.info("\t> 执行 Service 层 ProjectService.tget 方法");
-        //根据状态查询
-        if (isFinish != null && !isFinish.isEmpty()) {
+        //根据标签查询
+        if (tags != null && !tags.isEmpty()) {
             List<ProjectDO> projectDOList = projectDAO.tget(id,isFinish,tags);
             return ResultUtil.success(projectDOList);
         }
-        //根据标签查询
-        if (tags != null && !tags.isEmpty()) {
+
+        //根据状态查询
+        if (isFinish != null && !isFinish.isEmpty()) {
             List<ProjectDO> projectDOList = projectDAO.tget(id,isFinish,tags);
             return ResultUtil.success(projectDOList);
         }
@@ -245,17 +246,19 @@ public class ProjectServiceImpl implements ProjectService {
 
         //获取用户
         Long userId = Processing.getAuthHeaderToUserId(request);
-        //根据状态查询
-        if (isFinish != null && !isFinish.isEmpty()) {
-            List<ProjectDO> projectDOList = projectDAO.get(userId, listAll, tags, isFinish);
-            return ResultUtil.success(projectDOList);
-        }
         //根据标签查询
         if (tags != null && !tags.isEmpty()) {
             List<ProjectDO> projectDOList = projectDAO.get(userId, listAll, tags, isFinish);
             return ResultUtil.success(projectDOList);
         }
 
+        //根据状态查询
+        if (isFinish != null && !isFinish.isEmpty()) {
+            List<ProjectDO> projectDOList = projectDAO.get(userId, listAll, tags, isFinish);
+            return ResultUtil.success(projectDOList);
+        }
+
+
         //判断是否是老师(项目负责人)
         if (listAll != null && Processing.checkUserIsTeacher(request, roleMapper)) {
             List<ProjectDO> projectDOList = projectDAO.get(userId, listAll, tags, isFinish);
@@ -274,17 +277,20 @@ public class ProjectServiceImpl implements ProjectService {
 
         //获取用户
         Long userId = Processing.getAuthHeaderToUserId(request);
-        //根据状态查询
-        if (isFinish != null && !isFinish.isEmpty()) {
-            List<ProjectDO> projectDOList = projectDAO.workget(userId, listAll, tags, isFinish,is);
-            return ResultUtil.success(projectDOList);
-        }
+
         //根据标签查询
         if (tags != null && !tags.isEmpty()) {
             List<ProjectDO> projectDOList = projectDAO.workget(userId, listAll, tags, isFinish,is);
             return ResultUtil.success(projectDOList);
         }
 
+        //根据状态查询
+        if (isFinish != null && !isFinish.isEmpty()) {
+            List<ProjectDO> projectDOList = projectDAO.workget(userId, listAll, tags, isFinish,is);
+            return ResultUtil.success(projectDOList);
+        }
+
+
         //判断是否是老师(项目负责人)
         if (listAll != null && Processing.checkUserIsTeacher(request, roleMapper)) {
             List<ProjectDO> projectDOList = projectDAO.workget(userId, listAll, tags, isFinish,is);
diff --git a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml
index 92dccd5..72c50cf 100644
--- a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml
+++ b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml
@@ -48,12 +48,22 @@
     </update>
 
     <select id="getByTags" resultType="com.jsl.oa.model.doData.ProjectDO">
-        select * from organize_oa.oa_project where is_delete=false and principal_id=#{userId} and status=1 and
-        <foreach collection="tags" item="tag" separator=",'%') or json_extract(tags,'$.tags')like concat('%',"
-                 open="json_extract(tags,'$.tags')like concat('%',"
-                 close=",'%')">
-            #{tag}
-        </foreach>
+        <if test="tags != null">
+            select * from organize_oa.oa_project where is_delete=false and principal_id=#{userId} and status=1 and
+
+            <if test="isFinish != null and isFinish.size() > 0">
+                is_finish in
+                <foreach collection="isFinish" item="Finish" separator="," open="(" close=") and">
+                    #{Finish}
+                </foreach>
+            </if>
+
+            <foreach collection="tags" item="tag" separator=",'%') or json_extract(tags,'$.tags')like concat('%',"
+                     open="(json_extract(tags,'$.tags')like concat('%',"
+                     close=",'%'))">
+                #{tag}
+            </foreach>
+        </if>
     </select>
 
     <select id="getByIsfinish" resultType="com.jsl.oa.model.doData.ProjectDO">
@@ -71,8 +81,14 @@
             (principal_id = #{userId} and is_delete=false) or
         </if>
         id in(select project_id from organize_oa.oa_project_work
-        where is_delete=false and (principal_id=#{userId} ) and project_id in(
-            select id from organize_oa.oa_project where
+        where is_delete=false and (principal_id=#{userId} ) and
+        <if test="isFinish != null and isFinish.size() > 0">
+            is_finish in
+            <foreach collection="isFinish" item="Finish" separator="," open="(" close=") and">
+                #{Finish}
+            </foreach>
+        </if>
+              project_id in(select id from organize_oa.oa_project where
         <foreach collection="tags" item="tag" separator=",'%') or json_extract(tags,'$.tags')like concat('%',"
                  open="json_extract(tags,'$.tags')like concat('%',"
                  close=",'%')))">
@@ -115,9 +131,16 @@
 
     <select id="tgetBytags" resultType="com.jsl.oa.model.doData.ProjectDO">
         select * from organize_oa.oa_project where is_delete=false and status=1 and
+       <if test="isFinish != null and isFinish.size() > 0">
+           is_finish in
+           <foreach collection="isFinish" item="Finish" separator="," open="(" close=") and">
+               #{Finish}
+           </foreach>
+       </if>
+
         <foreach collection="tags" item="tag" separator=",'%') or json_extract(tags,'$.tags')like concat('%',"
-                 open="json_extract(tags,'$.tags')like concat('%',"
-                 close=",'%')">
+                 open="(json_extract(tags,'$.tags')like concat('%',"
+                 close=",'%'))">
             #{tag}
         </foreach>
     </select>