From d53dd9c1e2107ca2fdc4a7773121596416cc405c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=84=B1=EC=98=81?= Date: Fri, 10 Oct 2025 10:11:23 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=AC=EB=B6=80=EA=B3=BC=20=EA=B7=B8?= =?UTF-8?q?=EB=A6=AC=EB=93=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8,=20=EA=B8=B0?= =?UTF-8?q?=EC=B4=88=20=ED=8B=80=20=EC=9E=A1=EB=8A=94=EC=A4=91...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...r_maria.xml => LevyRelevyMapper_maria.xml} | 2 +- .../WEB-INF/views/levy/levyRelevy/list.jsp | 42 +++++++++++++------ src/main/webapp/resources/css/style_new.css | 5 +++ .../webapp/resources/xit/xit-tui-grid.css | 4 +- 4 files changed, 38 insertions(+), 15 deletions(-) rename src/main/resources/mybatis/mapper/levy/levyRelevy/{RevyRelevyMapper_maria.xml => LevyRelevyMapper_maria.xml} (98%) diff --git a/src/main/resources/mybatis/mapper/levy/levyRelevy/RevyRelevyMapper_maria.xml b/src/main/resources/mybatis/mapper/levy/levyRelevy/LevyRelevyMapper_maria.xml similarity index 98% rename from src/main/resources/mybatis/mapper/levy/levyRelevy/RevyRelevyMapper_maria.xml rename to src/main/resources/mybatis/mapper/levy/levyRelevy/LevyRelevyMapper_maria.xml index c69e741..0f08533 100644 --- a/src/main/resources/mybatis/mapper/levy/levyRelevy/RevyRelevyMapper_maria.xml +++ b/src/main/resources/mybatis/mapper/levy/levyRelevy/LevyRelevyMapper_maria.xml @@ -232,7 +232,7 @@ or (c.CRDN_YR = #{frstCrdnYr} AND c.CRDN_NO = #{frstCrdnNo}) ) - AND NOT (c.CRDN_YR = #{crdnYr} AND c.CRDN_NO = #{crdnNo}) + /* AND NOT (c.CRDN_YR = #{crdnYr} AND c.CRDN_NO = #{crdnNo}) */ -- 이력에 일단 자기 자신도 포함해서 보여줌. ORDER BY c.CRDN_YR DESC, c.CRDN_NO ASC 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 d785354..624d296 100644 --- a/src/main/webapp/WEB-INF/views/levy/levyRelevy/list.jsp +++ b/src/main/webapp/WEB-INF/views/levy/levyRelevy/list.jsp @@ -87,6 +87,12 @@
    • +
    @@ -108,7 +114,7 @@
      -
    • 재부과 이력 (선택된 단속의 최초 단속부터 현재까지)
      • +
    • 재부과 이력 (선택된 단속의 최초 단속부터 당해년도까지, 상단 선택된 자신 포함)
    @@ -218,6 +224,15 @@ return XitReverseRowNumberRenderer.format(LevyRelevyList.grid.instance.getData().length, e); } }, + { + header: '재부과대상', + name: 'relevyTrgtYn', + align: 'center', + width: 90, + formatter: function(e) { + return e.value === 'Y' ? '대상' : '비대상'; + } + }, { header: '단속년도', name: 'crdnYr', align: 'center', width: 80, sortingType: 'desc' }, { header: '단속번호', name: 'crdnNo', align: 'center', width: 90 }, { header: '법정동', name: 'stdgEmdCdNm', align: 'center', width: 90 }, @@ -242,15 +257,6 @@ return e.value === 'Y' ? '재부과' : '일반'; } }, - { - header: '재부과대상', - name: 'relevyTrgtYn', - align: 'center', - width: 90, - formatter: function(e) { - return e.value === 'Y' ? '대상' : '비대상'; - } - }, { header: '가중부과대상', name: 'agrvtnLevyTrgtYn', @@ -394,6 +400,18 @@ LevyRelevyList.selectedRow = null; }); + // 그리드 렌더링 및 데이터 업데이트 완료 이벤트 + this.instance.on('onGridUpdated', function() { + var allRows = self.instance.getData(); + var rowKey = null; + allRows.forEach(function(row) { + // 재부과 대상이 아닐 경우 체크박스 비활성화 + if( row.relevyTrgtYn !== 'Y' ){ + self.instance.disableRowCheck(row.rowKey); + } + }); + }); + this.instance.on('focusChange', function(ev) { LevyRelevyList.selectedRow = self.instance.getRow(ev.rowKey); @@ -402,8 +420,8 @@ // 파라미터 저장 LevyRelevyList.gridDetail.currentCrdnYr = LevyRelevyList.selectedRow.crdnYr; LevyRelevyList.gridDetail.currentCrdnNo = LevyRelevyList.selectedRow.crdnNo; - LevyRelevyList.gridDetail.currentFrstCrdnYr = LevyRelevyList.selectedRow.frstCrdnYr; - LevyRelevyList.gridDetail.currentFrstCrdnNo = LevyRelevyList.selectedRow.frstCrdnNo; + LevyRelevyList.gridDetail.currentFrstCrdnYr = LevyRelevyList.selectedRow.frstCrdnYr || LevyRelevyList.selectedRow.crdnYr; //자기 자신이 최초일경우 대비 해당row년도를 최초년도로 + LevyRelevyList.gridDetail.currentFrstCrdnNo = LevyRelevyList.selectedRow.frstCrdnNo || LevyRelevyList.selectedRow.crdnNo; //자기 자신이 최초일경우 대비 해당row단속번호를 최초단속번호로 // 그리드 데이터 요청 LevyRelevyList.gridDetail.instance.readData(1); diff --git a/src/main/webapp/resources/css/style_new.css b/src/main/webapp/resources/css/style_new.css index 5276388..8c655b6 100644 --- a/src/main/webapp/resources/css/style_new.css +++ b/src/main/webapp/resources/css/style_new.css @@ -2081,6 +2081,11 @@ label { float: right; } +.gs_b_top>ul.lef2 { + float: left; + clear: both; +} + .gs_b_top>ul.rig>li { height: 35px; } diff --git a/src/main/webapp/resources/xit/xit-tui-grid.css b/src/main/webapp/resources/xit/xit-tui-grid.css index 07609e0..2d7c576 100644 --- a/src/main/webapp/resources/xit/xit-tui-grid.css +++ b/src/main/webapp/resources/xit/xit-tui-grid.css @@ -50,10 +50,10 @@ table.tui-grid-table td.tui-grid-cell-editable > div.tui-grid-cell-content{ /* custom background color */ .tui-grid-custom-color-red{ - background-color: rgba(235, 244, 253, 0.7) !important; + background-color: rgba(250, 239, 239, 0.7) !important; } .tui-grid-custom-color-blue{ - background-color: rgba(250, 239, 239, 0.7) !important; + background-color: rgba(235, 244, 253, 0.7) !important; } .tui-grid-custom-color-gray{