From c9e437b5a16df5c6c3cb33f4460b50f5ee9ff295 Mon Sep 17 00:00:00 2001 From: shwn Date: Sat, 8 Feb 2025 16:07:56 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=82=A0=EC=A7=9C=20=ED=95=84=ED=84=B0?= =?UTF-8?q?=EB=A7=81=20=EB=A1=9C=EC=A7=81=20=EB=B0=8F=20=EC=A0=95=EB=A0=AC?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../janghakmoney/scholarship/ScholarshipRepository.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/janghakmoney/scholarship/ScholarshipRepository.java b/src/main/java/com/example/janghakmoney/scholarship/ScholarshipRepository.java index a36b44c..285d21d 100644 --- a/src/main/java/com/example/janghakmoney/scholarship/ScholarshipRepository.java +++ b/src/main/java/com/example/janghakmoney/scholarship/ScholarshipRepository.java @@ -55,9 +55,12 @@ List findByScholarshipType( // 지원유형 조건 "((s.type = 'TUITION' AND :hasFullTuition = false) " + "OR (s.type = 'LIVING_DUPLICATE') " + - "OR (s.type = 'LIVING_NO_DUPLICATE' AND :hasScholarship = false)) AND " + + "OR (s.type = 'LIVING_NO_DUPLICATE' AND :hasScholarship = false)) AND" + // 마감일 조건 - "(s.applicationEndDate >= CURRENT_DATE - INTERVAL '4' MONTH)") + "(s.applicationEndDate >= CURRENT_DATE - 120)" + + "ORDER BY s.applicationEndDate DESC") + + List findPossibleScholarships( @Param("userRegionId") Integer userRegionId, @Param("userUniversityId") Integer userUniversityId,