diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java index 75d69df..aa04695 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java @@ -204,10 +204,13 @@ public class ProcessController { return processService.getProjectRepaidAmount(id); } + /** + * 搜索符合条件的项目,供给选择 + */ @ResponseBody @GetMapping("/projects") public List> query(@RequestParam String q) { - return projectRepository.findByProjectNoOrName(q) + return projectRepository.findBudgetPassedProjects(q) .stream() .map(project -> { HashMap map = new HashMap<>(); diff --git a/src/main/java/cn/palmte/work/model/ProjectRepository.java b/src/main/java/cn/palmte/work/model/ProjectRepository.java index 76e21a4..1fbd56b 100644 --- a/src/main/java/cn/palmte/work/model/ProjectRepository.java +++ b/src/main/java/cn/palmte/work/model/ProjectRepository.java @@ -40,8 +40,12 @@ public interface ProjectRepository extends JpaRepository { @Query(value = "update project set approve_id=?, approve_name=? where approve_id = ?", nativeQuery = true) int batchUpdateApprove(int targetAdminId, String targetAdminName, int adminId); - @Query(value = "select * from project where `project_no` like concat('%', :q, '%') or `name` like concat('%', :q, '%')", + /** + * 查询预算通过的项目 + */ + @Query(value = "select * from project where (`status` > 5 or (`status` = 5 and approve_status_budget = 2)) " + + " and (`project_no` like concat('%', :q, '%') or `name` like concat('%', :q, '%'))", nativeQuery = true) - List findByProjectNoOrName(@Param("q") String query); + List findBudgetPassedProjects(@Param("q") String query); }