From f2895d24b638d59e65f6cd0d35772ceccbc61ca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 16 Jun 2025 19:03:42 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=EA=B1=B0=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/ResearcherMapper.java | 5 ++ .../researcher/service/ResearcherService.java | 3 +- .../service/ResearcherServiceImpl.java | 14 ++++- .../researcher/web/ResearcherController.java | 8 ++- .../web/model/MappingHouseholdListReqVO.java | 13 +++++ .../model/MappingHouseholdListUIReqVO.java | 22 -------- .../mappers/researcher/ResearcherMapper.xml | 43 ++++++++++++--- .../common/modal-household-mapping.html | 53 ++++++++++++------- .../templates/researcher/detail.html | 7 +-- 9 files changed, 106 insertions(+), 62 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListReqVO.java delete mode 100644 admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListUIReqVO.java 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 0f5f1947..30a63b6b 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 @@ -21,4 +21,9 @@ public interface ResearcherMapper { List visitHouseholdList(ResearchersDetailReqVO reqVO); Long visitHouseholdListCountAll(ResearchersDetailReqVO 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); + + } 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 819e4bc7..3fd995ce 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 @@ -5,7 +5,7 @@ import app.module.admin.usecase.researcher.persistence.model.ResearchersDto; import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto; import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto; import app.module.admin.usecase.researcher.web.model.HouseholdSearchReqVO; -import app.module.admin.usecase.researcher.web.model.MappingHouseholdListUIReqVO; +import app.module.admin.usecase.researcher.web.model.MappingHouseholdListReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO; import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; import org.springframework.data.domain.Page; @@ -20,4 +20,5 @@ public interface ResearcherService { Page visitHouseholdList(ResearchersDetailReqVO reqVO); Integer visitHouseholdDelete(List selectIds); Page searchMappingHousehold(HouseholdSearchReqVO reqVO); + Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO); } 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 f1b59d5a..a3f03ce3 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 @@ -9,7 +9,7 @@ import app.module.admin.usecase.researcher.persistence.model.ResearchersDto; import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto; import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto; import app.module.admin.usecase.researcher.web.model.HouseholdSearchReqVO; -import app.module.admin.usecase.researcher.web.model.MappingHouseholdListUIReqVO; +import app.module.admin.usecase.researcher.web.model.MappingHouseholdListReqVO; 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; @@ -77,4 +77,16 @@ public class ResearcherServiceImpl implements ResearcherService { return new PageImpl<>(householdsStatus, pageable, householdsStatus.isEmpty() ? 0 : householdsStatus.get(0).getTotal()); } + + @Override + public Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO) { + int i = 0; + String deletedBy = CommonUtil.getLoginUsername(); + for(Integer householdSeq : reqVO.getSelectedIds()) { + researcherMapper.deleteHouseholdResearcherMapping(reqVO.getResearcherSeq(), householdSeq,deletedBy); + i += researcherMapper.insertHouseholdResearcherMapping(reqVO.getResearcherSeq(), householdSeq,deletedBy); + } + + return i; + } } 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 8ceea34f..1af34d21 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 @@ -69,10 +69,8 @@ class ResearcherController { return ResponseEntity.status(HttpStatus.OK).body(researcherService.searchMappingHousehold(reqVO)); } - @PostMapping("/mappingHousehold/") - @ResponseBody - public String registerSurveyor(@RequestParam("surveyorId") String surveyorId) { - //surveyorService.registerSurveyor(surveyorId); - return "success"; + @PostMapping("/mappingHousehold/update") + ResponseEntity updateMappingHousehold(@RequestBody MappingHouseholdListReqVO reqVO ) { + return ResponseEntity.status(HttpStatus.OK).body(researcherService.updateMappingHousehold(reqVO)); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListReqVO.java new file mode 100644 index 00000000..a78b0687 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListReqVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.researcher.web.model; + +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + +@Getter +@Setter +public class MappingHouseholdListReqVO { + private List selectedIds; + private Integer researcherSeq; +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListUIReqVO.java deleted file mode 100644 index 279a5ca4..00000000 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListUIReqVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.admin.usecase.researcher.web.model; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class MappingHouseholdListUIReqVO { - private Integer page; - private Integer size; - private String searchRegionMainCode; - - public Integer getPage() { - // 요청 페이지 넘버 - 초기값 `0` - return page != null ? page : 0; - } - - public Integer getSize() { - // 페이지 당 아이템 수 - 초기값 `10` - return size != null ? size : 10; - } -} diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index 98f11d71..e889f12f 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -83,16 +83,16 @@ im.code_text AS industry_middle_code_name, case h.is_panel when false then '유지' when true then '탈락' end panel_flag from household h - join admin_has_role ahr ON h.seq = ahr.admin_seq + join researcher_has_household rhh ON h.seq = rhh.household_seq and rhh.is_deleted = false left join uicode rm ON rm.parent_id = 'code.region.main' AND rm.id = h.region_main_code left join uicode rs ON rs.parent_id = 'code.region.sub' AND rs.id = h.region_sub_code left join uicode rd ON rd.parent_id = 'code.region.detail' AND rd.id = h.region_detail_code 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 ahr.admin_seq = #{seq} - + where 1=1 + + and rhh.admin_seq = #{seq} + LIMIT #{size} OFFSET #{page}*#{size} @@ -100,10 +100,10 @@ select count(*) 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 + join researcher_has_household rhh ON h.seq = rhh.household_seq and rhh.is_deleted = false + where 1=1 - and ahr.admin_seq = #{seq} + and rhh.admin_seq = #{seq} @@ -155,4 +155,31 @@ ) + + update researcher_has_household + set is_deleted = true, + deleted_at = NOW(), + deleted_by = #{deletedBy} + where household_seq = #{householdSeq} + + + + insert into researcher_has_household( + id, + admin_seq, + household_seq, + created_at, + created_by, + updated_at, + updated_by + )values( + nextval('household_has_role_seq'), + #{researcherSeq}, + #{householdSeq}, + NOW(), + #{createdBy}, + NOW(), + #{createdBy} + ) + \ No newline at end of file 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 6825feff..692f52b7 100644 --- a/admin/src/main/resources/templates/common/modal-household-mapping.html +++ b/admin/src/main/resources/templates/common/modal-household-mapping.html @@ -15,8 +15,10 @@
- + + +
@@ -141,8 +143,11 @@
diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 8f8ca82c..bb70956a 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -61,7 +61,7 @@

-
@@ -236,7 +236,6 @@ ); } - // 임가 방문 정보 const getHouseholdVisitList = (pageNo) => { const f = document.householdReqForm; @@ -359,10 +358,6 @@ } } - - - -