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} +