ythong/kccf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/lcltt-jeonnam-gwangju' — 지방문화원 시.도 '전남광주' 통합 버튼

Browse Source
This commit is contained in:
ythong 2026-07-08 15:55:16 +09:00
commit 9ab76a8926
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/egovframework/mapper/kccf/lcltt/LclttDAO.xml
View File

@ -31,7 +31,7 @@
AND A.AREA_SUB_CODE = B.DETAIL_CODE
]]>
<if test="searchAreaCode != null and searchAreaCode != ''">
AND A.AREA_CODE = #{searchAreaCode}
AND INSTR(','||#{searchAreaCode}||',', ','||A.AREA_CODE||',') > 0
</if>
<if test="searchLclttNm != null and searchLclttNm != ''">
AND A.LCLTT_NM LIKE '%'||#{searchLclttNm}||'%'
@ -193,7 +193,7 @@
WHERE A.DELETE_AT = 'N'
AND A.AREA_SUB_CODE = C.DETAIL_CODE
<if test="searchAreaCode != null and searchAreaCode != ''">
AND A.AREA_CODE = #{searchAreaCode}
AND INSTR(','||#{searchAreaCode}||',', ','||A.AREA_CODE||',') > 0
</if>
<if test="searchAreaSubCode != null and searchAreaSubCode != ''">
AND A.AREA_SUB_CODE LIKE (SELECT CASE WHEN SUBSTR(#{searchAreaSubCode}, 3) = '000' THEN SUBSTR(#{searchAreaSubCode},0, 2)||'%' ELSE #{searchAreaSubCode}||'%' END FROM dual)

13
src/main/webapp/WEB-INF/jsp/kccf/lcltt/listLclttFind.jsp
View File

@ -59,8 +59,21 @@ li .title-end {
<label class="arrow mr-5" style="text-align: left;">시.도</label>
<div>
<button type="button" id="searchAreaCodeBtn" name="searchAreaCodeBtn" class="btn btn-md btn-min btn-default btn-gray mr-1 mb-1" onclick="fnAreaCodeBtn();">전체</button>
<%-- 광주, 전남 통합: 두 지역 코드 미리 조회 --%>
<c:set var="gwangjuCode" value="" />
<c:set var="jeonnamCode" value="" />
<c:forEach items="${areaCodeList}" var="areaCodeItem">
<c:if test="${areaCodeItem.aditAtrbInfoValue1 == '광주'}"><c:set var="gwangjuCode" value="${areaCodeItem.detailCode}" /></c:if>
<c:if test="${areaCodeItem.aditAtrbInfoValue1 == '전남'}"><c:set var="jeonnamCode" value="${areaCodeItem.detailCode}" /></c:if>
</c:forEach>
<%-- 광주, 전남 버튼은 없애고, '전남광주' 버튼을 서울과 부산 사이에 배치 --%>
<c:forEach items="${areaCodeList}" var="areaCodeList">
<c:if test="${areaCodeList.aditAtrbInfoValue1 != '광주' && areaCodeList.aditAtrbInfoValue1 != '전남'}">
<button type="button" id="searchAreaCodeBtn_${areaCodeList.detailCode}" name="searchAreaCodeBtn" class="btn btn-md btn-min btn-default btn-gray mr-1 mb-1" onclick="fnAreaCodeBtn('${areaCodeList.detailCode}');">${areaCodeList.aditAtrbInfoValue1}</button>
</c:if>
<c:if test="${areaCodeList.aditAtrbInfoValue1 == '서울'}">
<button type="button" id="searchAreaCodeBtn_${gwangjuCode}_${jeonnamCode}" name="searchAreaCodeBtn" class="btn btn-md btn-min btn-default btn-gray mr-1 mb-1" onclick="fnAreaCodeBtn('${gwangjuCode},${jeonnamCode}');">전남광주</button>
</c:if>
</c:forEach>
<input type="hidden" id="searchAreaCode" name="searchAreaCode" value="${searchVO.searchAreaCode}"/>
</div>

13
src/main/webapp/WEB-INF/jsp/mng/lcltt/listLcltt.jsp
View File

@ -25,8 +25,21 @@
<label class="arrow">시.도</label>
<div class="row-df">
<button type="button" id="searchAreaCodeBtn" name="searchAreaCodeBtn" class="btn btn-sm btn-lclttBtn mr-1 hover" onclick="fnAreaCodeBtn('', this);" style="margin-bottom: 5px; margin-top: 5px;">전체</button>
<%-- 광주, 전남 통합: 두 지역 코드 미리 조회 --%>
<c:set var="gwangjuCode" value="" />
<c:set var="jeonnamCode" value="" />
<c:forEach items="${areaCodeList}" var="areaCodeItem">
<c:if test="${areaCodeItem.aditAtrbInfoValue1 == '광주'}"><c:set var="gwangjuCode" value="${areaCodeItem.detailCode}" /></c:if>
<c:if test="${areaCodeItem.aditAtrbInfoValue1 == '전남'}"><c:set var="jeonnamCode" value="${areaCodeItem.detailCode}" /></c:if>
</c:forEach>
<%-- 광주, 전남 버튼은 없애고, '전남광주' 버튼을 서울과 부산 사이에 배치 --%>
<c:forEach items="${areaCodeList}" var="areaCodeList">
<c:if test="${areaCodeList.aditAtrbInfoValue1 != '광주' && areaCodeList.aditAtrbInfoValue1 != '전남'}">
<button type="button" id="searchAreaCodeBtn" name="searchAreaCodeBtn" class="btn btn-sm btn-lclttBtn mr-1" onclick="fnAreaCodeBtn('${areaCodeList.detailCode}', this);" style="margin-bottom: 5px; margin-top: 5px;">${areaCodeList.aditAtrbInfoValue1}</button>
</c:if>
<c:if test="${areaCodeList.aditAtrbInfoValue1 == '서울'}">
<button type="button" id="searchAreaCodeBtn" name="searchAreaCodeBtn" class="btn btn-sm btn-lclttBtn mr-1" onclick="fnAreaCodeBtn('${gwangjuCode},${jeonnamCode}', this);" style="margin-bottom: 5px; margin-top: 5px;">전남광주</button>
</c:if>
</c:forEach>
<input type="hidden" id="searchAreaCode" name="searchAreaCode" value=""/>
</div>