조사원 현황 - 임가 방문정보 수정
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;
|
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.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;
|
||||||
@@ -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.ResearchersHouseholdVisitDto;
|
||||||
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
|
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
|
||||||
import app.module.admin.usecase.researcher.ports.ResearcherPortOut;
|
import app.module.admin.usecase.researcher.ports.ResearcherPortOut;
|
||||||
import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO;
|
import app.module.core.config.application.annotation.UpdateCommand;
|
||||||
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.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;
|
||||||
@@ -21,6 +22,7 @@ import org.springframework.data.domain.PageRequest;
|
|||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@@ -28,7 +30,6 @@ import java.util.List;
|
|||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class ResearcherDao implements ResearcherPortOut {
|
public class ResearcherDao implements ResearcherPortOut {
|
||||||
private final ResearcherMapper researcherMapper;
|
private final ResearcherMapper researcherMapper;
|
||||||
private final GetPopupHouseholdsMapper getPopupHouseholdsMapper;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Page<ResearchersDto> list(ResearchersListReqVO reqVO) {
|
public Page<ResearchersDto> list(ResearchersListReqVO reqVO) {
|
||||||
@@ -61,6 +62,21 @@ public class ResearcherDao implements ResearcherPortOut {
|
|||||||
return new PageImpl<>(result, pageable, total);
|
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
|
@Override
|
||||||
public Integer visitHouseholdDelete(List<Integer> selectIds) {
|
public Integer visitHouseholdDelete(List<Integer> selectIds) {
|
||||||
String deletedBy = CommonUtil.getLoginUsername();
|
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.persistence.model.ResearchersMappingHouseholdDto;
|
||||||
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailReqVO;
|
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.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.GetPopupHouseholds;
|
||||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
|
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
@@ -22,9 +23,12 @@ public interface ResearcherMapper {
|
|||||||
List<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
List<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
Long mappingHouseholdListCountAll(ResearchersDetailReqVO reqVO);
|
Long mappingHouseholdListCountAll(ResearchersDetailReqVO reqVO);
|
||||||
List<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
List<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
|
ResearchersHouseholdVisitDto visitHouseholdDetail(Integer id);
|
||||||
Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO);
|
Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO);
|
||||||
|
Integer updateVisitHousehold(ResearchersVisitDetailReqVO 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);
|
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;
|
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.*;
|
||||||
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.ResearcherPortIn;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -30,11 +27,21 @@ class ResearcherApiController {
|
|||||||
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.mappingHouseholdList(reqVO));
|
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.mappingHouseholdList(reqVO));
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(path = "/visitHouseholdList")
|
@GetMapping(path = "/visitHousehold/list")
|
||||||
ResponseEntity<?> visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
|
ResponseEntity<?> visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdList(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")
|
@DeleteMapping(path = "/visitHousehold/remove")
|
||||||
ResponseEntity<?> visitHouseholdDelete( @RequestBody List<Integer> selectIds) {
|
ResponseEntity<?> visitHouseholdDelete( @RequestBody List<Integer> selectIds) {
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdDelete(selectIds));
|
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdDelete(selectIds));
|
||||||
|
|||||||
@@ -40,4 +40,6 @@ class ResearcherController {
|
|||||||
return "researcher/detail";
|
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.ResearchersDto;
|
||||||
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
|
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.persistence.model.ResearchersMappingHouseholdDto;
|
||||||
import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO;
|
import app.module.admin.usecase.researcher.adpaters.web.model.*;
|
||||||
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 app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
|
|
||||||
@@ -17,6 +15,8 @@ public interface ResearcherPortIn {
|
|||||||
ResearchersDto detail(Integer adminSeq);
|
ResearchersDto detail(Integer adminSeq);
|
||||||
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
|
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
|
||||||
|
ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id);
|
||||||
Integer visitHouseholdDelete(List<Integer> selectIds);
|
Integer visitHouseholdDelete(List<Integer> selectIds);
|
||||||
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
|
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
|
||||||
Integer updateMappingHousehold(MappingHouseholdListReqVO 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.ResearchersDto;
|
||||||
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
|
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.persistence.model.ResearchersMappingHouseholdDto;
|
||||||
import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO;
|
import app.module.admin.usecase.researcher.adpaters.web.model.*;
|
||||||
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 app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
|
|
||||||
@@ -17,6 +15,8 @@ public interface ResearcherPortOut {
|
|||||||
ResearchersDto detail(Integer adminSeq);
|
ResearchersDto detail(Integer adminSeq);
|
||||||
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
|
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
|
||||||
|
ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id);
|
||||||
Integer visitHouseholdDelete(List<Integer> selectIds);
|
Integer visitHouseholdDelete(List<Integer> selectIds);
|
||||||
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
|
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
|
||||||
Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO);
|
Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO);
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
package app.module.admin.usecase.researcher.ports.application;
|
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.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
||||||
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto;
|
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.ResearchersHouseholdVisitDto;
|
||||||
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
|
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.ResearcherPortIn;
|
||||||
import app.module.admin.usecase.researcher.ports.ResearcherPortOut;
|
import app.module.admin.usecase.researcher.ports.ResearcherPortOut;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
@@ -25,26 +23,42 @@ class ResearcherService implements ResearcherPortIn {
|
|||||||
public Page<ResearchersDto> list(ResearchersListReqVO reqVO){
|
public Page<ResearchersDto> list(ResearchersListReqVO reqVO){
|
||||||
return portOut.list(reqVO);
|
return portOut.list(reqVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResearchersDto detail(Integer adminSeq){
|
public ResearchersDto detail(Integer adminSeq){
|
||||||
return portOut.detail(adminSeq);
|
return portOut.detail(adminSeq);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO){
|
public Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO){
|
||||||
return portOut.mappingHouseholdList(reqVO);
|
return portOut.mappingHouseholdList(reqVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO){
|
public Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO){
|
||||||
return portOut.visitHouseholdList(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
|
@Override
|
||||||
public Integer visitHouseholdDelete(List<Integer> selectIds){
|
public Integer visitHouseholdDelete(List<Integer> selectIds){
|
||||||
return portOut.visitHouseholdDelete(selectIds);
|
return portOut.visitHouseholdDelete(selectIds);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO){
|
public Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO){
|
||||||
return portOut.searchMappingHousehold(reqVO);
|
return portOut.searchMappingHousehold(reqVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO){
|
public Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO){
|
||||||
return portOut.updateMappingHousehold(reqVO);
|
return portOut.updateMappingHousehold(reqVO);
|
||||||
|
|||||||
@@ -148,8 +148,31 @@
|
|||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="visitHouseholdDetail">
|
||||||
|
select
|
||||||
|
rhv.id,
|
||||||
|
rhv.household_seq,
|
||||||
|
rhv.visit_date,
|
||||||
|
rhv.content,
|
||||||
|
rhv.management_type,
|
||||||
|
rhv.is_gift_sent as is_gift_sent_flag,
|
||||||
|
rhv.created_at
|
||||||
|
from household_visit rhv
|
||||||
|
where rhv.is_deleted = false and rhv.id = #{id}
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<update id="updateVisitHousehold">
|
||||||
|
update household_visit
|
||||||
|
set visit_date = #{visitDate},
|
||||||
|
content = #{content},
|
||||||
|
management_type = #{managementType},
|
||||||
|
is_gift_sent = #{isGiftSent},
|
||||||
|
<include refid="common.fields.UpdateBaseSet" />
|
||||||
|
where id = #{id}
|
||||||
|
</update>
|
||||||
|
|
||||||
<update id="visitHouseholdDelete">
|
<update id="visitHouseholdDelete">
|
||||||
update researcher_household_visit
|
update household_visit
|
||||||
set is_deleted = true,
|
set is_deleted = true,
|
||||||
deleted_at = NOW(),
|
deleted_at = NOW(),
|
||||||
deleted_by = #{deletedBy}
|
deleted_by = #{deletedBy}
|
||||||
|
|||||||
@@ -253,7 +253,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
ajaxUtil._ajaxMethod(
|
ajaxUtil._ajaxMethod(
|
||||||
'/api/researcher/visitHouseholdList',
|
'/api/researcher/visitHousehold/list',
|
||||||
dataObj,
|
dataObj,
|
||||||
function (response) {
|
function (response) {
|
||||||
$('#household-visit-totalElements').text(response.totalElements);
|
$('#household-visit-totalElements').text(response.totalElements);
|
||||||
@@ -268,10 +268,10 @@
|
|||||||
<tr data-id="${ct.id}">
|
<tr data-id="${ct.id}">
|
||||||
<td>
|
<td>
|
||||||
<label>
|
<label>
|
||||||
<input class="form-check-input" name="selectIds" type="checkbox" value="${ct.seq}"/>
|
<input class="form-check-input" name="selectIds" type="checkbox" value="${ct.id}"/>
|
||||||
</label>
|
</label>
|
||||||
</td>
|
</td>
|
||||||
<td class="underline"><a href="#" onclick="showHouseholdModal2(${ct.seq});">${ct.householdNum}</a></td>
|
<td class="underline"><a href="#" onclick="showHouseholdModal2(${ct.id});">${ct.householdNum}</a></td>
|
||||||
<td>${ct.ownerName}</td>
|
<td>${ct.ownerName}</td>
|
||||||
<td>${ct.visitDate}</td>
|
<td>${ct.visitDate}</td>
|
||||||
<td>${ct.managementType}</td>
|
<td>${ct.managementType}</td>
|
||||||
|
|||||||
@@ -13,56 +13,59 @@
|
|||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-content-inner">
|
<div class="modal-content-inner">
|
||||||
<section>
|
<section>
|
||||||
<table class="type-form confirm" th:object="${researcherDto}" >
|
<form autocomplete="off" method="get" name="householdVisitReqForm" >
|
||||||
<tbody>
|
<input type="hidden" name="id" id="id" />
|
||||||
<tr>
|
<table class="type-form confirm" >
|
||||||
<th>방문일</th>
|
<tbody id="household-visit-detail">
|
||||||
<td>
|
<tr>
|
||||||
<span th:text="*{id}"></span>
|
<th>방문일</th>
|
||||||
</td>
|
<td>
|
||||||
<th>관리분야</th>
|
<input id="visitDate" class="flatpickr" name="visitDate" type="text" placeholder="방문일을 선택하세요"/>
|
||||||
<td>
|
</td>
|
||||||
<span th:text="*{name}"></span>
|
<th>관리분야</th>
|
||||||
</td>
|
<td>
|
||||||
</tr>
|
<select id="managementType" name="managementType">
|
||||||
<tr>
|
<option value="">선택하세요</option>
|
||||||
<th>내용</th>
|
</select>
|
||||||
<td>
|
</td>
|
||||||
<span th:text="*{regionMainCodeName}"></span>
|
</tr>
|
||||||
</td>
|
<tr>
|
||||||
</tr>
|
<th>내용</th>
|
||||||
<tr>
|
<td>
|
||||||
<th>답례품 전달</th>
|
<textarea id="content" name="content" rows="5" cols="50"></textarea>
|
||||||
<td>
|
</td>
|
||||||
<div class="component-input">
|
</tr>
|
||||||
<label class="radio-inner">
|
<tr>
|
||||||
<input type="radio" id="radio_status_keep" name="survey_status">
|
<th>답례품 전달</th>
|
||||||
<span class="radio-item">
|
<td>
|
||||||
<span class="radio-txt">전달</span>
|
<div class="component-input">
|
||||||
</span>
|
<label class="radio-inner">
|
||||||
</label>
|
<input type="radio" id="is_gift_sent_y" name="isGiftSent">
|
||||||
</div>
|
<span class="radio-item">
|
||||||
<div class="component-input">
|
<span class="radio-txt">전달</span>
|
||||||
<label class="radio-inner">
|
</span>
|
||||||
<input type="radio" id="radio_status_drop" name="survey_status">
|
</label>
|
||||||
<span class="radio-item">
|
</div>
|
||||||
<span class="radio-txt">미전달</span>
|
<div class="component-input">
|
||||||
</span>
|
<label class="radio-inner">
|
||||||
</label>
|
<input type="radio" id="is_gift_sent_n" name="isGiftSent">
|
||||||
</div>
|
<span class="radio-item">
|
||||||
</td>
|
<span class="radio-txt">미전달</span>
|
||||||
</tr>
|
</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<!-- 등록 버튼 -->
|
|
||||||
<div class="component-btns bottom-btn-group" th:fragment="modalButtons">
|
<div class="component-btns bottom-btn-group" th:fragment="modalButtons">
|
||||||
<div class="btns-row align-right">
|
<div class="btns-row align-right">
|
||||||
<button type="button" class="btn btn-primary" onclick="registerHouseholds()">
|
<button type="button" class="btn btn-primary" onclick="updateHouseholdVisit()">
|
||||||
<span class="btn-txt">등록</span>
|
<span class="btn-txt">수정</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</form>
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
<button class="modal-close" onclick="closeModal()"></button>
|
<button class="modal-close" onclick="closeModal()"></button>
|
||||||
@@ -70,17 +73,131 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<section layout:fragment="script">
|
||||||
|
<script th:inline="javascript">
|
||||||
|
let visitDatePicker;
|
||||||
|
|
||||||
<script th:inline="javascript">
|
document.getElementById('visitDate').addEventListener('change', function (e) {
|
||||||
const showHouseholdModal2 = (seq) => {
|
console.log("날짜 변경됨:", e.target.value);
|
||||||
console.log(seq);
|
});
|
||||||
document.querySelector(".modal02").ui.open();
|
|
||||||
|
|
||||||
|
const showHouseholdModal2 = (seq) => {
|
||||||
|
document.querySelector(".modal02").ui.open();
|
||||||
|
initFlatpickr();
|
||||||
|
|
||||||
};
|
ajaxUtil._ajaxMethod(
|
||||||
|
'/api/researcher/visitHousehold/'+seq,
|
||||||
|
null,
|
||||||
|
function (response) {
|
||||||
|
const managementTypeList =response.managementTypeList;
|
||||||
|
if (managementTypeList.length > 0) {
|
||||||
|
// select 박스에 managementTypeList 옵션 추가
|
||||||
|
populateManagementType(managementTypeList);
|
||||||
|
}
|
||||||
|
const data = response.researchersHouseholdVisitDto;
|
||||||
|
setFormData(data);
|
||||||
|
},
|
||||||
|
function (code, rstData) {
|
||||||
|
},
|
||||||
|
'get',
|
||||||
|
'json',
|
||||||
|
null
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const setFormData = (data) => {
|
||||||
|
// 폼 필드에 데이터 세팅
|
||||||
|
const f = document.householdVisitReqForm;
|
||||||
|
if (data.visitDate) {
|
||||||
|
const visitDate = data.visitDate.substring(0, 10); // 'YYYY-MM-DD' 형식
|
||||||
|
if (visitDatePicker) {
|
||||||
|
f.visitDate.value = visitDate; // 입력 필드 먼저 설정
|
||||||
|
visitDatePicker.setDate(visitDate); // Flatpickr 동기화
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (data.managementType) {
|
||||||
|
f.managementType.value= data.managementType;
|
||||||
|
}
|
||||||
|
f.content.value = data.content;
|
||||||
|
f.id.value = data.id;
|
||||||
|
const isGift = data.isGiftSentFlag;
|
||||||
|
if (isGift === "t") {
|
||||||
|
document.getElementById('is_gift_sent_y').checked = true;
|
||||||
|
} else if (isGift === "f") {
|
||||||
|
document.getElementById('is_gift_sent_n').checked = true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const populateManagementType = (managementTypeList) => {
|
||||||
|
const select = document.getElementById('managementType');
|
||||||
|
select.innerHTML = '<option value="">선택하세요</option>'; // 초기화
|
||||||
|
managementTypeList.forEach(item => {
|
||||||
|
const option = document.createElement('option');
|
||||||
|
option.value = item.id;
|
||||||
|
option.textContent = item.codeText;
|
||||||
|
select.appendChild(option);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
</script>
|
const initFlatpickr = () => {
|
||||||
|
// 기존 Flatpickr 인스턴스 제거
|
||||||
|
if (visitDatePicker) {
|
||||||
|
visitDatePicker.destroy();
|
||||||
|
visitDatePicker = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1. input 요소가 실제로 존재하는지 확인
|
||||||
|
const input = document.getElementById('visitDate');
|
||||||
|
if (!input) {
|
||||||
|
console.warn('#visitDate input not found!');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. input에 값이 있으면 flatpickr와 동기화
|
||||||
|
const currentVal = input.value;
|
||||||
|
|
||||||
|
// 3. flatpickr 초기화
|
||||||
|
visitDatePicker = flatpickr(input, {
|
||||||
|
dateFormat: 'Y-m-d',
|
||||||
|
defaultDate: currentVal || null, // 현재 값으로 초기 선택 날짜 설정
|
||||||
|
enableTime: false,
|
||||||
|
clickOpens: true,
|
||||||
|
onChange: function (selectedDates, dateStr, instance) {
|
||||||
|
console.log('날짜 선택됨:', dateStr);
|
||||||
|
input.value = dateStr; // 수동으로 input 값 동기화
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateHouseholdVisit = () => {
|
||||||
|
const form = document.forms['householdVisitReqForm'];
|
||||||
|
const formData = new FormData(form);
|
||||||
|
const data = Object.fromEntries(formData);
|
||||||
|
|
||||||
|
ajaxUtil._ajaxMethod(
|
||||||
|
'/api/researcher/visitHousehold',
|
||||||
|
JSON.stringify(data),
|
||||||
|
function (response) {
|
||||||
|
alert('수정 완료되었습니다.');
|
||||||
|
closeModal();
|
||||||
|
},
|
||||||
|
function (code, rstData) {
|
||||||
|
console.error('Error updating data:', code, rstData);
|
||||||
|
alert('수정에 실패했습니다.');
|
||||||
|
},
|
||||||
|
'post',
|
||||||
|
'json',
|
||||||
|
{'Content-Type': 'application/json'}
|
||||||
|
);
|
||||||
|
};
|
||||||
|
const closeModal = () => {
|
||||||
|
document.querySelector(".modal02").ui.close();
|
||||||
|
if (visitDatePicker) {
|
||||||
|
visitDatePicker.destroy();
|
||||||
|
visitDatePicker = null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
</section>
|
||||||
</div>
|
</div>
|
||||||
</html>
|
</html>
|
||||||
Reference in New Issue
Block a user