Merge remote-tracking branch 'origin/feature' into feature

src/main/java/com/jsl/oa/controllers/ProjectController.java

@@ -48,9 +48,10 @@ public class ProjectController {
     @GetMapping("/project/get")
     public BaseResponse projectGet(@RequestParam(required = false) Integer listAll,
                                    @RequestParam(required = false) List<String> tags,
+                                   @RequestParam(required = false) Integer isFinish,
                                    HttpServletRequest request) {
         log.info("请求接口[GET]: /project/get");
-        return projectService.get(listAll,request,tags);
+        return projectService.get(listAll,request,tags,isFinish);
     }
 
     /**

src/main/java/com/jsl/oa/dao/ProjectDAO.java

@@ -105,9 +105,12 @@ public class ProjectDAO {
         return projectMapper.setProjectShow(setProjectShow);
     }
 
-    public List<ProjectDO> get(Long userId,Integer listAll,List<String> tags) {
+    public List<ProjectDO> get(Long userId,Integer listAll,List<String> tags,Integer isFinish) {
         log.info("\t> 执行 DAO 层 ProjectDAO.get 方法");
         log.info("\t\t> 从 MySQL 获取数据");
+        if(isFinish != null){
+            return projectMapper.getByIsfinish(isFinish);
+        }
         if(tags != null && !tags.isEmpty()){
             return projectMapper.getByTags(tags);
         }

src/main/java/com/jsl/oa/mapper/ProjectMapper.java

@@ -43,12 +43,15 @@ public interface ProjectMapper {
 
     //@Select("select * from organize_oa.oa_project where json_extract(tags,'$.tags')" +
             //"like concat('%',#{tags},'%')")
+    @Select("select * from organize_oa.oa_project where is_finish=#{isFinish} and is_delete=false")
+    List<ProjectDO>getByIsfinish(Integer isFinish);
+
     List<ProjectDO>getByTags(List<String> tags);
 
     @Select("select * from organize_oa.oa_project where is_delete=false and status =1")
     List<ProjectDO> get(Long userId);
 
-    @Select("select * from organize_oa.oa_project where status =1")
+    @Select("select * from organize_oa.oa_project where status =1 and status=1")
     List<ProjectDO> get1(Long userId);
 
     @Select("select * from organize_oa.oa_project where name=#{name}")

src/main/java/com/jsl/oa/services/ProjectService.java

@@ -5,7 +5,6 @@ import com.jsl.oa.model.voData.ProjectCuttingEditVO;
 import com.jsl.oa.model.voData.ProjectInfoVO;
 import com.jsl.oa.model.voData.business.info.ProjectShowVO;
 import com.jsl.oa.utils.BaseResponse;
-import org.apache.catalina.LifecycleState;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -27,7 +26,7 @@ public interface ProjectService {
 
     BaseResponse editHeader(HttpServletRequest request, ProjectShowVO projectShowVO, Integer id);
 
-    BaseResponse get(Integer listAll, HttpServletRequest request, List<String> tags);
+    BaseResponse get(Integer listAll, HttpServletRequest request, List<String> tags, Integer isFinish);
 
     BaseResponse getByName(String name);
 

src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java

@@ -2,7 +2,6 @@ package com.jsl.oa.services.impl;
 
 import com.jsl.oa.annotations.CheckUserHasPermission;
 import com.jsl.oa.dao.ProjectDAO;
-import com.jsl.oa.dao.RoleDAO;
 import com.jsl.oa.dao.UserDAO;
 import com.jsl.oa.mapper.RoleMapper;
 import com.jsl.oa.model.doData.ProjectCuttingDO;
@@ -22,6 +21,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
 import java.sql.Timestamp;
@@ -184,22 +184,27 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     @Override
-    public BaseResponse get(Integer listAll,HttpServletRequest request,List<String> tags) {
+    public BaseResponse get(Integer listAll, HttpServletRequest request, List<String> tags, Integer isFinish) {
         log.info("\t> 执行 Service 层 ProjectService.get 方法");
         //获取用户
         Long userId= Processing.getAuthHeaderToUserId(request);
+        //根据状态查询
+        if(isFinish != null){
+            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);
+            List<ProjectDO> projectDOList = projectDAO.get(userId,listAll,tags,isFinish);
             return ResultUtil.success(projectDOList);
         }
 
         //判断是否是老师(项目负责人)
-        if(listAll != null && Processing.checkUserIsAdmin(request,roleMapper)){
+        if(listAll != null && Processing.checkUserIsTeacher(request,roleMapper)){
-            List<ProjectDO> projectDOList = projectDAO.get(userId,listAll,tags);
+            List<ProjectDO> projectDOList = projectDAO.get(userId,listAll,tags,isFinish);
             return ResultUtil.success(projectDOList);
         }else {
-            List<ProjectDO> projectDOList = projectDAO.get(userId,0,tags);
+            List<ProjectDO> projectDOList = projectDAO.get(userId,0,tags,isFinish);
             return ResultUtil.success(projectDOList);
         }
 

src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml

@@ -48,8 +48,10 @@
     </update>
 
     <select id="getByTags" resultType="com.jsl.oa.model.doData.ProjectDO">
-        select * from organize_oa.oa_project where json_extract(tags,'$.tags')like concat
+        select * from organize_oa.oa_project where
-        <foreach collection="tags" item="tag" separator=",'%'" open="('%'," close=",'%')">
+        <foreach collection="tags" item="tag" separator=",'%') and json_extract(tags,'$.tags')like concat('%',"
+                 open="json_extract(tags,'$.tags')like concat('%',"
+                 close=",'%') and is_delete=false">
             #{tag}
         </foreach>
     </select>