diff --git a/admin/src/main/java/app/module/admin/config/application/util/model/EnumDto.java b/admin/src/main/java/app/module/admin/config/application/util/model/EnumDto.java new file mode 100644 index 00000000..ef775127 --- /dev/null +++ b/admin/src/main/java/app/module/admin/config/application/util/model/EnumDto.java @@ -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; +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java index ec0be769..cbb109e5 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java @@ -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 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 managementTypeList = Arrays.stream(ManagementType.values()) + .map(type -> new EnumDto(type.name(), type.getDesc())) + .toList(); + return new ResearchersHouseholdVisitPopUpDto(result, managementTypeList); + } + @Override public Integer visitHouseholdDelete(List selectIds) { String deletedBy = CommonUtil.getLoginUsername(); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java index db557054..96b89a2d 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java @@ -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 mappingHouseholdList(ResearchersDetailReqVO reqVO); Long mappingHouseholdListCountAll(ResearchersDetailReqVO reqVO); List visitHouseholdList(ResearchersDetailReqVO reqVO); + ResearchersHouseholdVisitDto visitHouseholdDetail(Integer id); Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO); + Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO); Integer visitHouseholdDelete(@Param("selectIds") List 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(@Param("pageable") Pageable pageable, @Param("cmd") GetPopupHouseholdsCmd cmd); + } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitPopUpDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitPopUpDto.java new file mode 100644 index 00000000..b1a51de5 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitPopUpDto.java @@ -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 managementTypeList; +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java index cdac49cb..d38df218 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java @@ -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 selectIds) { return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdDelete(selectIds)); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java index 6d62b867..28a086e5 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java @@ -40,4 +40,6 @@ class ResearcherController { return "researcher/detail"; } + + } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java new file mode 100644 index 00000000..38b7fee2 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java @@ -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; +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java index ce675d33..ee7a2c8c 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java @@ -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 mappingHouseholdList(ResearchersDetailReqVO reqVO); Page visitHouseholdList(ResearchersDetailReqVO reqVO); + Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO); + ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id); Integer visitHouseholdDelete(List selectIds); Page searchMappingHousehold(HouseholdSearchReqVO reqVO); Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java index 339ebb63..047dac65 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java @@ -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 mappingHouseholdList(ResearchersDetailReqVO reqVO); Page visitHouseholdList(ResearchersDetailReqVO reqVO); + Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO); + ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id); Integer visitHouseholdDelete(List selectIds); Page searchMappingHousehold(HouseholdSearchReqVO reqVO); Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java index 55849eeb..43fc3ed1 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java @@ -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 list(ResearchersListReqVO reqVO){ return portOut.list(reqVO); } + @Override public ResearchersDto detail(Integer adminSeq){ return portOut.detail(adminSeq); } + @Override public Page mappingHouseholdList(ResearchersDetailReqVO reqVO){ return portOut.mappingHouseholdList(reqVO); } + @Override public Page 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 selectIds){ return portOut.visitHouseholdDelete(selectIds); } + @Override public Page searchMappingHousehold(HouseholdSearchReqVO reqVO){ return portOut.searchMappingHousehold(reqVO); } + @Override public Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO){ return portOut.updateMappingHousehold(reqVO); diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index 4f998561..73785ead 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -148,8 +148,31 @@ + + + + update household_visit + set visit_date = #{visitDate}, + content = #{content}, + management_type = #{managementType}, + is_gift_sent = #{isGiftSent}, + + where id = #{id} + + - update researcher_household_visit + update household_visit set is_deleted = true, deleted_at = NOW(), deleted_by = #{deletedBy} diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 5a74029d..31a06354 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -253,7 +253,7 @@ }; ajaxUtil._ajaxMethod( - '/api/researcher/visitHouseholdList', + '/api/researcher/visitHousehold/list', dataObj, function (response) { $('#household-visit-totalElements').text(response.totalElements); @@ -268,10 +268,10 @@ - ${ct.householdNum} + ${ct.householdNum} ${ct.ownerName} ${ct.visitDate} ${ct.managementType} diff --git a/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html b/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html index 7e9b3484..f8a38122 100644 --- a/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html +++ b/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html @@ -13,56 +13,59 @@ +
+ + 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; + } + }; + +
\ No newline at end of file