관리자 등록 페이지 수정
This commit is contained in:
@@ -45,4 +45,8 @@ public class GetHouseholdsStatusCmd {
|
|||||||
// 로그인한 유저 실사 지역
|
// 로그인한 유저 실사 지역
|
||||||
private String userRegionMainCode;
|
private String userRegionMainCode;
|
||||||
|
|
||||||
|
public GetHouseholdsStatusCmd(String searchRegionMainCode) {
|
||||||
|
this.regionMainCode = searchRegionMainCode;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package app.module.admin.usecase.researcher.persistence.model;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class HouseholdDto {
|
||||||
|
private Long seq;
|
||||||
|
private String id;
|
||||||
|
private String name;
|
||||||
|
private String phone;
|
||||||
|
private String regionMainCodeName;
|
||||||
|
private Integer householdCount;
|
||||||
|
private String accountDisabledFlag;
|
||||||
|
}
|
||||||
@@ -1,8 +1,10 @@
|
|||||||
package app.module.admin.usecase.researcher.service;
|
package app.module.admin.usecase.researcher.service;
|
||||||
|
|
||||||
|
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
|
||||||
import app.module.admin.usecase.researcher.persistence.model.ResearchersDto;
|
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.ResearchersHouseholdVisitDto;
|
||||||
import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto;
|
import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto;
|
||||||
|
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.ResearchersDetailReqVO;
|
||||||
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
|
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
@@ -16,4 +18,5 @@ public interface ResearcherService {
|
|||||||
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
Integer visitHouseholdDelete(List<Integer> selectIds);
|
Integer visitHouseholdDelete(List<Integer> selectIds);
|
||||||
|
Page<GetHouseholdsStatus> reginMainCodeHouseholdList(MappingHouseholdListUIReqVO reqVO);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,14 @@
|
|||||||
package app.module.admin.usecase.researcher.service;
|
package app.module.admin.usecase.researcher.service;
|
||||||
|
|
||||||
|
import app.module.admin.usecase.household.getHouseholdsStatus.adapters.persistence.GetHouseholdsStatusMapper;
|
||||||
|
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
|
||||||
|
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd;
|
||||||
import app.module.admin.usecase.researcher.persistence.ResearcherMapper;
|
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.ResearchersDto;
|
||||||
import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto;
|
import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto;
|
||||||
import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto;
|
import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto;
|
||||||
|
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.ResearchersDetailReqVO;
|
||||||
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
|
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
|
||||||
import app.module.core.config.application.util.CommonUtil;
|
import app.module.core.config.application.util.CommonUtil;
|
||||||
@@ -23,6 +27,7 @@ import java.util.List;
|
|||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class ResearcherServiceImpl implements ResearcherService {
|
public class ResearcherServiceImpl implements ResearcherService {
|
||||||
private final ResearcherMapper researcherMapper;
|
private final ResearcherMapper researcherMapper;
|
||||||
|
private final GetHouseholdsStatusMapper householdsStatusMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Page<ResearchersDto> list(ResearchersListReqVO reqVO) {
|
public Page<ResearchersDto> list(ResearchersListReqVO reqVO) {
|
||||||
@@ -60,4 +65,15 @@ public class ResearcherServiceImpl implements ResearcherService {
|
|||||||
String deletedBy = CommonUtil.getLoginUsername();
|
String deletedBy = CommonUtil.getLoginUsername();
|
||||||
return researcherMapper.visitHouseholdDelete(selectIds,deletedBy);
|
return researcherMapper.visitHouseholdDelete(selectIds,deletedBy);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Page<GetHouseholdsStatus> reginMainCodeHouseholdList(MappingHouseholdListUIReqVO reqVO) {
|
||||||
|
Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize());
|
||||||
|
|
||||||
|
List<GetHouseholdsStatus> householdsStatus = householdsStatusMapper.getHouseholdsStatus(pageable,
|
||||||
|
new GetHouseholdsStatusCmd(reqVO.getSearchRegionMainCode()));
|
||||||
|
|
||||||
|
return new PageImpl<>(householdsStatus, pageable,
|
||||||
|
householdsStatus.isEmpty() ? 0 : householdsStatus.get(0).getTotal());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,9 +2,7 @@ package app.module.admin.usecase.researcher.web;
|
|||||||
|
|
||||||
import app.module.admin.config.application.util.DateUiUtil;
|
import app.module.admin.config.application.util.DateUiUtil;
|
||||||
import app.module.admin.usecase.researcher.service.ResearcherService;
|
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.*;
|
||||||
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 app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
@@ -12,7 +10,6 @@ import org.springframework.http.ResponseEntity;
|
|||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.ui.Model;
|
import org.springframework.ui.Model;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import app.module.admin.usecase.researcher.web.model.GetResearchersUIReqVO;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -48,6 +45,13 @@ class ResearcherController {
|
|||||||
return ResponseEntity.status(HttpStatus.OK).body(researcherService.mappingHouseholdList(reqVO));
|
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")
|
@GetMapping(path = "/visitHouseholdList")
|
||||||
ResponseEntity<?> visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
|
ResponseEntity<?> visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdList(reqVO));
|
return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdList(reqVO));
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package app.module.admin.usecase.researcher.web.model;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
public class MappingHouseholdListUIReqVO {
|
||||||
|
private Integer page;
|
||||||
|
private Integer size;
|
||||||
|
private String searchRegionMainCode;
|
||||||
|
|
||||||
|
public Integer getPage() {
|
||||||
|
// 요청 페이지 넘버 - 초기값 `0`
|
||||||
|
return page != null ? page : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getSize() {
|
||||||
|
// 페이지 당 아이템 수 - 초기값 `10`
|
||||||
|
return size != null ? size : 10;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,7 +4,6 @@
|
|||||||
|
|
||||||
<th layout:fragment="content">
|
<th layout:fragment="content">
|
||||||
<section>
|
<section>
|
||||||
<!-- 테이블 영역 -->
|
|
||||||
<table class="type-form confirm" th:object="${researcherDto}" >
|
<table class="type-form confirm" th:object="${researcherDto}" >
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
@@ -63,14 +62,17 @@
|
|||||||
TOTAL. <span id="household-totalElements"></span>
|
TOTAL. <span id="household-totalElements"></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="researcher-tab1" style="display: none;">
|
||||||
|
<button type="button" class="btn" onclick="location.href='/researcher/researchers'">
|
||||||
|
<span class="btn-txt">임가매핑</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<!-- hidden parameters -->
|
<!-- hidden parameters -->
|
||||||
<input name="page" th:field="*{page}" type="hidden"/>
|
<input name="page" th:field="*{page}" type="hidden"/>
|
||||||
<input name="adminSeq" th:field="${researcherDto.seq}" type="hidden"/>
|
<input name="adminSeq" th:field="${researcherDto.seq}" type="hidden"/>
|
||||||
|
|
||||||
|
|
||||||
<div class="tab-body">
|
<div class="tab-body">
|
||||||
<div class="tab-content" data-tab-value="tab1">
|
<div class="tab-content" data-tab-value="tab1">
|
||||||
<div class="content-inner">
|
<div class="content-inner">
|
||||||
@@ -339,8 +341,6 @@
|
|||||||
'/researcher/visitHousehold/remove',
|
'/researcher/visitHousehold/remove',
|
||||||
JSON.stringify(selectIds),
|
JSON.stringify(selectIds),
|
||||||
function (response) {
|
function (response) {
|
||||||
console.log("여기있어요");
|
|
||||||
console.log(response);
|
|
||||||
if(response > 0){
|
if(response > 0){
|
||||||
alert('선택한 임가정보가 삭제되었습니다.');
|
alert('선택한 임가정보가 삭제되었습니다.');
|
||||||
getHouseholdVisitList(document.householdReqForm.page.value);
|
getHouseholdVisitList(document.householdReqForm.page.value);
|
||||||
|
|||||||
Reference in New Issue
Block a user