탭 항목 스장
This commit is contained in:
@@ -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<ResearchersDto> list(ResearchersListReqVO reqVO);
|
||||
Long countAll(ResearchersListReqVO reqVO);
|
||||
ResearchersDto detail(Integer adminSeq);
|
||||
List<ResearchersMappingHouseholdDto> mappingHouseholdList(Integer adminSeq);
|
||||
ResearchersDto mappingHouseholdVisitInfoList(Integer adminSeq);
|
||||
List<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Long mappingHouseholdCountAll(ResearchersDetailReqVO reqVO);
|
||||
List<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO);
|
||||
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ResearchersDto {
|
||||
private Long seq;
|
||||
private String id;
|
||||
private String name;
|
||||
private String phone;
|
||||
|
||||
@@ -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 name;
|
||||
private String visitDate;
|
||||
private String isGiftSentFlag;
|
||||
private String Memo;
|
||||
private LocalDateTime createdAt;
|
||||
|
||||
}
|
||||
@@ -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<ResearchersDto> list(ResearchersListReqVO reqVO);
|
||||
ResearchersDto detail(Integer adminSeq);
|
||||
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
|
||||
}
|
||||
|
||||
@@ -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<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO) {
|
||||
List<ResearchersMappingHouseholdDto> result = researcherMapper.mappingHouseholdList(reqVO);
|
||||
Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize());
|
||||
long total = researcherMapper.mappingHouseholdCountAll(reqVO);
|
||||
return new PageImpl<>(result, pageable, total);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO) {
|
||||
List<ResearchersHouseholdVisitDto> result = researcherMapper.visitHouseholdList(reqVO);
|
||||
Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize());
|
||||
long total = researcherMapper.visitHouseholdListCountAll(reqVO);
|
||||
return new PageImpl<>(result, pageable, total);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
@@ -33,11 +35,19 @@ class ResearcherController {
|
||||
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));
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user