diff --git a/admin/src/main/java/app/module/admin/config/application/util/DateUiUtil.java b/admin/src/main/java/app/module/admin/config/application/util/DateUiUtil.java new file mode 100644 index 00000000..bbdb5c52 --- /dev/null +++ b/admin/src/main/java/app/module/admin/config/application/util/DateUiUtil.java @@ -0,0 +1,33 @@ +package app.module.admin.config.application.util; + +import app.module.admin.config.application.util.model.MonthOption; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; +import org.springframework.stereotype.Component; + +@Component +public class DateUiUtil { + private static final DateTimeFormatter VALUE_FORMAT = DateTimeFormatter.ofPattern("yyyyMM"); + private static final DateTimeFormatter LABEL_FORMAT = DateTimeFormatter.ofPattern("yyyy년 M월"); + + public static List getRecentMonths(int count) { + List list = new ArrayList<>(); + LocalDate now = LocalDate.now(); + + for (int i = 0; i < count; i++) { + LocalDate date = now.minusMonths(i); + list.add(new MonthOption( + date.format(VALUE_FORMAT), + date.format(LABEL_FORMAT) + )); + } + + return list; + } + + public static String getCurrentMonthValue() { + return LocalDate.now().format(VALUE_FORMAT); + } +} diff --git a/admin/src/main/java/app/module/admin/config/application/util/model/MonthOption.java b/admin/src/main/java/app/module/admin/config/application/util/model/MonthOption.java new file mode 100644 index 00000000..2d341634 --- /dev/null +++ b/admin/src/main/java/app/module/admin/config/application/util/model/MonthOption.java @@ -0,0 +1,13 @@ +package app.module.admin.config.application.util.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class MonthOption { + private String value; + private String label; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusDao.java new file mode 100644 index 00000000..ba8c3165 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusDao.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.household.getHouseholdStatus.adapters.persistence; + +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; +import app.module.core.usecase.household.getHousehold.adapters.persistence.GetHouseholdMapper; +import java.util.Optional; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; +import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortOut; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetHouseholdStatusDao implements GetHouseholdStatusPortOut { + + private final GetHouseholdStatusMapper mapper; + + @Override + public Optional operate(GetHouseholdStatusCmd cmd) { + return mapper.getHouseholdStatusById(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusMapper.java new file mode 100644 index 00000000..3264b45b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusMapper.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.household.getHouseholdStatus.adapters.persistence; + +import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; +import java.util.Optional; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface GetHouseholdStatusMapper { + Optional getHouseholdStatusById(GetHouseholdStatusCmd cmd); + +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortIn.java new file mode 100644 index 00000000..ed77c45b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.getHouseholdStatus.ports; + +import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; +import java.util.Optional; + +public interface GetHouseholdStatusPortIn { + Optional operate(GetHouseholdStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortOut.java new file mode 100644 index 00000000..89318648 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.getHouseholdStatus.ports; + +import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; +import java.util.Optional; + +public interface GetHouseholdStatusPortOut { + Optional operate(GetHouseholdStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/GetHouseholdStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/GetHouseholdStatusService.java new file mode 100644 index 00000000..a5b12148 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/GetHouseholdStatusService.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.getHouseholdStatus.ports.application; + +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; +import java.util.Optional; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; +import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortIn; +import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortOut; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetHouseholdStatusService implements GetHouseholdStatusPortIn { + private final GetHouseholdStatusPortOut portOut; + + @Override + public Optional operate(GetHouseholdStatusCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatus.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatus.java new file mode 100644 index 00000000..ba38d6c7 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatus.java @@ -0,0 +1,49 @@ +package app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@EqualsAndHashCode +public class GetHouseholdStatus { + // 가구 일련번후 + private Integer householdSeq; + // 임가번후 + private String householdNum; + // 경영주명 + private String householdName; + // 연령 + private String householdAge; + // 가구 연락처 + private String householdTel; + // 휴대폰번호 + private String householdPhone; + // 실사 + private String regionMainName; + // 지역 + private String regionSubName; + // 세부지역 + private String regionDetailName; + // 주소 + private String address; + // 업종 대분류 + private String industryLargeName; + // 업종 중분류1 + private String industryMiddleName; + // 업종 중분류2 + private String industrySubMiddleName; + // 규모/세부품목 + private String industryDetailName; + // 유지여부 + private Boolean isPanel; + // 비고 + private Double memo; + // 조사원 + private String researcherName; + // 조사원 연락처 + private String researcherPhone; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatusCmd.java new file mode 100644 index 00000000..5ae2ad4c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatusCmd.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetHouseholdStatusCmd { + private Integer seq; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java new file mode 100644 index 00000000..17b03cdf --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java @@ -0,0 +1,31 @@ +package app.module.admin.usecase.household.getHouseholdStatusUI; + +import app.module.admin.config.application.util.DateUiUtil; +import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortIn; +import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import app.module.admin.usecase.household.getHouseholdStatusUI.model.GetHouseholdStatusUIReqVO; + +@Controller +@RequiredArgsConstructor +class GetHouseholdStatusUIController { + private final GetHouseholdStatusPortIn portIn; + + @GetMapping(path = "/household/households/{seq}") + String operate( + @PathVariable Integer seq, + Model model, + @ModelAttribute("reqVO") GetHouseholdStatusUIReqVO reqVO) { + + model.addAttribute("householdInfo", portIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null)); + model.addAttribute("monthList", DateUiUtil.getRecentMonths(13)); + model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue()); + + return "household/households/{seq}"; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/model/GetHouseholdStatusUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/model/GetHouseholdStatusUIReqVO.java new file mode 100644 index 00000000..a49de0a2 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/model/GetHouseholdStatusUIReqVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.getHouseholdStatusUI.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetHouseholdStatusUIReqVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/persistence/GetHouseholdsStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/persistence/GetHouseholdsStatusDao.java index 63fb91d7..b2a8b715 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/persistence/GetHouseholdsStatusDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/persistence/GetHouseholdsStatusDao.java @@ -1,5 +1,6 @@ package app.module.admin.usecase.household.getHouseholdsStatus.adapters.persistence; +import java.util.List; import lombok.RequiredArgsConstructor; import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd; @@ -12,9 +13,14 @@ import org.springframework.stereotype.Repository; @Repository @RequiredArgsConstructor class GetHouseholdsStatusDao implements GetHouseholdsStatusPortOut { + private final GetHouseholdsStatusMapper mapper; @Override public Page operate(Pageable pageable, GetHouseholdsStatusCmd cmd) { - return new PageImpl<>(null, null, 0); + + List householdsStatus = mapper.getHouseholdsStatus(pageable, cmd); + + return new PageImpl<>(householdsStatus, pageable, + householdsStatus.isEmpty() ? 0 : householdsStatus.get(0).getTotal()); } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/persistence/GetHouseholdsStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/persistence/GetHouseholdsStatusMapper.java index e9d1a16c..35a1e2dc 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/persistence/GetHouseholdsStatusMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/persistence/GetHouseholdsStatusMapper.java @@ -9,6 +9,6 @@ import org.springframework.data.domain.Pageable; @Mapper public interface GetHouseholdsStatusMapper { - List getHouseholdsStatus(@Param("pageable")Pageable pageable, @Param("cmd") GetHouseholdsStatusCmd cmd); - + List getHouseholdsStatus(@Param("pageable") Pageable pageable, + @Param("cmd") GetHouseholdsStatusCmd cmd); } 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 new file mode 100644 index 00000000..9e2d4ad1 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java @@ -0,0 +1,48 @@ +package app.module.admin.usecase.household.getHouseholdsStatus.adapters.web; + +import app.module.admin.usecase.household.getHouseholdsStatus.ports.GetHouseholdsStatusPortIn; +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.web.PageableDefault; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.GetMapping; +import app.module.admin.usecase.household.getHouseholdsStatus.adapters.web.model.GetHouseholdsStatusReqVO; +import app.module.admin.usecase.household.getHouseholdsStatus.adapters.web.model.GetHouseholdsStatusResVO; + +@RestController +@RequiredArgsConstructor +class GetHouseholdsStatusController { + private final GetHouseholdsStatusPortIn portIn; + + @GetMapping(path = "/api/household/households") + ResponseEntity> operate( + @PageableDefault(size = 10) Pageable pageable, + GetHouseholdsStatusReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK).body( + + portIn.operate(pageable, + new GetHouseholdsStatusCmd( + reqVO.getRecordMonth(), + reqVO.getOwnerField(), + reqVO.getOwnerValue(), + reqVO.getRegionMainCode(), + reqVO.getRegionSubCode(), + reqVO.getRegionDetailCode(), + reqVO.getIndustryLargeCode(), + reqVO.getIndustryMiddleCode(), + reqVO.getProgressType() != null ? reqVO.getProgressType().name() : null, + reqVO.getIsFirstVisited(), + reqVO.getIsSecondVisited(), + reqVO.getIsGiftSent(), + reqVO.getResearcherField(), + reqVO.getResearcherValue(), + reqVO.getIsPanel() + )) + ); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java new file mode 100644 index 00000000..213907a1 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java @@ -0,0 +1,44 @@ +package app.module.admin.usecase.household.getHouseholdsStatus.adapters.web.model; + +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.ProgressType; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetHouseholdsStatusReqVO { + // 연월 + private String recordMonth; + // 경영주 검색 필드 (전체, 경영주명, 전화번호) + private String ownerField; + // 경영주 검색어 + private String ownerValue; + // 실사 + private String regionMainCode; + // 지역 + private String regionSubCode; + // 세부지역 + private String regionDetailCode; + // 업종 대분류 + private String industryLargeCode; + // 업종 중분류1 + private String industryMiddleCode; + // 당월 일계부 현황 (전체, 25% 미만, 25~50% 미만, 50~75% 미만, 75% 이상, 100% 완료) + private ProgressType progressType; + // 당월 1차 방문 여부 + private Boolean isFirstVisited; + // 당월 2차 방문 여부 + private Boolean isSecondVisited; + // 답례품 전달 + private Boolean isGiftSent; + // 조사원 검색 필드 (전체, 이름, 전화번호) + private String researcherField; + // 조사원 검색어 + private String researcherValue; + // 패널 유지 여부 + private Boolean isPanel; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusResVO.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusResVO.java new file mode 100644 index 00000000..9f24e596 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusResVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.getHouseholdsStatus.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetHouseholdsStatusResVO { +} 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 890be5dc..005e1729 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 @@ -3,11 +3,12 @@ package app.module.admin.usecase.household.getHouseholdsStatus.ports.application import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; @Getter @Setter -@AllArgsConstructor +@NoArgsConstructor @EqualsAndHashCode public class GetHouseholdsStatus { private Integer householdSeq; @@ -19,9 +20,12 @@ public class GetHouseholdsStatus { private String regionDetailName; private String industryLargeName; private String industryMiddleName; + private Boolean isPanel; + private Double progressPercent; private String firstVisitDate; private String secondVisitDate; private Boolean isGiftSent; private String researcherName; private String researcherPhone; + 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 55c283a3..2494426a 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 @@ -11,7 +11,7 @@ import lombok.Setter; @EqualsAndHashCode public class GetHouseholdsStatusCmd { // 연월 - private String month; + private String recordMonth; // 경영주 검색 필드 (전체, 경영주명, 전화번호) private String ownerField; // 경영주 검색어 @@ -27,7 +27,7 @@ public class GetHouseholdsStatusCmd { // 업종 중분류1 private String industryMiddleCode; // 당월 일계부 현황 (전체, 25% 미만, 25~50% 미만, 50~75% 미만, 75% 이상, 100% 완료) - private ProgressType progress; + private String progressType; // 당월 1차 방문 여부 private Boolean isFirstVisited; // 당월 2차 방문 여부 @@ -38,4 +38,6 @@ public class GetHouseholdsStatusCmd { private String researcherField; // 조사원 검색어 private String researcherValue; + // 패널 유지 여부 + private Boolean isPanel; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/GetHouseholdsStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/GetHouseholdsStatusUIController.java index 709954ca..3debfb4a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/GetHouseholdsStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/GetHouseholdsStatusUIController.java @@ -1,6 +1,9 @@ package app.module.admin.usecase.household.getHouseholdsStatusUI; +import app.module.admin.config.application.util.DateUiUtil; import app.module.admin.usecase.household.getHouseholdsStatusUI.model.GetHouseholdsUIReqVO; +import app.module.core.config.application.util.CommonUtil; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -10,12 +13,29 @@ import org.springframework.web.bind.annotation.ModelAttribute; @Controller @RequiredArgsConstructor class GetHouseholdsStatusUIController { + private final UICodeListPortIn uiCodeListPortIn; @GetMapping(path = "/household/households") String operate( Model model, @ModelAttribute("reqVO") GetHouseholdsUIReqVO reqVO) { + // 로그인한 관리자 역할 + model.addAttribute("userRole", CommonUtil.getLoginUserRole()); + // 실사 + model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main")); + // 지역 + model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub")); + // 세부지역 + model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail")); + // 업종 대분류 + model.addAttribute("industryLargeList", uiCodeListPortIn.connect("code.industry.large")); + // 업종 중분류1 + model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle")); + + model.addAttribute("monthList", DateUiUtil.getRecentMonths(13)); + model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue()); + return "household/households"; } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/model/GetHouseholdsUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/model/GetHouseholdsUIReqVO.java index 0c1951ad..ee34a95e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/model/GetHouseholdsUIReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/model/GetHouseholdsUIReqVO.java @@ -1,5 +1,6 @@ package app.module.admin.usecase.household.getHouseholdsStatusUI.model; +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.ProgressType; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -10,4 +11,32 @@ import lombok.Setter; @AllArgsConstructor @EqualsAndHashCode public class GetHouseholdsUIReqVO { + private Integer page; + private String sort; + private Integer size; + private String recordMonth; + private String ownerField; + private String ownerValue; + private String regionMainCode; + private String regionSubCode; + private String regionDetailCode; + private String industryLargeCode; + private String industryMiddleCode; + private ProgressType progressType; + private Boolean isFirstVisited; + private Boolean isSecondVisited; + private Boolean isGiftSent; + private String researcherField; + private String researcherValue; + private Boolean isPanel; + + 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/GetHouseholdStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdStatusMapper.xml new file mode 100644 index 00000000..0405e53c --- /dev/null +++ b/admin/src/main/resources/mappers/household/GetHouseholdStatusMapper.xml @@ -0,0 +1,30 @@ + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml index 3e50d568..cb5ac027 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml @@ -6,29 +6,172 @@ \ No newline at end of file diff --git a/admin/src/main/resources/templates/household/households.html b/admin/src/main/resources/templates/household/households.html index c046824a..8453813e 100644 --- a/admin/src/main/resources/templates/household/households.html +++ b/admin/src/main/resources/templates/household/households.html @@ -3,7 +3,244 @@ layout:decorate="~{layout/layout}">
-

/household/households

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

총 100건

+ + + + + + + + + + + + + + + + + + + + + + + + +
임가번호경영주명휴대전화실사지역세부지역업종 대분류업종 중분류당월 일계부 현황1차 방문일2차 방문일답례품 전달조사원조사원 휴대전화
+
+ +
+ +
+ + + +
+
+ +
+ + + + +
\ No newline at end of file diff --git a/admin/src/main/resources/templates/household/households/{seq}.html b/admin/src/main/resources/templates/household/households/{seq}.html new file mode 100644 index 00000000..b06a0a7c --- /dev/null +++ b/admin/src/main/resources/templates/household/households/{seq}.html @@ -0,0 +1,9 @@ + + + +
+

/household/households/{seq}

+
+ + \ No newline at end of file diff --git a/core/src/main/resources/sql/schema/04_create-view.sql b/core/src/main/resources/sql/schema/04_create-view.sql index ef032af8..cf32e3a5 100644 --- a/core/src/main/resources/sql/schema/04_create-view.sql +++ b/core/src/main/resources/sql/schema/04_create-view.sql @@ -1,6 +1,7 @@ -- DROP VIEW DROP VIEW v_uicode_view_name; DROP VIEW v_household_with_code; +DROP VIEW v_household_researcher; -- CREATE VIEW @@ -24,7 +25,10 @@ SELECT h.seq, h.household_num, h.owner_name, + h.owner_age, + h.tel, h.phone, + h.address, h.region_main_code, main.code_text AS region_main_name, h.region_sub_code, @@ -34,13 +38,18 @@ SELECT h.industry_large_code, ind_large.name AS industry_large_name, h.industry_middle_code, - ind_middle.name AS industry_middle_name + ind_middle.name AS industry_middle_name, + h.industry_sub_middle, + h.industry_detail, + h.is_panel, + h.memo FROM household h - LEFT JOIN uicode main ON h.region_main_code = main.id + LEFT JOIN uicode main ON h.region_main_code = main.id LEFT JOIN v_uicode_view_name sub ON h.region_sub_code = sub.id LEFT JOIN v_uicode_view_name detail ON h.region_detail_code = detail.id LEFT JOIN v_uicode_view_name ind_large ON h.industry_large_code = ind_large.id - LEFT JOIN v_uicode_view_name ind_middle ON h.industry_middle_code = ind_middle.id; + LEFT JOIN v_uicode_view_name ind_middle ON h.industry_middle_code = ind_middle.id +WHERE h.is_deleted = false; -- ============================================