조사원 현황 수정
This commit is contained in:
@@ -6,6 +6,7 @@ import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingH
|
||||
import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO;
|
||||
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -19,5 +20,5 @@ public interface ResearcherMapper {
|
||||
Long mappingHouseholdListCountAll(ResearchersDetailReqVO reqVO);
|
||||
List<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO);
|
||||
|
||||
Integer visitHouseholdDelete(@Param("selectIds") List<Integer> selectIds,@Param("deletedBy") String deletedBy);
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ public class ResearchersHouseholdVisitDto {
|
||||
private String ownerName;
|
||||
private String visitDate;
|
||||
private String isGiftSentFlag;
|
||||
private String Memo;
|
||||
private String memo;
|
||||
private LocalDateTime createdAt;
|
||||
|
||||
}
|
||||
|
||||
@@ -7,11 +7,13 @@ import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO;
|
||||
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
|
||||
import org.springframework.data.domain.Page;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public interface ResearcherService {
|
||||
Page<ResearchersDto> list(ResearchersListReqVO reqVO);
|
||||
ResearchersDto detail(Integer adminSeq);
|
||||
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
|
||||
Integer visitHouseholdDelete(List<Integer> selectIds);
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import app.module.admin.usecase.researcher.persistence.model.ResearchersHousehol
|
||||
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 app.module.core.config.application.util.CommonUtil;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.data.domain.Page;
|
||||
@@ -53,4 +54,10 @@ public class ResearcherServiceImpl implements ResearcherService {
|
||||
long total = researcherMapper.visitHouseholdListCountAll(reqVO);
|
||||
return new PageImpl<>(result, pageable, total);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer visitHouseholdDelete(List<Integer> selectIds) {
|
||||
String deletedBy = CommonUtil.getLoginUsername();
|
||||
return researcherMapper.visitHouseholdDelete(selectIds,deletedBy);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package app.module.admin.usecase.researcher.web;
|
||||
|
||||
import app.module.admin.config.application.util.DateUiUtil;
|
||||
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;
|
||||
@@ -10,11 +11,10 @@ import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
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.*;
|
||||
import app.module.admin.usecase.researcher.web.model.GetResearchersUIReqVO;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
@@ -35,19 +35,28 @@ class ResearcherController {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(researcherService.list(reqVO));
|
||||
}
|
||||
|
||||
@GetMapping(path = "/{seq}")
|
||||
public String operateDetail(Model model, @PathVariable Integer seq, @ModelAttribute("reqVO") ResearchersDetailUIReqVO reqVO) {
|
||||
model.addAttribute("researcherDto", researcherService.detail(seq));;
|
||||
@GetMapping(path = "/{adminSeq}")
|
||||
public String operateDetail(Model model, @PathVariable Integer adminSeq, @ModelAttribute("reqVO") ResearchersDetailUIReqVO reqVO) {
|
||||
model.addAttribute("researcherDto", researcherService.detail(adminSeq));
|
||||
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
|
||||
model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue());
|
||||
return "researcher/detail";
|
||||
}
|
||||
|
||||
@GetMapping(path = "/mappingHouseholdList")
|
||||
ResponseEntity<?> mappingHouseholdList( @ModelAttribute("reqVO") ResearchersDetailReqVO reqVO) {
|
||||
ResponseEntity<?> mappingHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(researcherService.mappingHouseholdList(reqVO));
|
||||
}
|
||||
|
||||
@GetMapping(path = "/visitHouseholdList")
|
||||
ResponseEntity<?> visitHouseholdList( @ModelAttribute("reqVO") ResearchersDetailReqVO reqVO) {
|
||||
ResponseEntity<?> visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdList(reqVO));
|
||||
}
|
||||
|
||||
@DeleteMapping(path = "/visitHousehold/remove")
|
||||
ResponseEntity<?> visitHouseholdDelete( @RequestBody List<Integer> selectIds) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdDelete(selectIds));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1,19 +1,15 @@
|
||||
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;
|
||||
private Integer seq;
|
||||
private String searchMonth;
|
||||
|
||||
public Integer getPage() {
|
||||
// 요청 페이지 넘버 - 초기값 `0`
|
||||
|
||||
Reference in New Issue
Block a user