Merge branch 'susu' into dev
This commit is contained in:
@@ -1,20 +1,17 @@
|
|||||||
package app.module.admin.usecase.researcher.service;
|
package app.module.admin.usecase.researcher.adpaters.persistence;
|
||||||
|
|
||||||
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.getPopupHouseholds.adapters.persistence.GetPopupHouseholdsMapper;
|
import app.module.admin.usecase.researcher.getPopupHouseholds.adapters.persistence.GetPopupHouseholdsMapper;
|
||||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
||||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
|
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
|
||||||
import app.module.admin.usecase.researcher.persistence.ResearcherMapper;
|
|
||||||
|
|
||||||
import app.module.admin.usecase.researcher.persistence.model.ResearchersDto;
|
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto;
|
||||||
import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto;
|
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
|
||||||
import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto;
|
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
|
||||||
import app.module.admin.usecase.researcher.web.model.HouseholdSearchReqVO;
|
import app.module.admin.usecase.researcher.ports.ResearcherPortOut;
|
||||||
import app.module.admin.usecase.researcher.web.model.MappingHouseholdListReqVO;
|
import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO;
|
||||||
import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO;
|
import app.module.admin.usecase.researcher.adpaters.web.model.MappingHouseholdListReqVO;
|
||||||
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
|
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO;
|
||||||
import app.module.core.config.application.util.CommonUtil;
|
import app.module.core.config.application.util.CommonUtil;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -29,7 +26,7 @@ import java.util.List;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class ResearcherServiceImpl implements ResearcherService {
|
public class ResearcherDao implements ResearcherPortOut {
|
||||||
private final ResearcherMapper researcherMapper;
|
private final ResearcherMapper researcherMapper;
|
||||||
private final GetPopupHouseholdsMapper getPopupHouseholdsMapper;
|
private final GetPopupHouseholdsMapper getPopupHouseholdsMapper;
|
||||||
|
|
||||||
@@ -73,8 +70,7 @@ public class ResearcherServiceImpl implements ResearcherService {
|
|||||||
@Override
|
@Override
|
||||||
public Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO) {
|
public Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO) {
|
||||||
Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize());
|
Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize());
|
||||||
|
List<GetPopupHouseholds> households = researcherMapper.getPopupHouseholds(pageable,
|
||||||
List<GetPopupHouseholds> households = getPopupHouseholdsMapper.getPopupHouseholds(pageable,
|
|
||||||
new GetPopupHouseholdsCmd(
|
new GetPopupHouseholdsCmd(
|
||||||
reqVO.getOwnerField(),
|
reqVO.getOwnerField(),
|
||||||
reqVO.getOwnerValue(),
|
reqVO.getOwnerValue(),
|
||||||
@@ -84,7 +80,6 @@ public class ResearcherServiceImpl implements ResearcherService {
|
|||||||
reqVO.getIsPanel(),
|
reqVO.getIsPanel(),
|
||||||
reqVO.getIsMapping()
|
reqVO.getIsMapping()
|
||||||
));
|
));
|
||||||
|
|
||||||
return new PageImpl<>(households, pageable,
|
return new PageImpl<>(households, pageable,
|
||||||
households.isEmpty() ? 0 : households.get(0).getTotal());
|
households.isEmpty() ? 0 : households.get(0).getTotal());
|
||||||
}
|
}
|
||||||
@@ -97,7 +92,6 @@ public class ResearcherServiceImpl implements ResearcherService {
|
|||||||
researcherMapper.deleteHouseholdResearcherMapping(reqVO.getResearcherSeq(), householdSeq,deletedBy);
|
researcherMapper.deleteHouseholdResearcherMapping(reqVO.getResearcherSeq(), householdSeq,deletedBy);
|
||||||
i += researcherMapper.insertHouseholdResearcherMapping(reqVO.getResearcherSeq(), householdSeq,deletedBy);
|
i += researcherMapper.insertHouseholdResearcherMapping(reqVO.getResearcherSeq(), householdSeq,deletedBy);
|
||||||
}
|
}
|
||||||
|
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,12 +1,15 @@
|
|||||||
package app.module.admin.usecase.researcher.persistence;
|
package app.module.admin.usecase.researcher.adpaters.persistence;
|
||||||
|
|
||||||
import app.module.admin.usecase.researcher.persistence.model.ResearchersDto;
|
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto;
|
||||||
import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto;
|
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
|
||||||
import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto;
|
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
|
||||||
import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO;
|
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailReqVO;
|
||||||
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
|
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
||||||
|
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -21,9 +24,7 @@ public interface ResearcherMapper {
|
|||||||
List<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
List<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO);
|
Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO);
|
||||||
Integer visitHouseholdDelete(@Param("selectIds") List<Integer> selectIds,@Param("deletedBy") String deletedBy);
|
Integer visitHouseholdDelete(@Param("selectIds") List<Integer> selectIds,@Param("deletedBy") String deletedBy);
|
||||||
|
|
||||||
void deleteHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("deletedBy") String deletedBy);
|
void deleteHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("deletedBy") String deletedBy);
|
||||||
Integer insertHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("createdBy") String createdBy);
|
Integer insertHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("createdBy") String createdBy);
|
||||||
|
List<GetPopupHouseholds> getPopupHouseholds(@Param("pageable") Pageable pageable, @Param("cmd") GetPopupHouseholdsCmd cmd);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
package app.module.admin.usecase.researcher.persistence.model;
|
package app.module.admin.usecase.researcher.adpaters.persistence.model;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class ResearchersDto {
|
public class ResearchersDto {
|
||||||
private Long seq;
|
private Long seq;
|
||||||
@@ -1,10 +1,9 @@
|
|||||||
package app.module.admin.usecase.researcher.persistence.model;
|
package app.module.admin.usecase.researcher.adpaters.persistence.model;
|
||||||
|
|
||||||
|
import app.module.admin.config.application.enums.ManagementType;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class ResearchersHouseholdVisitDto {
|
public class ResearchersHouseholdVisitDto {
|
||||||
private String id;
|
private String id;
|
||||||
@@ -13,7 +12,7 @@ public class ResearchersHouseholdVisitDto {
|
|||||||
private String householdNum;
|
private String householdNum;
|
||||||
private String ownerName;
|
private String ownerName;
|
||||||
private String visitDate;
|
private String visitDate;
|
||||||
private String managementType;
|
private ManagementType managementType;
|
||||||
private String content;
|
private String content;
|
||||||
private String isGiftSentFlag;
|
private String isGiftSentFlag;
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
package app.module.admin.usecase.researcher.persistence.model;
|
package app.module.admin.usecase.researcher.adpaters.persistence.model;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class ResearchersMappingHouseholdDto {
|
public class ResearchersMappingHouseholdDto {
|
||||||
private String seq;
|
private String seq;
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
package app.module.admin.usecase.researcher.adpaters.web;
|
||||||
|
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.MappingHouseholdListReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.ports.ResearcherPortIn;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@RestController
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@RequestMapping(path = "/api/researcher")
|
||||||
|
class ResearcherApiController {
|
||||||
|
private final ResearcherPortIn researcherPortIn;
|
||||||
|
|
||||||
|
@GetMapping(path = "/list")
|
||||||
|
ResponseEntity<?> operate( @ModelAttribute("reqVO") ResearchersListReqVO reqVO) {
|
||||||
|
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.list(reqVO));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping(path = "/mappingHouseholdList")
|
||||||
|
ResponseEntity<?> mappingHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
|
||||||
|
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.mappingHouseholdList(reqVO));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping(path = "/visitHouseholdList")
|
||||||
|
ResponseEntity<?> visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
|
||||||
|
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdList(reqVO));
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping(path = "/visitHousehold/remove")
|
||||||
|
ResponseEntity<?> visitHouseholdDelete( @RequestBody List<Integer> selectIds) {
|
||||||
|
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdDelete(selectIds));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/mappingHousehold/search")
|
||||||
|
ResponseEntity<?> searchMappingHousehold(HouseholdSearchReqVO reqVO) {
|
||||||
|
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.searchMappingHousehold(reqVO));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/mappingHousehold/update")
|
||||||
|
ResponseEntity<?> updateMappingHousehold(@RequestBody MappingHouseholdListReqVO reqVO ) {
|
||||||
|
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.updateMappingHousehold(reqVO));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
package app.module.admin.usecase.researcher.adpaters.web;
|
||||||
|
|
||||||
|
import app.module.admin.config.application.util.DateUiUtil;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.GetResearchersUIReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailUIReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.ports.ResearcherPortIn;
|
||||||
|
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.stereotype.Controller;
|
||||||
|
import org.springframework.ui.Model;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Controller
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@RequestMapping(path = "/researcher")
|
||||||
|
class ResearcherController {
|
||||||
|
private final UICodeListPortIn uiCodeListPortIn;
|
||||||
|
private final ResearcherPortIn researcherPortIn;
|
||||||
|
|
||||||
|
@GetMapping(path = "/researchers")
|
||||||
|
public String operate(Model model, @ModelAttribute("reqVO") GetResearchersUIReqVO reqVO) {
|
||||||
|
model.addAttribute("pageRows", uiCodeListPortIn.connect("code.pageable.rows"));
|
||||||
|
model.addAttribute("inspectionArea", uiCodeListPortIn.connect("code.region.main"));
|
||||||
|
return "researcher/researchers";
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping(path = "/{adminSeq}")
|
||||||
|
public String operateDetail(Model model, @PathVariable Integer adminSeq, @ModelAttribute("reqVO") ResearchersDetailUIReqVO reqVO) {
|
||||||
|
model.addAttribute("researcherDto", researcherPortIn.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";
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package app.module.admin.usecase.researcher.web.model;
|
package app.module.admin.usecase.researcher.adpaters.web.model;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package app.module.admin.usecase.researcher.web.model;
|
package app.module.admin.usecase.researcher.adpaters.web.model;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package app.module.admin.usecase.researcher.web.model;
|
package app.module.admin.usecase.researcher.adpaters.web.model;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package app.module.admin.usecase.researcher.web.model;
|
package app.module.admin.usecase.researcher.adpaters.web.model;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package app.module.admin.usecase.researcher.web.model;
|
package app.module.admin.usecase.researcher.adpaters.web.model;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package app.module.admin.usecase.researcher.web.model;
|
package app.module.admin.usecase.researcher.adpaters.web.model;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package app.module.admin.usecase.researcher.ports;
|
||||||
|
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.MappingHouseholdListReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public interface ResearcherPortIn {
|
||||||
|
Page<ResearchersDto> list(ResearchersListReqVO reqVO);
|
||||||
|
ResearchersDto detail(Integer adminSeq);
|
||||||
|
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
|
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
|
Integer visitHouseholdDelete(List<Integer> selectIds);
|
||||||
|
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
|
||||||
|
Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO);
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package app.module.admin.usecase.researcher.ports;
|
||||||
|
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.MappingHouseholdListReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public interface ResearcherPortOut {
|
||||||
|
Page<ResearchersDto> list(ResearchersListReqVO reqVO);
|
||||||
|
ResearchersDto detail(Integer adminSeq);
|
||||||
|
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
|
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
|
Integer visitHouseholdDelete(List<Integer> selectIds);
|
||||||
|
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
|
||||||
|
Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO);
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
package app.module.admin.usecase.researcher.ports.application;
|
||||||
|
|
||||||
|
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.MappingHouseholdListReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO;
|
||||||
|
import app.module.admin.usecase.researcher.ports.ResearcherPortIn;
|
||||||
|
import app.module.admin.usecase.researcher.ports.ResearcherPortOut;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
class ResearcherService implements ResearcherPortIn {
|
||||||
|
private final ResearcherPortOut portOut;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Page<ResearchersDto> list(ResearchersListReqVO reqVO){
|
||||||
|
return portOut.list(reqVO);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public ResearchersDto detail(Integer adminSeq){
|
||||||
|
return portOut.detail(adminSeq);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO){
|
||||||
|
return portOut.mappingHouseholdList(reqVO);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO){
|
||||||
|
return portOut.visitHouseholdList(reqVO);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public Integer visitHouseholdDelete(List<Integer> selectIds){
|
||||||
|
return portOut.visitHouseholdDelete(selectIds);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO){
|
||||||
|
return portOut.searchMappingHousehold(reqVO);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO){
|
||||||
|
return portOut.updateMappingHousehold(reqVO);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
package app.module.admin.usecase.researcher.service;
|
|
||||||
|
|
||||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
|
|
||||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
|
||||||
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.MappingHouseholdListReqVO;
|
|
||||||
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);
|
|
||||||
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
|
|
||||||
Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO);
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
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.*;
|
|
||||||
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;
|
|
||||||
import org.springframework.ui.Model;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Slf4j
|
|
||||||
@Controller
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
@RequestMapping(path = "/researcher")
|
|
||||||
class ResearcherController {
|
|
||||||
private final UICodeListPortIn uiCodeListPortIn;
|
|
||||||
private final ResearcherService researcherService;
|
|
||||||
|
|
||||||
@GetMapping(path = "/researchers")
|
|
||||||
public String operate(Model model, @ModelAttribute("reqVO") GetResearchersUIReqVO reqVO) {
|
|
||||||
model.addAttribute("pageRows", uiCodeListPortIn.connect("code.pageable.rows"));
|
|
||||||
model.addAttribute("inspectionArea", uiCodeListPortIn.connect("code.region.main"));
|
|
||||||
return "researcher/researchers";
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping(path = "/list")
|
|
||||||
ResponseEntity<?> operate( @ModelAttribute("reqVO") ResearchersListReqVO reqVO) {
|
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(researcherService.list(reqVO));
|
|
||||||
}
|
|
||||||
|
|
||||||
@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());
|
|
||||||
|
|
||||||
//모달용
|
|
||||||
// 지역
|
|
||||||
model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub"));
|
|
||||||
// 세부지역
|
|
||||||
model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail"));
|
|
||||||
|
|
||||||
return "researcher/detail";
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping(path = "/mappingHouseholdList")
|
|
||||||
ResponseEntity<?> mappingHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
|
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(researcherService.mappingHouseholdList(reqVO));
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping(path = "/visitHouseholdList")
|
|
||||||
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));
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/mappingHousehold/search")
|
|
||||||
ResponseEntity<?> searchMappingHousehold(HouseholdSearchReqVO reqVO) {
|
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(researcherService.searchMappingHousehold(reqVO));
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/mappingHousehold/update")
|
|
||||||
ResponseEntity<?> updateMappingHousehold(@RequestBody MappingHouseholdListReqVO reqVO ) {
|
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(researcherService.updateMappingHousehold(reqVO));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||||
<mapper namespace="app.module.admin.usecase.researcher.persistence.ResearcherMapper">
|
<mapper namespace="app.module.admin.usecase.researcher.adpaters.persistence.ResearcherMapper">
|
||||||
|
|
||||||
<select id="list" parameterType="app.module.admin.usecase.researcher.web.model.ResearchersListReqVO">
|
<select id="list" parameterType="app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO">
|
||||||
select
|
select
|
||||||
a.seq,
|
a.seq,
|
||||||
a.id,
|
a.id,
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
LIMIT #{size} OFFSET #{page}*#{size}
|
LIMIT #{size} OFFSET #{page}*#{size}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="countAll" parameterType="app.module.admin.usecase.researcher.web.model.ResearchersListReqVO" resultType="long">
|
<select id="countAll" parameterType="app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO" resultType="long">
|
||||||
select COUNT(a.seq)
|
select COUNT(a.seq)
|
||||||
from admin a
|
from admin a
|
||||||
join admin_has_role ahr ON a.seq = ahr.admin_seq
|
join admin_has_role ahr ON a.seq = ahr.admin_seq
|
||||||
@@ -186,4 +186,83 @@
|
|||||||
#{createdBy}
|
#{createdBy}
|
||||||
)
|
)
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
|
<select id="getPopupHouseholds"
|
||||||
|
resultType="app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds">
|
||||||
|
SELECT
|
||||||
|
hvr.*,
|
||||||
|
COUNT(*) OVER () AS total
|
||||||
|
FROM (
|
||||||
|
SELECT
|
||||||
|
h.seq AS householdSeq,
|
||||||
|
h.household_num AS householdNum,
|
||||||
|
h.owner_name AS householdName,
|
||||||
|
h.phone AS householdPhone,
|
||||||
|
h.region_main_code AS regionMainCode,
|
||||||
|
h.region_main_name AS regionMainName,
|
||||||
|
h.region_sub_code AS regionSubCode,
|
||||||
|
h.region_sub_name AS regionSubName,
|
||||||
|
h.region_detail_code AS regionDetailCode,
|
||||||
|
h.region_detail_name AS regionDetailName,
|
||||||
|
h.industry_large_code as industryLargeCode,
|
||||||
|
h.industry_large_name AS industryLargeName,
|
||||||
|
h.industry_middle_code as industryMiddleCode,
|
||||||
|
h.industry_middle_name AS industryMiddleName,
|
||||||
|
h.is_panel AS isPanel,
|
||||||
|
r.researcher_name AS researcherName
|
||||||
|
FROM v_household_with_code h
|
||||||
|
LEFT JOIN v_household_visit v ON h.seq = v.household_seq
|
||||||
|
LEFT JOIN v_household_researcher r ON h.seq = r.household_seq
|
||||||
|
) AS hvr
|
||||||
|
<where>
|
||||||
|
1=1
|
||||||
|
<if test="cmd.ownerField != null and cmd.ownerField != ''">
|
||||||
|
/* 경영주 검색 */
|
||||||
|
<choose>
|
||||||
|
<when test="cmd.ownerField eq 'name'">
|
||||||
|
AND hvr.householdName ILIKE '%' || #{cmd.ownerValue} || '%'
|
||||||
|
</when>
|
||||||
|
<when test="cmd.ownerField eq 'phone'">
|
||||||
|
AND hvr.householdPhone ILIKE '%' || #{cmd.ownerValue} || '%'
|
||||||
|
</when>
|
||||||
|
</choose>
|
||||||
|
</if>
|
||||||
|
<if test="cmd.regionMainCode != null and cmd.regionMainCode != ''">
|
||||||
|
/* 실사 검색 */
|
||||||
|
AND hvr.regionMainCode = #{cmd.regionMainCode}
|
||||||
|
</if>
|
||||||
|
<if test="cmd.regionSubCode != null and cmd.regionSubCode != ''">
|
||||||
|
/* 지역 검색 */
|
||||||
|
AND hvr.regionSubCode = #{cmd.regionSubCode}
|
||||||
|
</if>
|
||||||
|
<if test="cmd.regionDetailCode != null and cmd.regionDetailCode != ''">
|
||||||
|
/* 세부지역 검색 */
|
||||||
|
AND hvr.regionDetailCode = #{cmd.regionDetailCode}
|
||||||
|
</if>
|
||||||
|
<if test="cmd.isPanel != null">
|
||||||
|
/* 패널 유지 여부 */
|
||||||
|
<choose>
|
||||||
|
<when test="cmd.isPanel">
|
||||||
|
AND hvr.isPanel = true
|
||||||
|
</when>
|
||||||
|
<when test="!cmd.isPanel">
|
||||||
|
AND hvr.isPanel = false
|
||||||
|
</when>
|
||||||
|
</choose>
|
||||||
|
</if>
|
||||||
|
<if test="cmd.isMapping != null">
|
||||||
|
/* 맵핑 여부 */
|
||||||
|
<choose>
|
||||||
|
<when test="cmd.isMapping">
|
||||||
|
AND r.researcher_name is not null
|
||||||
|
</when>
|
||||||
|
<when test="!cmd.isMapping">
|
||||||
|
AND r.researcher_name is null
|
||||||
|
</when>
|
||||||
|
</choose>
|
||||||
|
</if>
|
||||||
|
</where>
|
||||||
|
ORDER BY hvr.householdNum ASC
|
||||||
|
OFFSET #{pageable.offset} ROWS FETCH NEXT #{pageable.pageSize} ROWS ONLY
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
@@ -176,7 +176,7 @@
|
|||||||
f.regionMainCode.value = regionMainCode;
|
f.regionMainCode.value = regionMainCode;
|
||||||
let dataOj = $(f).serializeObject();
|
let dataOj = $(f).serializeObject();
|
||||||
ajaxUtil._ajaxMethod(
|
ajaxUtil._ajaxMethod(
|
||||||
'/researcher/mappingHousehold/search',
|
'/api/researcher/mappingHousehold/search',
|
||||||
dataOj,
|
dataOj,
|
||||||
function (response) {
|
function (response) {
|
||||||
$('#mappingHouseholdTotalElements').text(response.totalElements);
|
$('#mappingHouseholdTotalElements').text(response.totalElements);
|
||||||
@@ -242,7 +242,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
ajaxUtil._ajaxMethod(
|
ajaxUtil._ajaxMethod(
|
||||||
'/researcher/mappingHousehold/update',
|
'/api/researcher/mappingHousehold/update',
|
||||||
JSON.stringify(data),
|
JSON.stringify(data),
|
||||||
function (response) {
|
function (response) {
|
||||||
if (response === selectedIds.length) {
|
if (response === selectedIds.length) {
|
||||||
|
|||||||
@@ -178,7 +178,7 @@
|
|||||||
f.page.value = pageNo;
|
f.page.value = pageNo;
|
||||||
let dataOj = $(f).serializeObject();
|
let dataOj = $(f).serializeObject();
|
||||||
ajaxUtil._ajaxMethod(
|
ajaxUtil._ajaxMethod(
|
||||||
'/researcher/mappingHouseholdList',
|
'/api/researcher/mappingHouseholdList',
|
||||||
dataOj,
|
dataOj,
|
||||||
function (response) {
|
function (response) {
|
||||||
$('#household-totalElements').text(response.totalElements);
|
$('#household-totalElements').text(response.totalElements);
|
||||||
@@ -248,7 +248,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
ajaxUtil._ajaxMethod(
|
ajaxUtil._ajaxMethod(
|
||||||
'/researcher/visitHouseholdList',
|
'/api/researcher/visitHouseholdList',
|
||||||
dataObj,
|
dataObj,
|
||||||
function (response) {
|
function (response) {
|
||||||
$('#household-totalElements').text(response.totalElements);
|
$('#household-totalElements').text(response.totalElements);
|
||||||
@@ -337,7 +337,7 @@
|
|||||||
const data = $(f).serializeObject();
|
const data = $(f).serializeObject();
|
||||||
|
|
||||||
ajaxUtil._ajaxMethod(
|
ajaxUtil._ajaxMethod(
|
||||||
'/researcher/visitHousehold/remove',
|
'/api/researcher/visitHousehold/remove',
|
||||||
JSON.stringify(selectIds),
|
JSON.stringify(selectIds),
|
||||||
function (response) {
|
function (response) {
|
||||||
if(response > 0){
|
if(response > 0){
|
||||||
|
|||||||
@@ -113,7 +113,7 @@
|
|||||||
let dataOj = $(f).serializeObject();
|
let dataOj = $(f).serializeObject();
|
||||||
|
|
||||||
ajaxUtil._ajaxMethod(
|
ajaxUtil._ajaxMethod(
|
||||||
'/researcher/list',
|
'/api/researcher/list',
|
||||||
dataOj,
|
dataOj,
|
||||||
function (response) {
|
function (response) {
|
||||||
$('#totalElements').text(response.totalElements);
|
$('#totalElements').text(response.totalElements);
|
||||||
@@ -215,7 +215,7 @@
|
|||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
'method': 'DELETE',
|
'method': 'DELETE',
|
||||||
'url': '/researchers/remove',
|
'url': '/api/researchers/remove',
|
||||||
'data': {
|
'data': {
|
||||||
'selectIds': data.selectIds
|
'selectIds': data.selectIds
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user