[BO] 임가현황 리스트, 상세 작업 중 (1)
This commit is contained in:
@@ -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<MonthOption> getRecentMonths(int count) {
|
||||
List<MonthOption> 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);
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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<GetHouseholdsStatus> operate(GetHouseholdStatusCmd cmd) {
|
||||
return mapper.getHouseholdStatusById(cmd);
|
||||
}
|
||||
}
|
||||
@@ -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<GetHouseholdsStatus> getHouseholdStatusById(GetHouseholdStatusCmd cmd);
|
||||
|
||||
}
|
||||
@@ -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<GetHouseholdsStatus> operate(GetHouseholdStatusCmd cmd);
|
||||
}
|
||||
@@ -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<GetHouseholdsStatus> operate(GetHouseholdStatusCmd cmd);
|
||||
}
|
||||
@@ -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<GetHouseholdsStatus> operate(GetHouseholdStatusCmd cmd) {
|
||||
return portOut.operate(cmd);
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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}";
|
||||
}
|
||||
}
|
||||
@@ -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 {
|
||||
}
|
||||
@@ -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<GetHouseholdsStatus> operate(Pageable pageable, GetHouseholdsStatusCmd cmd) {
|
||||
return new PageImpl<>(null, null, 0);
|
||||
|
||||
List<GetHouseholdsStatus> householdsStatus = mapper.getHouseholdsStatus(pageable, cmd);
|
||||
|
||||
return new PageImpl<>(householdsStatus, pageable,
|
||||
householdsStatus.isEmpty() ? 0 : householdsStatus.get(0).getTotal());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,6 +9,6 @@ import org.springframework.data.domain.Pageable;
|
||||
|
||||
@Mapper
|
||||
public interface GetHouseholdsStatusMapper {
|
||||
List<GetHouseholdsStatus> getHouseholdsStatus(@Param("pageable")Pageable pageable, @Param("cmd") GetHouseholdsStatusCmd cmd);
|
||||
|
||||
List<GetHouseholdsStatus> getHouseholdsStatus(@Param("pageable") Pageable pageable,
|
||||
@Param("cmd") GetHouseholdsStatusCmd cmd);
|
||||
}
|
||||
|
||||
@@ -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<Page<GetHouseholdsStatus>> 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()
|
||||
))
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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 {
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user