From cb8525c7b2b6084e1f685b3c36bf792bbd572efe Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 14 Jul 2025 17:46:15 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=88=98=EC=A0=95=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/web/UpdateNoticeController.java | 6 ++- .../SaveHouseholdVisitInfoDao.java | 31 +++++++----- .../SaveHouseholdVisitInfoMapper.java | 2 + .../adpaters/persistence/ResearcherDao.java | 4 ++ .../persistence/ResearcherMapper.java | 1 + .../model/ResearchersVisitDetailReqVO.java | 3 +- .../GetHouseholdVisitInfosMapper.xml | 2 +- .../SaveHouseholdVisitInfoMapper.xml | 11 +++++ .../mappers/researcher/ResearcherMapper.xml | 20 ++++++-- .../common/modal-household-mapping.html | 7 +-- .../communication/notice/notices.html | 37 ++++++-------- .../communication/suggestions/{id}.html | 2 +- .../households/modal/modal-visit-info.html | 2 +- .../households/tab/household-visit.html | 3 +- .../templates/researcher/detail.html | 13 ++++- .../modal/modal-household-visit.html | 49 +++++++++++-------- 16 files changed, 121 insertions(+), 72 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java index 35996152..d296b14d 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java @@ -43,8 +43,10 @@ class UpdateNoticeController { updateFilePortIn.operate( new UpdateFileCmd( reqVO.getId(), - reqVO.getFileMappingId().stream().map(Long::parseLong).toList(), - FileUploadType.NOTICE) + reqVO.getFileMappingId() != null + ? reqVO.getFileMappingId().stream().map(Long::parseLong).toList() + : List.of(), + FileUploadType.NOTICE) ); updateNoticePortIn.operate( diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java index d008d48e..75aff5ef 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java @@ -10,19 +10,24 @@ import org.springframework.transaction.annotation.Transactional; @Repository @RequiredArgsConstructor class SaveHouseholdVisitInfoDao implements SaveHouseholdVisitInfoPortOut { - private final SaveHouseholdVisitInfoMapper mapper; + private final SaveHouseholdVisitInfoMapper mapper; - @Override - @Transactional - public void operate(SaveHouseholdVisitInfoCmd cmd) { - if (cmd.getVisitInfoId() != null) { - mapper.findById(cmd.getHouseholdSeq()) - .ifPresentOrElse( - v -> mapper.updateHouseholdVisitInfo(AuditUtil.update(cmd)), - () -> { throw new IllegalArgumentException("방문정보가 없습니다."); } - ); - } else { - mapper.createHouseholdVisitInfo(AuditUtil.create(cmd)); + @Override + @Transactional + public void operate(SaveHouseholdVisitInfoCmd cmd) { + // 답례품 전달 완료일 경우 기존 방문들 중 true → false로 변경 + if (Boolean.TRUE.equals(cmd.getIsGiftSent())) { + mapper.updateGiftSentToFalse(AuditUtil.update(cmd)); + } + + if (cmd.getVisitInfoId() != null) { + mapper.findById(cmd.getHouseholdSeq()) + .ifPresentOrElse(v -> mapper.updateHouseholdVisitInfo(AuditUtil.update(cmd)), + () -> { + throw new IllegalArgumentException("방문정보가 없습니다."); + }); + } else { + mapper.createHouseholdVisitInfo(AuditUtil.create(cmd)); + } } - } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoMapper.java index 294a2f83..e26a152b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoMapper.java @@ -9,4 +9,6 @@ public interface SaveHouseholdVisitInfoMapper { Optional findById(Long id); void createHouseholdVisitInfo(SaveHouseholdVisitInfoCmd cmd); void updateHouseholdVisitInfo(SaveHouseholdVisitInfoCmd cmd); + void updateGiftSentToFalse(SaveHouseholdVisitInfoCmd cmd); + } 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 d2e68579..32274c55 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 @@ -67,6 +67,10 @@ public class ResearcherDao implements ResearcherPortOut { @Override @UpdateCommand public Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO) { + if(Boolean.TRUE.equals(reqVO.getIsGiftSent())) { + researcherMapper.updateGiftSentToFalse(reqVO); + } + return researcherMapper.updateVisitHousehold(reqVO); } 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 ad01f66c..809977dc 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 @@ -21,6 +21,7 @@ public interface ResearcherMapper { List visitHouseholdList(ResearchersDetailReqVO reqVO); ResearchersHouseholdVisitDto visitHouseholdDetail(Integer id); Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO); + void updateGiftSentToFalse(ResearchersVisitDetailReqVO reqVO); Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO); VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO); Integer visitHouseholdDelete(@Param("selectIds") List selectIds,@Param("deletedBy") String deletedBy); 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 index 0aef8900..9e120802 100644 --- 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 @@ -12,8 +12,9 @@ import java.time.LocalDateTime; @Setter public class ResearchersVisitDetailReqVO extends AuditCommand { private Integer id; + private Long householdSeq; private LocalDate visitDate; private ManagementType managementType; private String content; - private String isGiftSent; + private Boolean isGiftSent; } diff --git a/admin/src/main/resources/mappers/household/GetHouseholdVisitInfosMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdVisitInfosMapper.xml index f5186220..d7397d73 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdVisitInfosMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdVisitInfosMapper.xml @@ -17,6 +17,6 @@ WHERE household_seq = #{householdSeq} AND TO_CHAR(visit_date, 'YYYYMM') = #{recordMonth} AND hv.is_deleted = false - ORDER BY hv.created_at + ORDER BY hv.visit_date \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/SaveHouseholdVisitInfoMapper.xml b/admin/src/main/resources/mappers/household/SaveHouseholdVisitInfoMapper.xml index b6f15d51..cd9f2cca 100644 --- a/admin/src/main/resources/mappers/household/SaveHouseholdVisitInfoMapper.xml +++ b/admin/src/main/resources/mappers/household/SaveHouseholdVisitInfoMapper.xml @@ -37,6 +37,17 @@ WHERE id = #{visitInfoId} + + /* updateGiftSentToFalse : 동일 household_seq 의 다른 방문 중 전달여부 true → false */ + UPDATE household_visit + SET is_gift_sent = false + WHERE household_seq = #{householdSeq} + AND TO_CHAR(visit_date, 'YYYYMM') = TO_CHAR(TO_DATE(#{visitDate}, 'YYYY-MM-DD'), 'YYYYMM') + AND is_gift_sent = true + AND (#{visitInfoId} IS NULL OR id != #{visitInfoId}) + AND is_deleted = false + + + + /* updateGiftSentToFalse : 동일 household_seq 의 다른 방문 중 전달여부 true → false */ + UPDATE household_visit + SET is_gift_sent = false + WHERE household_seq = #{householdSeq} + AND TO_CHAR(visit_date, 'YYYYMM') = TO_CHAR(#{visitDate}, 'YYYYMM') + AND is_gift_sent = true + AND (#{id} IS NULL OR id != #{id}) + AND is_deleted = false + + update household_visit set visit_date = #{visitDate}, diff --git a/admin/src/main/resources/templates/common/modal-household-mapping.html b/admin/src/main/resources/templates/common/modal-household-mapping.html index 5e250e2a..073890fb 100644 --- a/admin/src/main/resources/templates/common/modal-household-mapping.html +++ b/admin/src/main/resources/templates/common/modal-household-mapping.html @@ -121,7 +121,7 @@ -
+
@@ -133,7 +133,7 @@
- + @@ -215,7 +215,7 @@ `); }); // Pagination 구성하기 - const paging = $('.paging'); + const paging = $('.mapping-paging'); paging.empty(); paging.append( uiUtil.getPagingUI(pageNo, response.size, response.totalPages, @@ -257,6 +257,7 @@ function (response) { if (response === selectedIds.length) { alert('맵핑 완료되었습니다.'); + getHouseholdList(0); } document.querySelector(".modal01").ui.close(); }, diff --git a/admin/src/main/resources/templates/communication/notice/notices.html b/admin/src/main/resources/templates/communication/notice/notices.html index 9d463823..f620d145 100644 --- a/admin/src/main/resources/templates/communication/notice/notices.html +++ b/admin/src/main/resources/templates/communication/notice/notices.html @@ -20,27 +20,21 @@

- 검색필드 + 공지사항

-
- -
-
- -
-
-

- 검색필드 -

-
-
-
- +
+
+ +
+
+
+ +
@@ -48,18 +42,17 @@

- 검색필드 + 노출여부

-
-
diff --git a/admin/src/main/resources/templates/communication/suggestions/{id}.html b/admin/src/main/resources/templates/communication/suggestions/{id}.html index 77298298..78a0e569 100644 --- a/admin/src/main/resources/templates/communication/suggestions/{id}.html +++ b/admin/src/main/resources/templates/communication/suggestions/{id}.html @@ -54,7 +54,7 @@

내용

- +
diff --git a/admin/src/main/resources/templates/households/modal/modal-visit-info.html b/admin/src/main/resources/templates/households/modal/modal-visit-info.html index 5f5f997e..759b0f0d 100644 --- a/admin/src/main/resources/templates/households/modal/modal-visit-info.html +++ b/admin/src/main/resources/templates/households/modal/modal-visit-info.html @@ -36,7 +36,7 @@
+ placeholder="방문일을 입력해주세요" /> 달력 diff --git a/admin/src/main/resources/templates/households/tab/household-visit.html b/admin/src/main/resources/templates/households/tab/household-visit.html index 28398083..59b357cc 100644 --- a/admin/src/main/resources/templates/households/tab/household-visit.html +++ b/admin/src/main/resources/templates/households/tab/household-visit.html @@ -13,7 +13,7 @@ -
@@ -54,6 +54,7 @@ const tbody = $('.tab-content.household-visit tbody'); tbody.empty(); + $('#visitAddBtn').toggle(response.length < 2); if(response.length === 0) { tbody.append(`등록이 필요합니다.`); diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 30c474ec..872f6851 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -177,6 +177,12 @@ + +
\ No newline at end of file