Merge branch 'kangsun' into 'dev'
[BO] 공통코드 지역/세부지역, 업종대분류/업종중분류 - 계층형으로 일괄 변경 See merge request korea-research/korea-research!63
This commit is contained in:
@@ -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";
|
||||
}
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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(),
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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('<option value="">전체</option>');
|
||||
list.forEach(item => {
|
||||
const val = item.id.split('.').pop();
|
||||
const isSelected = item.id === selected ? 'selected' : '';
|
||||
$el.append(`<option value="${item.id}" ${isSelected}>${val}. ${item.codeText}</option>`);
|
||||
});
|
||||
};
|
||||
|
||||
const loadChildren = (parentId, selectedChild = '') => {
|
||||
$child.html('<option value="">전체</option>');
|
||||
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());
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
</div>
|
||||
<select class="select-list" id="regionSubCode" name="regionSubCode">
|
||||
<option value="" selected>전체</option>
|
||||
<option th:each="region : ${regionSubList}" th:value="${region.id}" th:text="${region.codeText}"></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="component-select">
|
||||
@@ -58,7 +57,6 @@
|
||||
</div>
|
||||
<select class="select-list" id="regionDetailCode" name="regionDetailCode">
|
||||
<option value="" selected>전체</option>
|
||||
<option th:each="subRegion : ${regionDetailList}" th:value="${subRegion.id}" th:text="${subRegion.codeText}"></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
@@ -142,6 +140,10 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script th:inline="javascript">
|
||||
const regionList = [[${regionSubList}]];
|
||||
</script>
|
||||
|
||||
<script th:inline="javascript">
|
||||
const showHouseholdModal = (button) => {
|
||||
const regionMainCode = button.getAttribute('data-region-main-code') || '';
|
||||
@@ -154,6 +156,13 @@
|
||||
existingModal.remove();
|
||||
}
|
||||
|
||||
// 지역, 세부지역 셀렉트박스 세팅
|
||||
setSelectBoxUiCode({
|
||||
codeList: regionList,
|
||||
parentSelector: '#regionSubCode',
|
||||
childSelector: '#regionDetailCode',
|
||||
});
|
||||
|
||||
document.querySelector(".modal01").ui.open();
|
||||
|
||||
// 초기 데이터 조회
|
||||
|
||||
@@ -131,22 +131,16 @@
|
||||
<th>지역<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
|
||||
<td>
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="regionSubCode" required>
|
||||
<select class="select-list" name="regionSubCode" id="regionSubCode" required>
|
||||
<option value="">전체</option>
|
||||
<option th:each="item : ${regionSubList}"
|
||||
th:value="${item.id}"
|
||||
th:text="${item.codeValue + '. ' + item.codeText}">
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
<th>세부 지역<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
|
||||
<td>
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="regionDetailCode" required>
|
||||
<select class="select-list" name="regionDetailCode" id="regionDetailCode" required>
|
||||
<option value="">전체</option>
|
||||
<option th:each="item : ${regionDetailList}"
|
||||
th:value="${item.id}"
|
||||
th:text="${item.codeValue + '. ' + item.codeText}">
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
@@ -165,22 +159,16 @@
|
||||
<th>업종 대분류</th>
|
||||
<td>
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="industryLargeCode">
|
||||
<select class="select-list" name="industryLargeCode" id="industryLargeCode">
|
||||
<option value="">전체</option>
|
||||
<option th:each="item : ${industryLargeList}"
|
||||
th:value="${item.id}"
|
||||
th:text="${item.codeValue + '. ' + item.codeText}">
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
<th>업종 중분류1</th>
|
||||
<td>
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="industryMiddleCode">
|
||||
<option value="">전체</option>
|
||||
<option th:each="item : ${industryMiddleList}"
|
||||
th:value="${item.id}"
|
||||
th:text="${item.codeValue + '. ' + item.codeText}">
|
||||
<select class="select-list" name="industryMiddleCode" id="industryMiddleCode">
|
||||
<option value="">전체</option>>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
@@ -269,6 +257,27 @@
|
||||
</section>
|
||||
|
||||
<section layout:fragment="script">
|
||||
<script th:inline="javascript">
|
||||
const regionList = [[${regionSubList}]];
|
||||
const industryLargeList = [[${industryLargeList}]];
|
||||
|
||||
$(document).ready(function () {
|
||||
// 지역, 세부지역 셀렉트박스 세팅
|
||||
setSelectBoxUiCode({
|
||||
codeList: regionList,
|
||||
parentSelector: '#regionSubCode',
|
||||
childSelector: '#regionDetailCode'
|
||||
});
|
||||
|
||||
// 업종 대분류, 중분류 셀렉트박스 세팅
|
||||
setSelectBoxUiCode({
|
||||
codeList: industryLargeList,
|
||||
parentSelector: '#industryLargeCode',
|
||||
childSelector: '#industryMiddleCode',
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
<script th:inline="javascript">
|
||||
// 임가번호 중복확인 변수
|
||||
let checkDuplicate = false;
|
||||
|
||||
@@ -78,11 +78,8 @@
|
||||
지역
|
||||
</p>
|
||||
</div>
|
||||
<select class="select-list" name="regionSubCode" th:field="*{regionSubCode}">
|
||||
<select class="select-list" name="regionSubCode" id="regionSubCode" th:field="*{regionSubCode}">
|
||||
<option value="">전체</option>
|
||||
<option th:each="item : ${regionSubList}"
|
||||
th:value="${item.id}"
|
||||
th:text="${item.codeValue + '. ' + item.codeText}">
|
||||
</select>
|
||||
</div>
|
||||
<div class="component-select">
|
||||
@@ -91,11 +88,8 @@
|
||||
세부지역
|
||||
</p>
|
||||
</div>
|
||||
<select class="select-list" name="regionDetailCode" th:field="*{regionDetailCode}">
|
||||
<select class="select-list" name="regionDetailCode" id="regionDetailCode" th:field="*{regionDetailCode}">
|
||||
<option value="">전체</option>
|
||||
<option th:each="item : ${regionDetailList}"
|
||||
th:value="${item.id}"
|
||||
th:text="${item.codeValue + '. ' + item.codeText}">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
@@ -109,11 +103,8 @@
|
||||
업종 대분류
|
||||
</p>
|
||||
</div>
|
||||
<select class="select-list" name="industryLargeCode" th:field="*{industryLargeCode}">
|
||||
<select class="select-list" name="industryLargeCode" id="industryLargeCode" th:field="*{industryLargeCode}">
|
||||
<option value="">전체</option>
|
||||
<option th:each="item : ${industryLargeList}"
|
||||
th:value="${item.id}"
|
||||
th:text="${item.codeValue + '. ' + item.codeText}">
|
||||
</select>
|
||||
</div>
|
||||
<div class="component-select">
|
||||
@@ -122,11 +113,8 @@
|
||||
업종 중분류
|
||||
</p>
|
||||
</div>
|
||||
<select class="select-list" name="industryMiddleCode" th:field="*{industryMiddleCode}">
|
||||
<select class="select-list" name="industryMiddleCode" id="industryMiddleCode" th:field="*{industryMiddleCode}">
|
||||
<option value="">전체</option>
|
||||
<option th:each="item : ${industryMiddleList}"
|
||||
th:value="${item.id}"
|
||||
th:text="${item.codeValue + '. ' + item.codeText}">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
@@ -309,6 +297,36 @@
|
||||
</section>
|
||||
|
||||
<section layout:fragment="script">
|
||||
<script th:inline="javascript">
|
||||
const regionList = [[${regionSubList}]];
|
||||
const selectedRegionSubCode = /*[[${reqVO.regionSubCode}]]*/ '';
|
||||
const selectedRegionDetailCode = /*[[${reqVO.regionDetailCode}]]*/ '';
|
||||
|
||||
const industryLargeList = [[${industryLargeList}]];
|
||||
const selectedIndustryLargeCode = /*[[${reqVO.industryLargeCode}]]*/ '';
|
||||
const selectedIndustryMiddleCode= /*[[${reqVO.industryMiddleCode}]]*/ '';
|
||||
|
||||
$(document).ready(function () {
|
||||
// 지역, 세부지역 셀렉트박스 세팅
|
||||
setSelectBoxUiCode({
|
||||
codeList: regionList,
|
||||
parentSelector: '#regionSubCode',
|
||||
childSelector: '#regionDetailCode',
|
||||
selectedParentCode: selectedRegionSubCode,
|
||||
selectedChildCode: selectedRegionDetailCode
|
||||
});
|
||||
|
||||
// 업종 대분류, 중분류 셀렉트박스 세팅
|
||||
setSelectBoxUiCode({
|
||||
codeList: industryLargeList,
|
||||
parentSelector: '#industryLargeCode',
|
||||
childSelector: '#industryMiddleCode',
|
||||
selectedParentCode: selectedIndustryLargeCode,
|
||||
selectedChildCode: selectedIndustryMiddleCode
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
<script th:inline="javascript">
|
||||
// 임가 목록 조회
|
||||
const getHouseholds = (pageNo) => {
|
||||
|
||||
@@ -141,24 +141,16 @@
|
||||
<th>지역<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
|
||||
<td>
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="regionSubCode" required>
|
||||
<select class="select-list" name="regionSubCode" id="regionSubCode" required>
|
||||
<option value="">전체</option>
|
||||
<option th:each="item : ${regionSubList}"
|
||||
th:value="${item.id}"
|
||||
th:text="${item.codeValue + '. ' + item.codeText}"
|
||||
th:selected="${item.id == householdInfo.regionSubCode}">
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
<th>세부 지역<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
|
||||
<td>
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="regionDetailCode" required>
|
||||
<select class="select-list" name="regionDetailCode" id="regionDetailCode" required>
|
||||
<option value="">전체</option>
|
||||
<option th:each="item : ${regionDetailList}"
|
||||
th:value="${item.id}"
|
||||
th:text="${item.codeValue + '. ' + item.codeText}"
|
||||
th:selected="${item.id == householdInfo.regionDetailCode}">
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
@@ -178,24 +170,16 @@
|
||||
<th>업종 대분류</th>
|
||||
<td>
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="industryLargeCode">
|
||||
<option value="">전체</option>
|
||||
<option th:each="item : ${industryLargeList}"
|
||||
th:value="${item.id}"
|
||||
th:text="${item.codeValue + '. ' + item.codeText}"
|
||||
th:selected="${item.id == householdInfo.industryLargeCode}">
|
||||
<select class="select-list" name="industryLargeCode" id="industryLargeCode">
|
||||
<option value="">전체</option>>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
<th>업종 중분류1</th>
|
||||
<td>
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="industryMiddleCode">
|
||||
<select class="select-list" name="industryMiddleCode" id="industryMiddleCode">
|
||||
<option value="">전체</option>
|
||||
<option th:each="item : ${industryMiddleList}"
|
||||
th:value="${item.id}"
|
||||
th:text="${item.codeValue + '. ' + item.codeText}"
|
||||
th:selected="${item.id == householdInfo.industryMiddleCode}">
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
@@ -296,6 +280,36 @@
|
||||
</section>
|
||||
|
||||
<section layout:fragment="script">
|
||||
<script th:inline="javascript">
|
||||
const regionList = [[${regionSubList}]];
|
||||
const selectedRegionSubCode = /*[[${householdInfo.regionSubCode}]]*/ '';
|
||||
const selectedRegionDetailCode = /*[[${householdInfo.regionDetailCode}]]*/ '';
|
||||
|
||||
const industryLargeList = [[${industryLargeList}]];
|
||||
const selectedIndustryLargeCode = /*[[${householdInfo.industryLargeCode}]]*/ '';
|
||||
const selectedIndustryMiddleCode= /*[[${householdInfo.industryMiddleCode}]]*/ '';
|
||||
|
||||
$(document).ready(function () {
|
||||
// 지역, 세부지역 셀렉트박스 세팅
|
||||
setSelectBoxUiCode({
|
||||
codeList: regionList,
|
||||
parentSelector: '#regionSubCode',
|
||||
childSelector: '#regionDetailCode',
|
||||
selectedParentCode: selectedRegionSubCode,
|
||||
selectedChildCode: selectedRegionDetailCode
|
||||
});
|
||||
|
||||
// 업종 대분류, 중분류 셀렉트박스 세팅
|
||||
setSelectBoxUiCode({
|
||||
codeList: industryLargeList,
|
||||
parentSelector: '#industryLargeCode',
|
||||
childSelector: '#industryMiddleCode',
|
||||
selectedParentCode: selectedIndustryLargeCode,
|
||||
selectedChildCode: selectedIndustryMiddleCode
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
<script th:inline="javascript">
|
||||
// 임가 수정
|
||||
const updateHousehold= () => {
|
||||
|
||||
@@ -23,6 +23,13 @@ class UICodeTopTierDao implements UICodeTopTierPortOut {
|
||||
return recursiveMapping(topTier);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public UICodeTopTier connect(String id) {
|
||||
UICode topTier = mapper.findTopTierId(id);
|
||||
return recursiveMapping(topTier);
|
||||
}
|
||||
|
||||
private UICodeTopTier recursiveMapping(UICode topTier) {
|
||||
List<UICode> children = mapper.findChildren(topTier.getId());
|
||||
|
||||
|
||||
@@ -7,5 +7,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
@Mapper
|
||||
public interface UICodeTopTierMapper {
|
||||
UICode findTopTier(); // parent_id IS NULL 인 UICode 조회
|
||||
UICode findTopTierId(String id); // UICode id 조회
|
||||
List<UICode> findChildren(String parentId); // 재귀 하위 코드
|
||||
}
|
||||
|
||||
@@ -5,4 +5,5 @@ import app.module.core.usecase.uicode.toptier.ports.application.domain.UICodeTop
|
||||
public interface UICodeTopTierPortIn {
|
||||
|
||||
UICodeTopTier connect();
|
||||
UICodeTopTier connect(String id);
|
||||
}
|
||||
|
||||
@@ -5,4 +5,5 @@ import app.module.core.usecase.uicode.toptier.ports.application.domain.UICodeTop
|
||||
public interface UICodeTopTierPortOut {
|
||||
|
||||
UICodeTopTier connect();
|
||||
UICodeTopTier connect(String id);
|
||||
}
|
||||
|
||||
@@ -16,4 +16,10 @@ public class UICodeTopTierService implements UICodeTopTierPortIn {
|
||||
public UICodeTopTier connect() {
|
||||
return portOut.connect();
|
||||
}
|
||||
|
||||
@Override
|
||||
public UICodeTopTier connect(String parentId) {
|
||||
return portOut.connect(parentId);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,4 +19,12 @@
|
||||
AND is_deleted = false
|
||||
ORDER BY order_no ASC
|
||||
</select>
|
||||
|
||||
<select id="findTopTierId"
|
||||
resultType="app.module.core.config.adapters.persistence.entity.UICode">
|
||||
SELECT id, code_text, order_no, parent_id
|
||||
FROM uicode
|
||||
WHERE id = #{id}
|
||||
AND is_deleted = false
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -35,7 +35,7 @@
|
||||
<span class="btn-txt">이전 정보 불러오기</span>
|
||||
</button>
|
||||
|
||||
|
||||
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
|
||||
<!-- <div class="component-input align-center" id="forestProductStatusDiv">-->
|
||||
<!-- <label class="checkbox-inner">-->
|
||||
<!-- <input type="checkbox" id="forestProductStatus" name="forestProductStatus"-->
|
||||
@@ -190,6 +190,7 @@
|
||||
const callPastInfoBtn = document.getElementById("callPastInfoBtn");
|
||||
|
||||
//데이터 없음 버튼
|
||||
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
|
||||
// const forestProductStatus = document.getElementById("forestProductStatus");
|
||||
|
||||
//등록 완료 버튼
|
||||
@@ -206,6 +207,7 @@
|
||||
if (ENV.data.pastStatus && ENV.data.pastStatus == "REGISTERED" && ENV.data.pastBankList.length > 0) {
|
||||
this.checkUsePastData();
|
||||
}
|
||||
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
|
||||
// }
|
||||
// else if (ENV.data.currentStatus == "NOTHING") {
|
||||
//
|
||||
@@ -322,13 +324,12 @@
|
||||
},
|
||||
updateLayout() {
|
||||
|
||||
|
||||
|
||||
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
|
||||
// const btn = document.getElementById("addItemBtn");
|
||||
// const isChecked = ENV.elementRefs.noDataCheckbox.checked;
|
||||
const btn = document.getElementById("addItemBtn");
|
||||
const icon = btn.querySelector("i");
|
||||
|
||||
// const icon = btn.querySelector("i");
|
||||
// const status = document.getElementById('forestProductStatusDiv');
|
||||
|
||||
const callPastInfoBtn = document.getElementById("callPastInfoBtn");
|
||||
|
||||
const next = document.getElementById('complateBtn');
|
||||
@@ -344,10 +345,10 @@
|
||||
count.textContent = total;
|
||||
totalItems.textContent = total;
|
||||
|
||||
|
||||
btn.disabled = isData;
|
||||
icon.classList.toggle("ico-add", !isData);
|
||||
icon.classList.toggle("ico-add-disabled", isData);
|
||||
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
|
||||
// btn.disabled = isData;
|
||||
// icon.classList.toggle("ico-add", !isData);
|
||||
// icon.classList.toggle("ico-add-disabled", isData);
|
||||
if (isData) {
|
||||
next.disabled = !isData;
|
||||
} else {
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
<span class="btn-txt">이전 정보 불러오기</span>
|
||||
</button>
|
||||
|
||||
|
||||
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
|
||||
<!-- <div class="component-input align-center" id="forestProductStatusDiv">-->
|
||||
<!-- <label class="checkbox-inner">-->
|
||||
<!-- <input type="checkbox" id="forestProductStatus" name="forestProductStatus"-->
|
||||
@@ -189,6 +189,7 @@
|
||||
const callPastInfoBtn = document.getElementById("callPastInfoBtn");
|
||||
|
||||
//데이터 없음 버튼
|
||||
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
|
||||
// const forestProductStatus = document.getElementById("forestProductStatus");
|
||||
|
||||
//등록 완료 버튼
|
||||
@@ -205,6 +206,7 @@
|
||||
if (ENV.data.pastStatus && ENV.data.pastStatus == "REGISTERED" && ENV.data.pastBankList.length > 0) {
|
||||
this.checkUsePastData();
|
||||
}
|
||||
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
|
||||
// } else if (ENV.data.currentStatus == "NOTHING") {
|
||||
//
|
||||
//
|
||||
@@ -313,10 +315,10 @@
|
||||
updateLayout() {
|
||||
|
||||
|
||||
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
|
||||
// const isChecked = ENV.elementRefs.noDataCheckbox.checked;
|
||||
const btn = document.getElementById("addItemBtn");
|
||||
const icon = btn.querySelector("i");
|
||||
|
||||
// const btn = document.getElementById("addItemBtn");
|
||||
// const icon = btn.querySelector("i");
|
||||
// const status = document.getElementById('forestProductStatusDiv');
|
||||
const callPastInfoBtn = document.getElementById("callPastInfoBtn");
|
||||
|
||||
@@ -334,10 +336,10 @@
|
||||
count.textContent = total;
|
||||
totalItems.textContent = total;
|
||||
|
||||
|
||||
btn.disabled = isData;
|
||||
icon.classList.toggle("ico-add", !isData);
|
||||
icon.classList.toggle("ico-add-disabled", isData);
|
||||
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
|
||||
// btn.disabled = isData;
|
||||
// icon.classList.toggle("ico-add", !isData);
|
||||
// icon.classList.toggle("ico-add-disabled", isData);
|
||||
if (isData) {
|
||||
next.disabled = !isData;
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user