조사원 현황 - 임가 방문정보 수정
This commit is contained in:
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.config.application.util.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
public class EnumDto {
|
||||
private String id;
|
||||
private String codeText;
|
||||
}
|
||||
@@ -1,5 +1,9 @@
|
||||
package app.module.admin.usecase.researcher.adpaters.persistence;
|
||||
|
||||
import app.module.admin.config.application.enums.ManagementType;
|
||||
import app.module.admin.config.application.util.model.EnumDto;
|
||||
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitPopUpDto;
|
||||
import app.module.admin.usecase.researcher.adpaters.web.model.*;
|
||||
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.GetPopupHouseholdsCmd;
|
||||
@@ -8,10 +12,7 @@ import app.module.admin.usecase.researcher.adpaters.persistence.model.Researcher
|
||||
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.ports.ResearcherPortOut;
|
||||
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.core.config.application.annotation.UpdateCommand;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -21,6 +22,7 @@ import org.springframework.data.domain.PageRequest;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@@ -28,7 +30,6 @@ import java.util.List;
|
||||
@RequiredArgsConstructor
|
||||
public class ResearcherDao implements ResearcherPortOut {
|
||||
private final ResearcherMapper researcherMapper;
|
||||
private final GetPopupHouseholdsMapper getPopupHouseholdsMapper;
|
||||
|
||||
@Override
|
||||
public Page<ResearchersDto> list(ResearchersListReqVO reqVO) {
|
||||
@@ -61,6 +62,21 @@ public class ResearcherDao implements ResearcherPortOut {
|
||||
return new PageImpl<>(result, pageable, total);
|
||||
}
|
||||
|
||||
@Override
|
||||
@UpdateCommand
|
||||
public Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO) {
|
||||
return researcherMapper.updateVisitHousehold(reqVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id) {
|
||||
ResearchersHouseholdVisitDto result = researcherMapper.visitHouseholdDetail(id);
|
||||
List<EnumDto> managementTypeList = Arrays.stream(ManagementType.values())
|
||||
.map(type -> new EnumDto(type.name(), type.getDesc()))
|
||||
.toList();
|
||||
return new ResearchersHouseholdVisitPopUpDto(result, managementTypeList);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer visitHouseholdDelete(List<Integer> selectIds) {
|
||||
String deletedBy = CommonUtil.getLoginUsername();
|
||||
|
||||
@@ -5,6 +5,7 @@ import app.module.admin.usecase.researcher.adpaters.persistence.model.Researcher
|
||||
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
|
||||
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.adpaters.web.model.ResearchersVisitDetailReqVO;
|
||||
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;
|
||||
@@ -22,9 +23,12 @@ public interface ResearcherMapper {
|
||||
List<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Long mappingHouseholdListCountAll(ResearchersDetailReqVO reqVO);
|
||||
List<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
ResearchersHouseholdVisitDto visitHouseholdDetail(Integer id);
|
||||
Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO);
|
||||
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
|
||||
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);
|
||||
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);
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
package app.module.admin.usecase.researcher.adpaters.persistence.model;
|
||||
|
||||
import app.module.admin.config.application.util.model.EnumDto;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
public class ResearchersHouseholdVisitPopUpDto {
|
||||
private ResearchersHouseholdVisitDto researchersHouseholdVisitDto;
|
||||
private List<EnumDto> managementTypeList;
|
||||
}
|
||||
@@ -1,9 +1,6 @@
|
||||
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.adpaters.web.model.*;
|
||||
import app.module.admin.usecase.researcher.ports.ResearcherPortIn;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -30,11 +27,21 @@ class ResearcherApiController {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.mappingHouseholdList(reqVO));
|
||||
}
|
||||
|
||||
@GetMapping(path = "/visitHouseholdList")
|
||||
@GetMapping(path = "/visitHousehold/list")
|
||||
ResponseEntity<?> visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdList(reqVO));
|
||||
}
|
||||
|
||||
@PostMapping(path = "/visitHousehold")
|
||||
ResponseEntity<?> updateVisitHousehold(@RequestBody ResearchersVisitDetailReqVO reqVO) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.updateVisitHousehold(reqVO));
|
||||
}
|
||||
|
||||
@GetMapping(path = "/visitHousehold/{id}")
|
||||
ResponseEntity<?> visitHouseholdDetail( @PathVariable Integer id) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdDetail(id));
|
||||
}
|
||||
|
||||
@DeleteMapping(path = "/visitHousehold/remove")
|
||||
ResponseEntity<?> visitHouseholdDelete( @RequestBody List<Integer> selectIds) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdDelete(selectIds));
|
||||
|
||||
@@ -40,4 +40,6 @@ class ResearcherController {
|
||||
return "researcher/detail";
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package app.module.admin.usecase.researcher.adpaters.web.model;
|
||||
|
||||
import app.module.admin.config.application.enums.ManagementType;
|
||||
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class ResearchersVisitDetailReqVO {
|
||||
private String id;
|
||||
private String visitDate;
|
||||
private ManagementType managementType;
|
||||
private String content;
|
||||
private String isGiftSentFlag;
|
||||
}
|
||||
@@ -2,11 +2,9 @@ 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.ResearchersHouseholdVisitPopUpDto;
|
||||
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.adpaters.web.model.*;
|
||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
||||
import org.springframework.data.domain.Page;
|
||||
|
||||
@@ -17,6 +15,8 @@ public interface ResearcherPortIn {
|
||||
ResearchersDto detail(Integer adminSeq);
|
||||
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
|
||||
ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id);
|
||||
Integer visitHouseholdDelete(List<Integer> selectIds);
|
||||
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
|
||||
Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO);
|
||||
|
||||
@@ -2,11 +2,9 @@ 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.ResearchersHouseholdVisitPopUpDto;
|
||||
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.adpaters.web.model.*;
|
||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
||||
import org.springframework.data.domain.Page;
|
||||
|
||||
@@ -17,6 +15,8 @@ public interface ResearcherPortOut {
|
||||
ResearchersDto detail(Integer adminSeq);
|
||||
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
|
||||
ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id);
|
||||
Integer visitHouseholdDelete(List<Integer> selectIds);
|
||||
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
|
||||
Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO);
|
||||
|
||||
@@ -1,13 +1,11 @@
|
||||
package app.module.admin.usecase.researcher.ports.application;
|
||||
|
||||
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitPopUpDto;
|
||||
import app.module.admin.usecase.researcher.adpaters.web.model.*;
|
||||
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;
|
||||
@@ -25,26 +23,42 @@ class ResearcherService implements ResearcherPortIn {
|
||||
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 updateVisitHousehold(ResearchersVisitDetailReqVO reqVO) {
|
||||
return portOut.updateVisitHousehold(reqVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id) {
|
||||
return portOut.visitHouseholdDetail(id);
|
||||
}
|
||||
|
||||
@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);
|
||||
|
||||
Reference in New Issue
Block a user