From 5d2ce5e7f9819223a48177706e54420138f0f78f Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Fri, 4 Jul 2025 09:16:32 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=A1=B0=EC=82=AC=EC=9B=90=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EC=9E=84=EA=B0=80=EB=B0=A9=EB=AC=B8=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=ED=8E=98=EC=9D=B4=EC=A7=95=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adpaters/persistence/ResearcherDao.java | 7 ++--- .../researcher/ports/ResearcherPortIn.java | 2 +- .../researcher/ports/ResearcherPortOut.java | 2 +- .../ports/application/ResearcherService.java | 2 +- .../mappers/researcher/ResearcherMapper.xml | 3 +-- .../templates/researcher/detail.html | 27 +++++-------------- 6 files changed, 13 insertions(+), 30 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java index 384afe87..d2e68579 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java @@ -60,11 +60,8 @@ public class ResearcherDao implements ResearcherPortOut { } @Override - public Page visitHouseholdList(ResearchersDetailReqVO reqVO) { - List result = researcherMapper.visitHouseholdList(reqVO); - Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize()); - long total = researcherMapper.visitHouseholdListCountAll(reqVO); - return new PageImpl<>(result, pageable, total); + public List visitHouseholdList(ResearchersDetailReqVO reqVO) { + return researcherMapper.visitHouseholdList(reqVO); } @Override diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java index 33922633..ca13be09 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java @@ -11,7 +11,7 @@ public interface ResearcherPortIn { Page list(ResearchersListReqVO reqVO); ResearchersDto detail(Integer adminSeq); Page mappingHouseholdList(ResearchersDetailReqVO reqVO); - Page visitHouseholdList(ResearchersDetailReqVO reqVO); + List visitHouseholdList(ResearchersDetailReqVO reqVO); VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO); Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO); ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java index 161a2971..5910816a 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java @@ -11,7 +11,7 @@ public interface ResearcherPortOut { ResearchersDto detail(Integer adminSeq); Page mappingHouseholdList(ResearchersDetailReqVO reqVO); VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO); - Page visitHouseholdList(ResearchersDetailReqVO reqVO); + List visitHouseholdList(ResearchersDetailReqVO reqVO); Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO); ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id); Integer visitHouseholdDelete(List selectIds); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java index d992bc91..68f6dcaa 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java @@ -31,7 +31,7 @@ class ResearcherService implements ResearcherPortIn { } @Override - public Page visitHouseholdList(ResearchersDetailReqVO reqVO){ + public List visitHouseholdList(ResearchersDetailReqVO reqVO){ return portOut.visitHouseholdList(reqVO); } diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index 4846b7f7..31036719 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -129,7 +129,7 @@ rhv.visit_date, rhv.content, rhv.management_type, - case rhv.is_gift_sent when false then '전달완료' when true then '-' end is_gift_sent_flag, + case rhv.is_gift_sent when true then '전달완료' when false then '-' end is_gift_sent_flag, rhv.created_at from household_visit rhv join household h on rhv.household_seq = h.seq @@ -141,7 +141,6 @@ and TO_CHAR(rhv.visit_date ,'YYYYMM')= #{searchMonth} - LIMIT #{size} OFFSET #{page}*#{size} +