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

@@ -37,26 +37,6 @@ public class ProjectController {
         return projectService.getHeader(id);
     }
 
-    /**
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping("/project/get/id")
-    public BaseResponse projectGetById(@RequestParam Integer id){
-        return projectService.getById(id);
-    }
-
-    /**
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping("/project/getwork/id")
-    public BaseResponse projectWorkGetById(@RequestParam Integer id){
-        return projectService.getWorkById(id);
-    }
-
     /**
      * 游客获取项目
      *

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

@@ -3,7 +3,6 @@ package com.jsl.oa.mapper;
 import com.jsl.oa.model.doData.ProjectCuttingDO;
 import com.jsl.oa.model.doData.ProjectDO;
 import com.jsl.oa.model.doData.ProjectUserDO;
-import com.jsl.oa.model.doData.ProjectWorkDO;
 import com.jsl.oa.model.voData.ProjectInfoVO;
 import com.jsl.oa.model.voData.ProjectWorkVO;
 import org.apache.ibatis.annotations.*;
@@ -31,9 +30,6 @@ public interface ProjectMapper {
     @Select("select * from organize_oa.oa_project where id=#{id}")
     ProjectDO getProjectById(Long id);
 
-    @Select("select * from organize_oa.oa_project where id=#{id}")
-    ProjectDO tgetProjectById(Integer id);
-
     @Select("select * from organize_oa.oa_project_work where principal_id=#{uid}")
             //"(select id from organize_oa.oa_project_work where id in)")
     List<ProjectCuttingDO> projectGetUserInCutting(Long uid);
@@ -107,7 +103,4 @@ public interface ProjectMapper {
     List<ProjectDO> tgetByIsfinish(List<Integer> isFinish);
 
     List<ProjectDO> tgetBytags(List<String> tags,List<Integer> isFinish);
-
-   @Select("select * from organize_oa.oa_project_work where id=#{id}")
-   ProjectWorkDO getWorkById(Integer id);
 }

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

@@ -43,8 +43,4 @@ public interface ProjectService {
     BaseResponse tget(Integer id, List<String> tags, List<Integer> isFinish);
 
     BaseResponse projectFileGet(HttpServletRequest request, Long projectId);
-
-    BaseResponse getById(Integer id);
-
-    BaseResponse getWorkById(Integer id);
 }

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

@@ -5,11 +5,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jsl.oa.annotations.CheckUserHasPermission;
 import com.jsl.oa.dao.ProjectDAO;
 import com.jsl.oa.dao.UserDAO;
-import com.jsl.oa.mapper.ProjectMapper;
 import com.jsl.oa.mapper.RoleMapper;
 import com.jsl.oa.model.doData.ProjectCuttingDO;
 import com.jsl.oa.model.doData.ProjectDO;
-import com.jsl.oa.model.doData.ProjectWorkDO;
 import com.jsl.oa.model.doData.UserDO;
 import com.jsl.oa.model.doData.info.ProjectShowDO;
 import com.jsl.oa.model.voData.*;
@@ -44,7 +42,6 @@ import java.util.List;
 @RequiredArgsConstructor
 public class ProjectServiceImpl implements ProjectService {
 
-    private final ProjectMapper projectMapper;
     private final RoleMapper roleMapper;
     private final ProjectDAO projectDAO;
     private final UserDAO userDAO;
@@ -66,12 +63,6 @@ public class ProjectServiceImpl implements ProjectService {
     @Override
     public BaseResponse tget(Integer id, List<String> tags, List<Integer> isFinish) {
         log.info("\t> 执行 Service 层 ProjectService.tget 方法");
-        //根据id查询
-        if (id != null){
-            ProjectDO projectDO = projectMapper.tgetProjectById(id);
-            return ResultUtil.success(projectDO);
-        }
-
         //根据标签查询
         if (tags != null && !tags.isEmpty()) {
             List<ProjectDO> projectDOList = projectDAO.tget(id,isFinish,tags);
@@ -113,18 +104,6 @@ public class ProjectServiceImpl implements ProjectService {
 
     }
 
-    @Override
-    public BaseResponse getById(Integer id) {
-        ProjectDO projectDO = projectMapper.tgetProjectById(id);
-        return ResultUtil.success(projectDO);
-    }
-
-    @Override
-    public BaseResponse getWorkById(Integer id) {
-        ProjectWorkDO projectWorkDO = projectMapper.getWorkById(id);
-        return ResultUtil.success(projectWorkDO);
-    }
-
     @Override
     public BaseResponse projectEdit(HttpServletRequest request, @NotNull ProjectEditVO projectEdit, Long projectId) {
         log.info("\t> 执行 Service 层 ProjectService.projectEdit 方法");