From f061085ce330e9717e3cebf4cf446d5c33dd3dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Sat, 14 Jun 2025 17:43:04 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=EC=82=AC=EC=9B=90=20=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/ResearcherMapper.java | 3 +- .../model/ResearchersHouseholdVisitDto.java | 2 +- .../researcher/service/ResearcherService.java | 4 +- .../service/ResearcherServiceImpl.java | 7 + .../researcher/web/ResearcherController.java | 27 ++- .../web/model/ResearchersDetailReqVO.java | 8 +- .../mappers/researcher/ResearcherMapper.xml | 42 +++-- .../templates/researcher/detail.html | 177 +++++++++++------- .../templates/researcher/researchers.html | 30 +-- 9 files changed, 178 insertions(+), 122 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java index afe2ec36..0f5f1947 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java @@ -6,6 +6,7 @@ import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingH import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -19,5 +20,5 @@ public interface ResearcherMapper { Long mappingHouseholdListCountAll(ResearchersDetailReqVO reqVO); List visitHouseholdList(ResearchersDetailReqVO reqVO); Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO); - + Integer visitHouseholdDelete(@Param("selectIds") List selectIds,@Param("deletedBy") String deletedBy); } 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 9a95e11d..27203e78 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 @@ -14,7 +14,7 @@ public class ResearchersHouseholdVisitDto { private String ownerName; private String visitDate; private String isGiftSentFlag; - private String Memo; + private String memo; private LocalDateTime createdAt; } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java index 578f6148..4c0a1b15 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java @@ -7,11 +7,13 @@ import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; import org.springframework.data.domain.Page; +import java.util.List; + public interface ResearcherService { Page list(ResearchersListReqVO reqVO); ResearchersDto detail(Integer adminSeq); Page mappingHouseholdList(ResearchersDetailReqVO reqVO); Page visitHouseholdList(ResearchersDetailReqVO reqVO); - + Integer visitHouseholdDelete(List selectIds); } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java index 1beb95c1..1d0edd71 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java @@ -7,6 +7,7 @@ import app.module.admin.usecase.researcher.persistence.model.ResearchersHousehol import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto; import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; +import app.module.core.config.application.util.CommonUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -53,4 +54,10 @@ public class ResearcherServiceImpl implements ResearcherService { long total = researcherMapper.visitHouseholdListCountAll(reqVO); return new PageImpl<>(result, pageable, total); } + + @Override + public Integer visitHouseholdDelete(List selectIds) { + String deletedBy = CommonUtil.getLoginUsername(); + return researcherMapper.visitHouseholdDelete(selectIds,deletedBy); + } } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java b/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java index 7a1c4b53..cc6b6af3 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java @@ -1,5 +1,6 @@ package app.module.admin.usecase.researcher.web; +import app.module.admin.config.application.util.DateUiUtil; import app.module.admin.usecase.researcher.service.ResearcherService; import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersDetailUIReqVO; @@ -10,11 +11,10 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.*; import app.module.admin.usecase.researcher.web.model.GetResearchersUIReqVO; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; @Controller @RequiredArgsConstructor @@ -35,19 +35,28 @@ class ResearcherController { return ResponseEntity.status(HttpStatus.OK).body(researcherService.list(reqVO)); } - @GetMapping(path = "/{seq}") - public String operateDetail(Model model, @PathVariable Integer seq, @ModelAttribute("reqVO") ResearchersDetailUIReqVO reqVO) { - model.addAttribute("researcherDto", researcherService.detail(seq));; + @GetMapping(path = "/{adminSeq}") + public String operateDetail(Model model, @PathVariable Integer adminSeq, @ModelAttribute("reqVO") ResearchersDetailUIReqVO reqVO) { + model.addAttribute("researcherDto", researcherService.detail(adminSeq)); + model.addAttribute("monthList", DateUiUtil.getRecentMonths(13)); + model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue()); return "researcher/detail"; } @GetMapping(path = "/mappingHouseholdList") - ResponseEntity mappingHouseholdList( @ModelAttribute("reqVO") ResearchersDetailReqVO reqVO) { + ResponseEntity mappingHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) { return ResponseEntity.status(HttpStatus.OK).body(researcherService.mappingHouseholdList(reqVO)); } @GetMapping(path = "/visitHouseholdList") - ResponseEntity visitHouseholdList( @ModelAttribute("reqVO") ResearchersDetailReqVO reqVO) { + ResponseEntity visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) { return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdList(reqVO)); } + + @DeleteMapping(path = "/visitHousehold/remove") + ResponseEntity visitHouseholdDelete( @RequestBody List selectIds) { + return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdDelete(selectIds)); + } + + } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailReqVO.java index d7791876..aa125d49 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailReqVO.java @@ -1,19 +1,15 @@ package app.module.admin.usecase.researcher.web.model; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; @Getter @Setter -@AllArgsConstructor -@EqualsAndHashCode public class ResearchersDetailReqVO { private Integer page; private Integer size; - private Integer adminSeq; - private String searchMonthly; + private Integer seq; + private String searchMonth; public Integer getPage() { // 요청 페이지 넘버 - 초기값 `0` diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index 2d70da05..b9872a93 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -11,7 +11,7 @@ a.name, a.phone, max(u.code_text) AS region_main_code_name, - case a.account_disabled when false then '활성화' when true then '비활성화' end account_disabled_flag + case a.account_disabled when false then '사용' when true then '미사용' end account_disabled_flag from admin a join admin_has_role ahr ON a.seq = ahr.admin_seq left join uicode u ON u.parent_id = 'code.region.main' AND u.id = a.region_main_code @@ -25,6 +25,9 @@ and a.phone LIKE CONCAT('%', #{searchValue}, '%') + + and a.region_main_code = #{searchArea} + and a.account_disabled = #{searchAccountDisabled} @@ -56,7 +59,7 @@ a.name, a.phone, u.code_text AS region_main_code_name, - case a.account_disabled when false then '활성화' when true then '비활성화' end account_disabled_flag + case a.account_disabled when false then '사용' when true then '미사용' end account_disabled_flag from admin a join admin_has_role ahr ON a.seq = ahr.admin_seq left join uicode u ON u.parent_id = 'code.region.main' AND u.id = a.region_main_code @@ -86,8 +89,8 @@ left join uicode il ON il.parent_id = 'code.industry.large' AND il.id = h.industry_large_code left join uicode im ON im.parent_id = 'code.industry.middle' AND im.id = h.industry_middle_code where ahr.role_id = 'ROLE_RESEARCHER' and ahr.is_deleted = false - - and a.seq = #{adminSeq} + + and ahr.admin_seq = #{seq} LIMIT #{size} OFFSET #{page}*#{size} @@ -98,8 +101,8 @@ from household h join admin_has_role ahr ON h.seq = ahr.admin_seq where ahr.role_id = 'ROLE_RESEARCHER' and ahr.is_deleted = false - - and a.admin_seq = #{adminSeq} + + and ahr.admin_seq = #{seq} @@ -108,7 +111,7 @@ select rhv.id, rhv.admin_seq, - rhv.household_seq + rhv.household_seq, h.household_num, h.owner_name, rhv.visit_date, @@ -119,8 +122,11 @@ join household h on rhv.household_seq = h.seq join admin a on a.seq = rhv.admin_seq where rhv.is_deleted = false - - and rhv.admin_seq = #{adminSeq} + + and rhv.admin_seq = #{seq} + + + and TO_CHAR(rhv.visit_date ,'YYYYMM')= #{searchMonth} LIMIT #{size} OFFSET #{page}*#{size} @@ -129,9 +135,23 @@ select count(*) from researcher_household_visit rhv where rhv.is_deleted = false - - and rhv.admin_seq = #{adminSeq} + + and rhv.admin_seq = #{seq} + + + and TO_CHAR(rhv.visit_date ,'YYYYMM')= #{searchMonth} + + update researcher_household_visit + set is_deleted = true, + deleted_at = NOW(), + deleted_by = #{deletedBy} + where id in ( + + #{item} + ) + + \ No newline at end of file diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 63e95c32..0715f255 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -2,7 +2,7 @@ -
+
@@ -42,10 +42,20 @@
+
+
@@ -55,27 +65,28 @@
- - - - - + + + + + +
- - - - - - - - - - - + + + + + + + + + + + @@ -84,29 +95,30 @@
-
+
+
-
- +
임가번호경영주명휴대폰번호실사지역세부지역업종 대분류업종 중분류1유지여부
임가번호경영주명휴대폰번호실사지역세부지역업종 대분류업종 중분류1유지여부
- - - - - - - - - - + + + + + + + + + + @@ -131,18 +143,39 @@ - - - + + + + + - - - + \ No newline at end of file diff --git a/admin/src/main/resources/templates/researcher/researchers.html b/admin/src/main/resources/templates/researcher/researchers.html index 9b28df26..290363dc 100644 --- a/admin/src/main/resources/templates/researcher/researchers.html +++ b/admin/src/main/resources/templates/researcher/researchers.html @@ -43,7 +43,7 @@ + th:text="${item.codeText}" th:value="${item.id}"> @@ -56,8 +56,8 @@
@@ -68,7 +68,7 @@ 초기화 @@ -106,15 +106,6 @@ - - - @@ -154,7 +145,7 @@ if (!$(response.content).length) { tbody.append(` - + `); } @@ -198,17 +189,6 @@ f.searchArea.value = ''; f.searchAccountDisabled.value = ''; } - - // 저장페이지 이동 - function goSave() { - location.href = '/board/articles/create'; - } - - // 수정페이지 이동 - function goUpdate(itemId) { - location.href = '/board/articles/' + itemId; - } - // 상세페이지 이동 function goDetail(seq) { location.href = '/researcher/' + seq;
- - 임가번호경영주명방문일관리분야내용작성일답례품 전달
+ + 임가번호경영주명방문일관리분야내용작성일답례품 전달
조사원이 존재하지 않습니다.조사원이 존재하지 않습니다.