diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java index 59d297db..afe2ec36 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java @@ -1,7 +1,9 @@ package app.module.admin.usecase.researcher.persistence; 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.ResearchersDetailReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; import org.apache.ibatis.annotations.Mapper; @@ -13,7 +15,9 @@ public interface ResearcherMapper { List list(ResearchersListReqVO reqVO); Long countAll(ResearchersListReqVO reqVO); ResearchersDto detail(Integer adminSeq); - List mappingHouseholdList(Integer adminSeq); - ResearchersDto mappingHouseholdVisitInfoList(Integer adminSeq); + List mappingHouseholdList(ResearchersDetailReqVO reqVO); + Long mappingHouseholdListCountAll(ResearchersDetailReqVO reqVO); + List visitHouseholdList(ResearchersDetailReqVO reqVO); + Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO); } 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 61d67849..8b2e032f 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 @@ -5,6 +5,7 @@ import lombok.Data; @Data public class ResearchersDto { + private Long seq; private String id; private String name; private String phone; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java new file mode 100644 index 00000000..9a95e11d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.researcher.persistence.model; + +import lombok.Data; + +import java.time.LocalDateTime; + + +@Data +public class ResearchersHouseholdVisitDto { + private String id; + private String adminSeq; + private String householdSeq; + private String householdNum; + private String ownerName; + private String visitDate; + private String isGiftSentFlag; + private String Memo; + private LocalDateTime createdAt; + +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersMappingHouseholdDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersMappingHouseholdDto.java index 92579305..8df195ac 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersMappingHouseholdDto.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersMappingHouseholdDto.java @@ -7,7 +7,7 @@ import lombok.Data; public class ResearchersMappingHouseholdDto { private String seq; private String householdNum; - private String name; + private String ownerName; private String phone; private String regionMainCodeName; private String regionSubCodeName; 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 24a9c65e..578f6148 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,6 +1,9 @@ package app.module.admin.usecase.researcher.service; 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.ResearchersDetailReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; import org.springframework.data.domain.Page; @@ -8,5 +11,7 @@ import org.springframework.data.domain.Page; public interface ResearcherService { Page list(ResearchersListReqVO reqVO); ResearchersDto detail(Integer adminSeq); + Page mappingHouseholdList(ResearchersDetailReqVO reqVO); + Page visitHouseholdList(ResearchersDetailReqVO 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 90f93fe1..1beb95c1 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 @@ -3,6 +3,9 @@ package app.module.admin.usecase.researcher.service; 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.ResearchersDetailReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -34,4 +37,20 @@ public class ResearcherServiceImpl implements ResearcherService { return researcherMapper.detail(adminSeq); } + + @Override + public Page mappingHouseholdList(ResearchersDetailReqVO reqVO) { + List result = researcherMapper.mappingHouseholdList(reqVO); + Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize()); + long total = researcherMapper.mappingHouseholdListCountAll(reqVO); + return new PageImpl<>(result, pageable, total); + } + + @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); + } } 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 86735b80..7a1c4b53 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 @@ -1,6 +1,8 @@ package app.module.admin.usecase.researcher.web; 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.core.usecase.uicode.list.ports.UICodeListPortIn; import lombok.RequiredArgsConstructor; @@ -17,7 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; @Controller @RequiredArgsConstructor @RequestMapping(path = "/researcher") -class ResearchersController { +class ResearcherController { private final UICodeListPortIn uiCodeListPortIn; private final ResearcherService researcherService; @@ -33,11 +35,19 @@ class ResearchersController { return ResponseEntity.status(HttpStatus.OK).body(researcherService.list(reqVO)); } - @GetMapping(path = "/detail/{seq}") - public String operateDetail(Model model, @PathVariable Integer seq) { + @GetMapping(path = "/{seq}") + public String operateDetail(Model model, @PathVariable Integer seq, @ModelAttribute("reqVO") ResearchersDetailUIReqVO reqVO) { model.addAttribute("researcherDto", researcherService.detail(seq));; - return "researcher/researchers/detail"; + return "researcher/detail"; } + @GetMapping(path = "/mappingHouseholdList") + ResponseEntity mappingHouseholdList( @ModelAttribute("reqVO") ResearchersDetailReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK).body(researcherService.mappingHouseholdList(reqVO)); + } + @GetMapping(path = "/visitHouseholdList") + ResponseEntity visitHouseholdList( @ModelAttribute("reqVO") ResearchersDetailReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdList(reqVO)); + } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailReqVO.java new file mode 100644 index 00000000..d7791876 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailReqVO.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.researcher.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class ResearchersDetailReqVO { + private Integer page; + private Integer size; + private Integer adminSeq; + private String searchMonthly; + + public Integer getPage() { + // 요청 페이지 넘버 - 초기값 `0` + return page != null ? page : 0; + } + + public Integer getSize() { + // 페이지 당 아이템 수 - 초기값 `10` + return size != null ? size : 10; + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailUIReqVO.java new file mode 100644 index 00000000..795dfaf0 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailUIReqVO.java @@ -0,0 +1,28 @@ +package app.module.admin.usecase.researcher.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import org.thymeleaf.util.StringUtils; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class ResearchersDetailUIReqVO { + private Integer page; + private Integer size; + private Integer adminSeq; + + + 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/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index b15eae14..2d70da05 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -5,12 +5,13 @@ select - a.id, - a.name, - a.phone, - u.code_text AS region_main_code_name, + a.seq, + a.id, + a.name, + a.phone, + u.code_text AS region_main_code_name, case a.account_disabled when false then '활성화' when true then '비활성화' end account_disabled_flag from admin a join admin_has_role ahr ON a.seq = ahr.admin_seq @@ -66,27 +68,70 @@ + + + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/templates/common/components.html b/admin/src/main/resources/templates/common/components.html index df4660c3..6759de2c 100644 --- a/admin/src/main/resources/templates/common/components.html +++ b/admin/src/main/resources/templates/common/components.html @@ -134,7 +134,7 @@

로그인 사용자명님 안녕하세요

111.11.111.111 - +
diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html new file mode 100644 index 00000000..63e95c32 --- /dev/null +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -0,0 +1,324 @@ + + + +
+
+ + + + + + + + + + + + + + + + + + +
아이디 + + 이름 + + 휴대폰번호 + +
실사 + + 계정사용여부 + +
+
+
+ +
+
+
+
+
+
+ + +
+
+
+
+ TOTAL. +
+
+
+ +
+ + + +
+
+
+
+ + + + + + + + + + + + + + + + +
임가번호경영주명휴대폰번호실사지역세부지역업종 대분류업종 중분류1유지여부
+
+
+
+
+
+
+ +
+
+
- +
+ + + + + + + + + + + + + + + +
+ + 임가번호경영주명방문일관리분야내용작성일답례품 전달
+
+
+
+
+
+
+
+ +
+
+ + +
+
+
- +
+ +
+ + + +
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/researcher/researchers.html b/admin/src/main/resources/templates/researcher/researchers.html index 5b812ef4..9b28df26 100644 --- a/admin/src/main/resources/templates/researcher/researchers.html +++ b/admin/src/main/resources/templates/researcher/researchers.html @@ -140,9 +140,8 @@ $(response.content).each((idx, ct) => { tbody.append( ` - - ${ct.name} + + ${ct.name} ${ct.phone} ${ct.regionMainCodeName} ${ct.householdCount} @@ -212,7 +211,7 @@ // 상세페이지 이동 function goDetail(seq) { - location.href = '/researcher/researchers/' + seq; + location.href = '/researcher/' + seq; } function goExcel() {