diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java index 27203e78..85a45761 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java @@ -13,8 +13,8 @@ public class ResearchersHouseholdVisitDto { private String householdNum; private String ownerName; private String visitDate; + private String managementType; + private String content; private String isGiftSentFlag; - private String memo; private LocalDateTime createdAt; - } diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index e889f12f..b08ac843 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -111,20 +111,22 @@ select count(*) - from researcher_household_visit rhv + from household_visit rhv + join researcher_has_household rhh on rhh.household_seq = rhv.household_seq + join admin a on a.seq = rhh.admin_seq where rhv.is_deleted = false - and rhv.admin_seq = #{seq} + and rhh.admin_seq = #{seq} and TO_CHAR(rhv.visit_date ,'YYYYMM')= #{searchMonth} @@ -145,7 +149,7 @@ - update researcher_household_visit + update researcher_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 bb70956a..4cf4e946 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -269,8 +269,8 @@ ${ct.householdNum} ${ct.ownerName} ${ct.visitDate} - ${ct.memo} - ${ct.memo} + ${ct.managementType} + ${ct.content} ${ct.createdAt} ${ct.isGiftSentFlag}