diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java b/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java index c005301c..4c61700a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java @@ -2,6 +2,7 @@ package app.module.admin.usecase.household.createHouseholdUI.adapters.web; import app.module.admin.config.application.util.AdminUtil; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortIn; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -15,6 +16,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; class CreateHouseholdUIController { private final UICodeListPortIn uiCodeListPortIn; + private final UICodeTopTierPortIn uiCodeTopTierPortIn; @GetMapping(path = "/households/create") String operate(Model model, @ModelAttribute("reqVO") CreateHouseholdUIReqVO reqVO, @@ -28,14 +30,10 @@ class CreateHouseholdUIController { // 실사 model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main")); - // 지역 - model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub")); - // 세부지역 - model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail")); - // 업종 대분류 - model.addAttribute("industryLargeList", uiCodeListPortIn.connect("code.industry.large")); - // 업종 중분류1 - model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle")); + // 지역 + 세부지역 + model.addAttribute("regionSubList", uiCodeTopTierPortIn.connect("code.region.sub")); + // 업종 대분류 + 업종 중분류1 + model.addAttribute("industryLargeList", uiCodeTopTierPortIn.connect("code.industry.large")); return "households/create"; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/GetHouseholdsStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/GetHouseholdsStatusUIController.java index 0d269c18..8b9b9d5f 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/GetHouseholdsStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/GetHouseholdsStatusUIController.java @@ -7,6 +7,7 @@ import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.application.domain.AdminView; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortIn; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.ModelAttribute; @RequiredArgsConstructor class GetHouseholdsStatusUIController { private final UICodeListPortIn uiCodeListPortIn; + private final UICodeTopTierPortIn uiCodeTopTierPortIn; private final AdminViewPortIn adminViewPortIn; @GetMapping(path = "/households") @@ -43,14 +45,10 @@ class GetHouseholdsStatusUIController { model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main")); } - // 지역 - model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub")); - // 세부지역 - model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail")); - // 업종 대분류 - model.addAttribute("industryLargeList", uiCodeListPortIn.connect("code.industry.large")); - // 업종 중분류1 - model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle")); + // 지역 + 세부지역 + model.addAttribute("regionSubList", uiCodeTopTierPortIn.connect("code.region.sub")); + // 업종 대분류 + 업종 중분류1 + model.addAttribute("industryLargeList", uiCodeTopTierPortIn.connect("code.industry.large")); model.addAttribute("monthList", DateUiUtil.getRecentMonths(13)); model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue()); diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java index d041fb7a..2355b213 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java @@ -7,9 +7,11 @@ import app.module.admin.usecase.household.getHouseholdStatus.ports.application.d import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; import app.module.admin.usecase.household.updateHouseholdStatusUI.adapters.web.model.UpdateHouseholdStatusUIResVO; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortIn; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; @@ -22,6 +24,7 @@ class UpdateHouseholdStatusUIController { private final GetHouseholdStatusPortIn getHouseholdStatusPortIn; private final UICodeListPortIn uiCodeListPortIn; + private final UICodeTopTierPortIn uiCodeTopTierPortIn; @GetMapping(path = "/households/update/{seq}") String operate(@PathVariable Long seq, Model model, @@ -39,14 +42,10 @@ class UpdateHouseholdStatusUIController { // 실사 model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main")); - // 지역 - model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub")); - // 세부지역 - model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail")); - // 업종 대분류 - model.addAttribute("industryLargeList", uiCodeListPortIn.connect("code.industry.large")); - // 업종 중분류1 - model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle")); + // 지역 + 세부지역 + model.addAttribute("regionSubList", uiCodeTopTierPortIn.connect("code.region.sub")); + // 업종 대분류 + 업종 중분류1 + model.addAttribute("industryLargeList", uiCodeTopTierPortIn.connect("code.industry.large")); // 임가 상세 정보 @@ -59,12 +58,12 @@ class UpdateHouseholdStatusUIController { result.getHouseholdNum(), result.getHouseholdName(), result.getHouseholdAge(), - result.getHouseholdTel() != null ? result.getHouseholdTel().split("-")[0] : "", - result.getHouseholdTel() != null ? result.getHouseholdTel().split("-")[1] : "", - result.getHouseholdTel() != null ? result.getHouseholdTel().split("-")[2] : "", - result.getHouseholdPhone() != null ? result.getHouseholdPhone().split("-")[0] : "", - result.getHouseholdPhone() != null ? result.getHouseholdPhone().split("-")[1] : "", - result.getHouseholdPhone() != null ? result.getHouseholdPhone().split("-")[2] : "", + StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[0] : "", + StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[1] : "", + StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[2] : "", + StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[0] : "", + StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[1] : "", + StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[2] : "", result.getRegionMainCode(), result.getRegionSubCode(), result.getRegionDetailCode(), diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java index 3def1e15..f2f02b5b 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java @@ -6,6 +6,7 @@ import app.module.admin.usecase.researcher.adpaters.web.model.GetResearchersUIRe import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailUIReqVO; import app.module.admin.usecase.researcher.ports.ResearcherPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortIn; import app.module.core.usecase.uicode.view.ports.UICodeViewPortIn; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -22,6 +23,7 @@ import java.util.Objects; @RequestMapping(path = "/researcher") class ResearcherController { private final UICodeListPortIn uiCodeListPortIn; + private final UICodeTopTierPortIn uiCodeTopTierPortIn; private final ResearcherPortIn researcherPortIn; @GetMapping(path = "/researchers") @@ -45,10 +47,8 @@ class ResearcherController { model.addAttribute("researcherDto", researcherPortIn.detail(adminSeq)); model.addAttribute("monthList", DateUiUtil.getRecentMonths(13)); model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue()); - // 모달용 지역 - model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub")); - // 모달용 세부지역 - model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail")); + // 모달용 지역 + 세부지역 + model.addAttribute("regionSubList", uiCodeTopTierPortIn.connect("code.region.sub")); return "researcher/detail"; } diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index 388df9db..ed886c3f 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -89,7 +89,7 @@ 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 rd ON 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 1=1 diff --git a/admin/src/main/resources/static/ui/uiUtil.js b/admin/src/main/resources/static/ui/uiUtil.js index 583803ee..07f90d08 100644 --- a/admin/src/main/resources/static/ui/uiUtil.js +++ b/admin/src/main/resources/static/ui/uiUtil.js @@ -470,3 +470,50 @@ const limitMaxLength = (el) => { el.value = el.value.replace(/\D/g, '').slice(0, maxLength); } +/** + * 공통코드 기반의 2단계 셀렉트박스(부모/자식) UI를 구성하는 함수 + * + * @param {Object} codeList - 공통코드 리스트 객체 + * @param {string} parentSelector - 부모 셀렉트박스 셀렉터 (ex. '#regionSubCode') + * @param {string} childSelector - 자식 셀렉트박스 셀렉터 (ex. '#regionDetailCode') + * @param {string} selectedParentCode - 초기 선택할 부모 코드값 (ex. 'code.region.sub.31') + * @param {string} selectedChildCode - 초기 선택할 자식 코드값 (ex. 'code.region.detail.9') + */ +const setSelectBoxUiCode = ({ + codeList, + parentSelector, + childSelector, + selectedParentCode = '', + selectedChildCode = '' +}) => { + const $parent = $(parentSelector); + const $child = $(childSelector); + + if (!codeList?.nodes || !$parent.length || !$child.length) return; + + const renderOptions = ($el, list, selected) => { + $el.html(''); + list.forEach(item => { + const val = item.id.split('.').pop(); + const isSelected = item.id === selected ? 'selected' : ''; + $el.append(``); + }); + }; + + const loadChildren = (parentId, selectedChild = '') => { + $child.html(''); + if (!parentId) return; + + const parent = codeList.nodes.find(n => n.id === parentId); + if (!parent?.nodes) return; + renderOptions($child, parent.nodes, selectedChild); + }; + + renderOptions($parent, codeList.nodes, selectedParentCode); + if (selectedParentCode) loadChildren(selectedParentCode, selectedChildCode); + + $parent.on('change', function () { + loadChildren($(this).val()); + }); +}; + 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 135bfb87..5e250e2a 100644 --- a/admin/src/main/resources/templates/common/modal-household-mapping.html +++ b/admin/src/main/resources/templates/common/modal-household-mapping.html @@ -49,7 +49,6 @@