diff --git a/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnRegistAndViewVO.java b/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnRegistAndViewVO.java index e8271bf..483d918 100644 --- a/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnRegistAndViewVO.java +++ b/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnRegistAndViewVO.java @@ -208,4 +208,19 @@ public class CrdnRegistAndViewVO extends PagingVO { /** 검색 조건 - 가중 부과 대상 여부 */ private String schAgrvtnLevyTrgtYn; + /** 검색 조건 - 우편번호 */ + private String schZip; + + /** 검색 조건 - 지번 주소 */ + private String schLotnoAddr; + + /** 검색 조건 - 상세 주소 */ + private String schDtlAddr; + + /** 검색 조건 - 지번 본번 */ + private String schLotnoMno; + + /** 검색 조건 - 지번 부번 */ + private String schLotnoSno; + } \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRegistAndViewMapper_maria.xml b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRegistAndViewMapper_maria.xml index 5ee6a10..76043b1 100644 --- a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRegistAndViewMapper_maria.xml +++ b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRegistAndViewMapper_maria.xml @@ -99,6 +99,21 @@ AND c.AGRVTN_LEVY_TRGT_YN = #{schAgrvtnLevyTrgtYn} + + AND p.ZIP LIKE CONCAT('%', #{schZip}, '%') + + + AND p.LOTNO_ADDR LIKE CONCAT('%', #{schLotnoAddr}, '%') + + + AND p.DTL_ADDR LIKE CONCAT('%', #{schDtlAddr}, '%') + + + AND p.LOTNO_MNO = #{schLotnoMno} + + + AND p.LOTNO_SNO = #{schLotnoSno} + ORDER BY c.CRDN_YR DESC, c.CRDN_NO DESC limit #{startIndex}, #{perPage} /* 서버사이드 페이징 처리 */ @@ -110,6 +125,7 @@ /* CrdnRegistAndViewMapper.selectListTotalCount : 단속 목록 총 개수 조회 */ SELECT COUNT(*) FROM tb_crdn c + LEFT JOIN tb_pstn_info p ON p.CRDN_YR = c.CRDN_YR AND p.CRDN_NO = c.CRDN_NO AND p.DEL_YN = 'N' WHERE c.DEL_YN = 'N' AND c.CRDN_YR = #{schCrdnYr} @@ -132,6 +148,21 @@ AND c.AGRVTN_LEVY_TRGT_YN = #{schAgrvtnLevyTrgtYn} + + AND p.ZIP LIKE CONCAT('%', #{schZip}, '%') + + + AND p.LOTNO_ADDR LIKE CONCAT('%', #{schLotnoAddr}, '%') + + + AND p.DTL_ADDR LIKE CONCAT('%', #{schDtlAddr}, '%') + + + AND p.LOTNO_MNO = #{schLotnoMno} + + + AND p.LOTNO_SNO = #{schLotnoSno} + diff --git a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list.jsp b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list.jsp index 3bc379c..085186e 100644 --- a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list.jsp +++ b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list.jsp @@ -31,9 +31,7 @@ @@ -87,6 +85,17 @@
    • +
    @@ -151,6 +160,11 @@ var schExmnr = $.trim(nvl($("#schExmnr").val(), "")); var schCrdnPrcsSttsCd = $.trim(nvl($("#schCrdnPrcsSttsCd").val(), "")); var schAgrvtnLevyTrgtYn = $.trim(nvl($("#schAgrvtnLevyTrgtYn").val(), "")); + var schZip = $.trim(nvl($("#schZip").val(), "")); + var schLotnoAddr = $.trim(nvl($("#schLotnoAddr").val(), "")); + var schDtlAddr = $.trim(nvl($("#schDtlAddr").val(), "")); + var schLotnoMno = $.trim(nvl($("#schLotnoMno").val(), "")); + var schLotnoSno = $.trim(nvl($("#schLotnoSno").val(), "")); SEARCH_COND.schCrdnYr = schCrdnYr; SEARCH_COND.schCrdnNo = schCrdnNo; @@ -160,6 +174,11 @@ SEARCH_COND.schExmnr = schExmnr; SEARCH_COND.schCrdnPrcsSttsCd = schCrdnPrcsSttsCd; SEARCH_COND.schAgrvtnLevyTrgtYn = schAgrvtnLevyTrgtYn; + SEARCH_COND.schZip = schZip; + SEARCH_COND.schLotnoAddr = schLotnoAddr; + SEARCH_COND.schDtlAddr = schDtlAddr; + SEARCH_COND.schLotnoMno = schLotnoMno; + SEARCH_COND.schLotnoSno = schLotnoSno; }; @@ -646,11 +665,34 @@ $("#schExmnr").val(""); $("#schCrdnPrcsSttsCd").val(""); $("#schAgrvtnLevyTrgtYn").val(""); - + $("#schZip").val(""); + $("#schLotnoAddr").val(""); + $("#schDtlAddr").val(""); + $("#schLotnoMno").val(""); + $("#schLotnoSno").val(""); + // 그리드 데이터 새로고침 self.grid.instance.readData(1); }); + // 주소 찾기 버튼 클릭 이벤트 + $("#btnAddrSearch").on('click', function() { + var popUrl = ''; + var params = '?callback=searchAddrCallback'; + + // 중요로직: 법정동이 선택된 경우 동 이름을 검색어로 전달 + var selectedEmd = $('#schStdgEmdCd').val(); + if (selectedEmd) { + var selectedEmdText = $('#schStdgEmdCd option:selected').text(); + if (selectedEmdText && selectedEmdText !== '전체') { + params += '&keyword=' + encodeURIComponent( '${sessionScope.sessionVO.user.orgCdNm} ' + selectedEmdText + ' '); + } + }else{ + params += '&keyword=' + encodeURIComponent( '${sessionScope.sessionVO.user.orgCdNm} '); + } + openPopup(popUrl + params, 570, 530, '주소 찾기'); + }); + // 등록 버튼 클릭 이벤트 $("#registerBtn").on('click', function() { self.openRegisterPopup(); @@ -786,6 +828,21 @@ CrdnRegistAndViewList.refreshList(); }; + /** + * 주소 검색 콜백 함수 + * - 주소 검색 팝업의 검색결과를 전달 받아 해당 필드에 설정 + * @param {Object} obj - 주소 검색 결과 객체 + */ + window.searchAddrCallback = function(obj) { + // 중요로직: 주소 검색 결과를 각 필드에 설정 + $("#schZip").val(obj.zipNo || ""); + $("#schLotnoAddr").val(obj.jibunAddr || ""); + $("#schLotnoMno").val(obj.lnbrMnnm || ""); + $("#schLotnoSno").val(obj.lnbrSlno || ""); + // 상세주소는 사용자가 직접 입력 + $("#schDtlAddr").focus(); + }; + // DOM 준비 완료 시 초기화 $(document).ready(function() { CrdnRegistAndViewList.init(); diff --git a/src/main/webapp/WEB-INF/views/levy/levyRelevy/list.jsp b/src/main/webapp/WEB-INF/views/levy/levyRelevy/list.jsp index ff7919d..7f604ae 100644 --- a/src/main/webapp/WEB-INF/views/levy/levyRelevy/list.jsp +++ b/src/main/webapp/WEB-INF/views/levy/levyRelevy/list.jsp @@ -34,6 +34,15 @@ +
  • 법정동
    • +
  • + +
  • 지역 구분
    • -
  • 조사원
    • + <%--
  • 조사원
  • -
    • + --%>
  • 진행단계
  • - - - - - -
  • 주소 검색