조사원 현황 - 임가 방문정보 수정

This commit is contained in:
주수현
2025-06-19 13:42:13 +09:00
parent 16ab3f4ae6
commit 2402be3b44
13 changed files with 303 additions and 75 deletions

View File

@@ -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;
}

View File

@@ -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();

View File

@@ -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);
}

View File

@@ -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;
}

View File

@@ -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));

View File

@@ -40,4 +40,6 @@ class ResearcherController {
return "researcher/detail";
}
}

View File

@@ -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;
}

View File

@@ -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);

View File

@@ -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);

View File

@@ -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);

View File

@@ -148,8 +148,31 @@
</if>
</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 researcher_household_visit
update household_visit
set is_deleted = true,
deleted_at = NOW(),
deleted_by = #{deletedBy}

View File

@@ -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 @@
<tr data-id="${ct.id}">
<td>
<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>
</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.visitDate}</td>
<td>${ct.managementType}</td>

View File

@@ -13,56 +13,59 @@
<div class="modal-content">
<div class="modal-content-inner">
<section>
<table class="type-form confirm" th:object="${researcherDto}" >
<tbody>
<tr>
<th>방문일</th>
<td>
<span th:text="*{id}"></span>
</td>
<th>관리분야</th>
<td>
<span th:text="*{name}"></span>
</td>
</tr>
<tr>
<th>내용</th>
<td>
<span th:text="*{regionMainCodeName}"></span>
</td>
</tr>
<tr>
<th>답례품 전달</th>
<td>
<div class="component-input">
<label class="radio-inner">
<input type="radio" id="radio_status_keep" name="survey_status">
<span class="radio-item">
<span class="radio-txt">전달</span>
</span>
</label>
</div>
<div class="component-input">
<label class="radio-inner">
<input type="radio" id="radio_status_drop" name="survey_status">
<span class="radio-item">
<span class="radio-txt">미전달</span>
</span>
</label>
</div>
</td>
</tr>
<form autocomplete="off" method="get" name="householdVisitReqForm" >
<input type="hidden" name="id" id="id" />
<table class="type-form confirm" >
<tbody id="household-visit-detail">
<tr>
<th>방문일</th>
<td>
<input id="visitDate" class="flatpickr" name="visitDate" type="text" placeholder="방문일을 선택하세요"/>
</td>
<th>관리분야</th>
<td>
<select id="managementType" name="managementType">
<option value="">선택하세요</option>
</select>
</td>
</tr>
<tr>
<th>내용</th>
<td>
<textarea id="content" name="content" rows="5" cols="50"></textarea>
</td>
</tr>
<tr>
<th>답례품 전달</th>
<td>
<div class="component-input">
<label class="radio-inner">
<input type="radio" id="is_gift_sent_y" name="isGiftSent">
<span class="radio-item">
<span class="radio-txt">전달</span>
</span>
</label>
</div>
<div class="component-input">
<label class="radio-inner">
<input type="radio" id="is_gift_sent_n" name="isGiftSent">
<span class="radio-item">
<span class="radio-txt">미전달</span>
</span>
</label>
</div>
</td>
</tr>
</tbody>
</table>
<!-- 등록 버튼 -->
<div class="component-btns bottom-btn-group" th:fragment="modalButtons">
<div class="btns-row align-right">
<button type="button" class="btn btn-primary" onclick="registerHouseholds()">
<span class="btn-txt">등록</span>
<button type="button" class="btn btn-primary" onclick="updateHouseholdVisit()">
<span class="btn-txt">수정</span>
</button>
</div>
</div>
</form>
</section>
</div>
<button class="modal-close" onclick="closeModal()"></button>
@@ -70,17 +73,131 @@
</div>
</div>
</div>
<section layout:fragment="script">
<script th:inline="javascript">
let visitDatePicker;
<script th:inline="javascript">
const showHouseholdModal2 = (seq) => {
console.log(seq);
document.querySelector(".modal02").ui.open();
document.getElementById('visitDate').addEventListener('change', function (e) {
console.log("날짜 변경됨:", e.target.value);
});
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>
</html>