diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java index d4ea1c3c..07b59f10 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java @@ -43,7 +43,9 @@ class GetHouseholdsStatusController { reqVO.getResearcherValue(), reqVO.getIsPanel(), reqVO.getUserRole(), - reqVO.getUserRegionMainCode() + reqVO.getUserRegionMainCode(), + null, + null )) ); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java index 005e1729..41edf2dd 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java @@ -27,5 +27,6 @@ public class GetHouseholdsStatus { private Boolean isGiftSent; private String researcherName; private String researcherPhone; + private String view; private Integer total; } 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 c8d1d50d..232eeffd 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 @@ -1,5 +1,6 @@ package app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain; +import app.module.admin.usecase.researcher.web.model.HouseholdSearchReqVO; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -45,8 +46,17 @@ public class GetHouseholdsStatusCmd { // 로그인한 유저 실사 지역 private String userRegionMainCode; - public GetHouseholdsStatusCmd(String searchRegionMainCode) { - this.regionMainCode = searchRegionMainCode; + private Boolean isMapping; + private String viewType; + public GetHouseholdsStatusCmd(HouseholdSearchReqVO reqVO) { + this.ownerField = reqVO.getOwnerField(); + this.ownerValue = reqVO.getOwnerValue(); + this.regionMainCode = reqVO.getRegionMainCode(); + this.regionSubCode = reqVO.getRegionSubCode(); + this.regionDetailCode = reqVO.getRegionDetailCode(); + this.isPanel = reqVO.getIsPanel(); + this.isMapping = reqVO.getIsMapping(); + this.viewType = "popup"; } } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersDto.java index 8b2e032f..6034eed0 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersDto.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersDto.java @@ -9,6 +9,7 @@ public class ResearchersDto { private String id; private String name; private String phone; + private String regionMainCode; 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 e30c31c6..819e4bc7 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 @@ -4,6 +4,7 @@ import app.module.admin.usecase.household.getHouseholdsStatus.ports.application. 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.HouseholdSearchReqVO; 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; @@ -18,5 +19,5 @@ public interface ResearcherService { Page mappingHouseholdList(ResearchersDetailReqVO reqVO); Page visitHouseholdList(ResearchersDetailReqVO reqVO); Integer visitHouseholdDelete(List selectIds); - Page reginMainCodeHouseholdList(MappingHouseholdListUIReqVO reqVO); + Page searchMappingHousehold(HouseholdSearchReqVO 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 5ce287c4..f1b59d5a 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 @@ -8,6 +8,7 @@ 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.HouseholdSearchReqVO; 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; @@ -67,11 +68,11 @@ public class ResearcherServiceImpl implements ResearcherService { } @Override - public Page reginMainCodeHouseholdList(MappingHouseholdListUIReqVO reqVO) { + public Page searchMappingHousehold(HouseholdSearchReqVO reqVO) { Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize()); List householdsStatus = householdsStatusMapper.getHouseholdsStatus(pageable, - new GetHouseholdsStatusCmd(reqVO.getSearchRegionMainCode())); + new GetHouseholdsStatusCmd(reqVO)); 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 1e5fda6b..324061a8 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 @@ -5,6 +5,7 @@ import app.module.admin.usecase.researcher.service.ResearcherService; import app.module.admin.usecase.researcher.web.model.*; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; @@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +@Slf4j @Controller @RequiredArgsConstructor @RequestMapping(path = "/researcher") @@ -37,6 +39,13 @@ class ResearcherController { model.addAttribute("researcherDto", researcherService.detail(adminSeq)); model.addAttribute("monthList", DateUiUtil.getRecentMonths(13)); model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue()); + + //모달용 + // 지역 + model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub")); + // 세부지역 + model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail")); + return "researcher/detail"; } @@ -45,13 +54,6 @@ 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)); @@ -62,5 +64,15 @@ class ResearcherController { return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdDelete(selectIds)); } + @GetMapping("/mappingHousehold/search") + ResponseEntity searchMappingHousehold(HouseholdSearchReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK).body(researcherService.searchMappingHousehold(reqVO)); + } + @PostMapping("/surveyor/register") + @ResponseBody + public String registerSurveyor(@RequestParam("surveyorId") String surveyorId) { + //surveyorService.registerSurveyor(surveyorId); + return "success"; + } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/HouseholdSearchReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/HouseholdSearchReqVO.java new file mode 100644 index 00000000..6043c4a8 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/HouseholdSearchReqVO.java @@ -0,0 +1,28 @@ +package app.module.admin.usecase.researcher.web.model; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.web.bind.annotation.RequestParam; + +@Getter +@Setter +public class HouseholdSearchReqVO { + private Integer page; + private Integer size; + private String ownerField; + private String ownerValue; + private String regionMainCode; + private String regionSubCode; + private String regionDetailCode; + private Boolean isPanel; + private Boolean isMapping; + 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/mappers/household/GetHouseholdsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml index 6b9697b3..6e7eec7f 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml @@ -7,21 +7,22 @@ + + +
+
+

경영주

+
+
+
+ +
+
+
+ +
+
+
+
+ + +
+
+
+
+

지역

+
+ +
+
+
+

세부지역

+
+ +
+
+
+ + +
+
+
+
+

패널유지여부

+
+ +
+
+
+

맵핑여부

+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+

+ 총 건 +

+ + + + + + + + + + + + + + +
선택임가번호경영주명휴대폰번호실사지역세부지역조사원
+ +
+ + +
+
+ +
+
+
+ + + + + + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 0d580b55..30af1164 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -56,17 +56,14 @@ -
-
-
- TOTAL. -
-
- +

+ 총 건 +

+ +
+
@@ -147,9 +144,11 @@
+
diff --git a/admin/src/main/resources/templates/researcher/researchers.html b/admin/src/main/resources/templates/researcher/researchers.html index 290363dc..f0815145 100644 --- a/admin/src/main/resources/templates/researcher/researchers.html +++ b/admin/src/main/resources/templates/researcher/researchers.html @@ -5,7 +5,6 @@
-
@@ -73,41 +72,36 @@
-
-
-
-
- TOTAL. +
+

+ 총 건 +

+ + + + + + + + + + + + + +
이름전화번호실사지역임가수사용여부
+
+ +
+ +
+
+
-
-
- - - - - - - - - - - - - -
이름전화번호실사지역임가수사용여부
-
- -
- - -
-
- -
-
+
@@ -154,10 +148,10 @@ const paging = $('.paging'); paging.empty(); paging.append( - uiUtil.getPagingUI(pageNo, f.size.value, response.totalPages, + uiUtil.getPagingUI(pageNo, response.size, response.totalPages, (movePageNo) => { f.page.value = movePageNo; - goSearch(); + getResearchers(movePageNo); })); }, diff --git a/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java b/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java index 9580986a..597fa1b9 100644 --- a/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java +++ b/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java @@ -51,10 +51,8 @@ class CreateAdminController { reqVO.getSeq(), reqVO.getId(), reqVO.getPassword(), - reqVO.getEmail(), reqVO.getRegionMainCode(), reqVO.getAccountDisabled(), - reqVO.getAccountLocked(), reqVO.getRoleIds()); return ResponseEntity.status(HttpStatus.OK).body(new CreateAdminResVO(createdId)); diff --git a/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/UpdateAdminController.java b/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/UpdateAdminController.java index 704663a8..9debdf37 100644 --- a/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/UpdateAdminController.java +++ b/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/UpdateAdminController.java @@ -57,10 +57,8 @@ class UpdateAdminController { reqVO.getSeq(), reqVO.getId(), reqVO.getUpdatePassword(), - reqVO.getEmail(), reqVO.getRegionMainCode(), reqVO.getAccountDisabled(), - reqVO.getAccountLocked(), reqVO.getRoleIds()); return ResponseEntity.status(HttpStatus.OK).body(new UpdateAdminResVO(updatedId)); diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBanksUI/adapters/web/GetBanksUIController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBanksUI/adapters/web/GetBanksUIController.java index 067b01d0..11fd9c68 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBanksUI/adapters/web/GetBanksUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBanksUI/adapters/web/GetBanksUIController.java @@ -10,12 +10,14 @@ import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.applic import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatussCmd; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -28,35 +30,45 @@ class GetBanksUIController { private final GetMonthlyInputStatussPortIn portIn; - @GetMapping(path = "/info/bank") - String operate(Model model, - @PageableDefault(sort = "month", direction = Sort.Direction.DESC, page = 0, size = 13) Pageable pageable - ) { + @GetMapping(path = "/info/bank/{currentMonth}") + String operateMonth(Model model, @PathVariable String currentMonth) { + + Pageable pageable = PageRequest.of( + 0, + 13, + Sort.by(Sort.Direction.DESC, "month") + ); - //TODO 사양 결정이 아직 안되 리스트 가져오는것과 오늘 날짜로 가져오는것 둘다 Page list = portIn.operate( pageable, new GetMonthlyInputStatussCmd( null, null, AuthUtil.getUserSeq())); + model.addAttribute("list", list); - - String currentMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM")); - - GetMonthlyInputStatuss matched = list.getContent().stream() + GetMonthlyInputStatuss monthStatus = list.getContent().stream() .filter(item -> currentMonth.equals(item.getMonth())) .findFirst() .orElseThrow(() -> new NoSuchElementException("해당 월의 데이터가 없습니다.")); - - - + model.addAttribute("monthStatus", monthStatus); // TODO 페키지명이 넘무 길어서 그냥 model.addAttribute("MonthStatus", MonthStatus.class); return "info/bank/banks"; } + + + + @GetMapping(path = "/info/bank") + String operate() { + + String currentMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM")); + + return "redirect:/info/bank/" + currentMonth; + + } } \ No newline at end of file diff --git a/front/src/main/resources/messages/uri.properties b/front/src/main/resources/messages/uri.properties index b1abe7cc..565797b1 100644 --- a/front/src/main/resources/messages/uri.properties +++ b/front/src/main/resources/messages/uri.properties @@ -25,6 +25,11 @@ uri.front.info.monthly.path=/info/monthly uri.front.info.monthly.create.{{pathVar}}=\uC784\uC0B0\uBB3C \uD604\uD669 uri.front.info.bank=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED uri.front.info.bank.path=/info/bank +uri.front.info.bank.{{pathVar}}=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED +uri.front.info.bank.create.input.{{pathVar}}=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED +uri.front.info.bank.create.input.month.{{pathVar}}=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED +uri.front.info.bank.create.output.{{pathVar}}=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED +uri.front.info.bank.create.output.month.{{pathVar}}=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED diff --git a/front/src/main/resources/templates/info/bank/banks.html b/front/src/main/resources/templates/info/bank/banks.html index 2a6cb7f6..89f725eb 100644 --- a/front/src/main/resources/templates/info/bank/banks.html +++ b/front/src/main/resources/templates/info/bank/banks.html @@ -13,18 +13,35 @@ @@ -34,7 +51,7 @@