조사원 현황 - 임가매핑 수정

This commit is contained in:
주수현
2025-06-16 17:29:32 +09:00
parent 509bedc03e
commit 70d2900aa7
13 changed files with 407 additions and 82 deletions

View File

@@ -43,7 +43,9 @@ class GetHouseholdsStatusController {
reqVO.getResearcherValue(),
reqVO.getIsPanel(),
reqVO.getUserRole(),
reqVO.getUserRegionMainCode()
reqVO.getUserRegionMainCode(),
null,
null
))
);
}

View File

@@ -27,5 +27,6 @@ public class GetHouseholdsStatus {
private Boolean isGiftSent;
private String researcherName;
private String researcherPhone;
private String view;
private Integer total;
}

View File

@@ -1,5 +1,6 @@
package app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain;
import app.module.admin.usecase.researcher.web.model.HouseholdSearchReqVO;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
@@ -45,8 +46,17 @@ public class GetHouseholdsStatusCmd {
// 로그인한 유저 실사 지역
private String userRegionMainCode;
public GetHouseholdsStatusCmd(String searchRegionMainCode) {
this.regionMainCode = searchRegionMainCode;
private Boolean isMapping;
private String viewType;
public GetHouseholdsStatusCmd(HouseholdSearchReqVO reqVO) {
this.ownerField = reqVO.getOwnerField();
this.ownerValue = reqVO.getOwnerValue();
this.regionMainCode = reqVO.getRegionMainCode();
this.regionSubCode = reqVO.getRegionSubCode();
this.regionDetailCode = reqVO.getRegionDetailCode();
this.isPanel = reqVO.getIsPanel();
this.isMapping = reqVO.getIsMapping();
this.viewType = "popup";
}
}

View File

@@ -9,6 +9,7 @@ public class ResearchersDto {
private String id;
private String name;
private String phone;
private String regionMainCode;
private String regionMainCodeName;
private Integer householdCount;
private String accountDisabledFlag;

View File

@@ -4,6 +4,7 @@ import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.
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.HouseholdSearchReqVO;
import app.module.admin.usecase.researcher.web.model.MappingHouseholdListUIReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
@@ -18,5 +19,5 @@ public interface ResearcherService {
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
Integer visitHouseholdDelete(List<Integer> selectIds);
Page<GetHouseholdsStatus> reginMainCodeHouseholdList(MappingHouseholdListUIReqVO reqVO);
Page<GetHouseholdsStatus> searchMappingHousehold(HouseholdSearchReqVO reqVO);
}

View File

@@ -8,6 +8,7 @@ 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.HouseholdSearchReqVO;
import app.module.admin.usecase.researcher.web.model.MappingHouseholdListUIReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
@@ -67,11 +68,11 @@ public class ResearcherServiceImpl implements ResearcherService {
}
@Override
public Page<GetHouseholdsStatus> reginMainCodeHouseholdList(MappingHouseholdListUIReqVO reqVO) {
public Page<GetHouseholdsStatus> searchMappingHousehold(HouseholdSearchReqVO reqVO) {
Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize());
List<GetHouseholdsStatus> householdsStatus = householdsStatusMapper.getHouseholdsStatus(pageable,
new GetHouseholdsStatusCmd(reqVO.getSearchRegionMainCode()));
new GetHouseholdsStatusCmd(reqVO));
return new PageImpl<>(householdsStatus, pageable,
householdsStatus.isEmpty() ? 0 : householdsStatus.get(0).getTotal());

View File

@@ -5,6 +5,7 @@ import app.module.admin.usecase.researcher.service.ResearcherService;
import app.module.admin.usecase.researcher.web.model.*;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
@Slf4j
@Controller
@RequiredArgsConstructor
@RequestMapping(path = "/researcher")
@@ -37,6 +39,13 @@ class ResearcherController {
model.addAttribute("researcherDto", researcherService.detail(adminSeq));
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue());
//모달용
// 지역
model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub"));
// 세부지역
model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail"));
return "researcher/detail";
}
@@ -45,13 +54,6 @@ class ResearcherController {
return ResponseEntity.status(HttpStatus.OK).body(researcherService.mappingHouseholdList(reqVO));
}
@GetMapping(path = "/mappingHousehold/list")
String mappingHouseholdResearcherList(Model model, @ModelAttribute("reqVO") MappingHouseholdListUIReqVO reqVO) {
model.addAttribute("householdDto", researcherService.reginMainCodeHouseholdList(reqVO));
return "researcher/mappingHouserhold";
}
@GetMapping(path = "/visitHouseholdList")
ResponseEntity<?> visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdList(reqVO));
@@ -62,5 +64,15 @@ class ResearcherController {
return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdDelete(selectIds));
}
@GetMapping("/mappingHousehold/search")
ResponseEntity<?> searchMappingHousehold(HouseholdSearchReqVO reqVO) {
return ResponseEntity.status(HttpStatus.OK).body(researcherService.searchMappingHousehold(reqVO));
}
@PostMapping("/surveyor/register")
@ResponseBody
public String registerSurveyor(@RequestParam("surveyorId") String surveyorId) {
//surveyorService.registerSurveyor(surveyorId);
return "success";
}
}

View File

@@ -0,0 +1,28 @@
package app.module.admin.usecase.researcher.web.model;
import lombok.Getter;
import lombok.Setter;
import org.springframework.web.bind.annotation.RequestParam;
@Getter
@Setter
public class HouseholdSearchReqVO {
private Integer page;
private Integer size;
private String ownerField;
private String ownerValue;
private String regionMainCode;
private String regionSubCode;
private String regionDetailCode;
private Boolean isPanel;
private Boolean isMapping;
public Integer getPage() {
// 요청 페이지 넘버 - 초기값 `0`
return page != null ? page : 0;
}
public Integer getSize() {
// 페이지 당 아이템 수 - 초기값 `10`
return size != null ? size : 10;
}
}