diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java index 6a9f935e..c8d1d50d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java @@ -45,4 +45,8 @@ public class GetHouseholdsStatusCmd { // 로그인한 유저 실사 지역 private String userRegionMainCode; + public GetHouseholdsStatusCmd(String searchRegionMainCode) { + this.regionMainCode = searchRegionMainCode; + } + } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/HouseholdDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/HouseholdDto.java new file mode 100644 index 00000000..d57de63a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/HouseholdDto.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.researcher.persistence.model; + +import lombok.Data; + + +@Data +public class HouseholdDto { + private Long seq; + private String id; + private String name; + private String phone; + private String regionMainCodeName; + private Integer householdCount; + private String accountDisabledFlag; +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java index 4c0a1b15..e30c31c6 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java @@ -1,8 +1,10 @@ package app.module.admin.usecase.researcher.service; +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; import app.module.admin.usecase.researcher.persistence.model.ResearchersDto; import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto; import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto; +import app.module.admin.usecase.researcher.web.model.MappingHouseholdListUIReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; import org.springframework.data.domain.Page; @@ -16,4 +18,5 @@ public interface ResearcherService { Page mappingHouseholdList(ResearchersDetailReqVO reqVO); Page visitHouseholdList(ResearchersDetailReqVO reqVO); Integer visitHouseholdDelete(List selectIds); + Page reginMainCodeHouseholdList(MappingHouseholdListUIReqVO reqVO); } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java index 1d0edd71..5ce287c4 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java @@ -1,10 +1,14 @@ package app.module.admin.usecase.researcher.service; +import app.module.admin.usecase.household.getHouseholdsStatus.adapters.persistence.GetHouseholdsStatusMapper; +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd; import app.module.admin.usecase.researcher.persistence.ResearcherMapper; import app.module.admin.usecase.researcher.persistence.model.ResearchersDto; import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto; import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto; +import app.module.admin.usecase.researcher.web.model.MappingHouseholdListUIReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; import app.module.core.config.application.util.CommonUtil; @@ -23,6 +27,7 @@ import java.util.List; @RequiredArgsConstructor public class ResearcherServiceImpl implements ResearcherService { private final ResearcherMapper researcherMapper; + private final GetHouseholdsStatusMapper householdsStatusMapper; @Override public Page list(ResearchersListReqVO reqVO) { @@ -60,4 +65,15 @@ public class ResearcherServiceImpl implements ResearcherService { String deletedBy = CommonUtil.getLoginUsername(); return researcherMapper.visitHouseholdDelete(selectIds,deletedBy); } + + @Override + public Page reginMainCodeHouseholdList(MappingHouseholdListUIReqVO reqVO) { + Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize()); + + List householdsStatus = householdsStatusMapper.getHouseholdsStatus(pageable, + new GetHouseholdsStatusCmd(reqVO.getSearchRegionMainCode())); + + return new PageImpl<>(householdsStatus, pageable, + householdsStatus.isEmpty() ? 0 : householdsStatus.get(0).getTotal()); + } } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java b/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java index cc6b6af3..1e5fda6b 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java @@ -2,9 +2,7 @@ package app.module.admin.usecase.researcher.web; import app.module.admin.config.application.util.DateUiUtil; import app.module.admin.usecase.researcher.service.ResearcherService; -import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO; -import app.module.admin.usecase.researcher.web.model.ResearchersDetailUIReqVO; -import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; +import app.module.admin.usecase.researcher.web.model.*; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -12,7 +10,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; -import app.module.admin.usecase.researcher.web.model.GetResearchersUIReqVO; import java.util.List; @@ -48,6 +45,13 @@ class ResearcherController { return ResponseEntity.status(HttpStatus.OK).body(researcherService.mappingHouseholdList(reqVO)); } + @GetMapping(path = "/mappingHousehold/list") + String mappingHouseholdResearcherList(Model model, @ModelAttribute("reqVO") MappingHouseholdListUIReqVO reqVO) { + model.addAttribute("householdDto", researcherService.reginMainCodeHouseholdList(reqVO)); + return "researcher/mappingHouserhold"; + } + + @GetMapping(path = "/visitHouseholdList") ResponseEntity visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) { return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdList(reqVO)); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListUIReqVO.java new file mode 100644 index 00000000..279a5ca4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListUIReqVO.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.researcher.web.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class MappingHouseholdListUIReqVO { + private Integer page; + private Integer size; + private String searchRegionMainCode; + + public Integer getPage() { + // 요청 페이지 넘버 - 초기값 `0` + return page != null ? page : 0; + } + + public Integer getSize() { + // 페이지 당 아이템 수 - 초기값 `10` + return size != null ? size : 10; + } +} diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 0715f255..0d580b55 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -4,7 +4,6 @@
- @@ -63,14 +62,17 @@ TOTAL. + - -
@@ -339,8 +341,6 @@ '/researcher/visitHousehold/remove', JSON.stringify(selectIds), function (response) { - console.log("여기있어요"); - console.log(response); if(response > 0){ alert('선택한 임가정보가 삭제되었습니다.'); getHouseholdVisitList(document.householdReqForm.page.value);