From 32aac904eacd4d6e28666997b8fb628c8639198c Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 27 Oct 2023 17:14:07 +0900 Subject: [PATCH] =?UTF-8?q?=ED=86=B5=ED=95=A9=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=ED=95=84=ED=84=B0(=ED=83=AD)=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fims/sprt/integrationSearch-mapper.xml | 33 ++++++++++++- .../WEB-INF/jsp/fims/sprt/sprt01010-main.jsp | 47 ++++++++++--------- .../WEB-INF/jsp/fims/sprt/sprt01030-info.jsp | 26 ++++++---- .../WEB-INF/jsp/fims/sprt/sprt01040-info.jsp | 20 +++++--- 4 files changed, 87 insertions(+), 39 deletions(-) diff --git a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml index 497857e6..12ced662 100644 --- a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml @@ -122,7 +122,38 @@ WHEN R.RCVMT_ID IS NOT NULL AND R.RCVMT_ID != '' THEN 'Y' ELSE 'N' - END) AS RCVMT_YN + END) AS RCVMT_YN /* 수납 여부 */ + , (CASE + WHEN R.RCVMT_ID IS NOT NULL AND R.RCVMT_ID != '' + THEN + CASE + WHEN '상태' = '압류' + THEN '압류' + WHEN '상태' = '압류예정' + THEN '압류예정' + WHEN '상태' = '독촉' + THEN '독촉' + WHEN '상태' = '부과' + THEN '부과' + WHEN '상태' = '자납부과' + THEN '자납부과' + WHEN '상태' = '의견진술접수' + THEN '의견진술접수' + ELSE '단속' + END + ELSE + CASE + WHEN '상태' = '대납' + THEN '대납' + WHEN '상태' = '수납' + THEN '수납' + WHEN '상태' = '결손' + THEN '결손' + WHEN '상태' = '법원이송' + THEN '법원이송' + ELSE '기타' + END + END) AS TAB_GROUP /* 탭 그룹 */ , C.DEL_YN /* 삭제 여부 */ , C.REG_DT /* 등록 일시 */ , C.RGTR /* 등록자 */ diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp index bf8927e0..1f82fe65 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp @@ -54,22 +54,13 @@ var integrationSearchControl = new DatasetControl({ * DatasetControl 이벤트 **************************************************************************/ // Dataset 변경 이벤트 -integrationSearchControl.onDatasetChange = obj => { +integrationSearchControl.onDatasetChange = (obj) => { - integrationSearch.renderList("up"); - integrationSearch.renderList("down"); + var upActiveTab = $("#upGridTabs--${pageName}").find("button.active").text().trim(); + integrationSearch.renderList("up", upActiveTab); + var downActiveTab = $("#downGridTabs--${pageName}").find("button.active").text().trim(); + integrationSearch.renderList("down", downActiveTab); - //$("#paging--${pageName}").setPagingInfo({ - // list : integrationSearchControl.dataset - // , prefix : "paging--${pageName}" - // , start : obj.Start - // , totalSize : obj.Total - // , fetchSize : obj.Fetch - // , func : "integrationSearchControl.load({index})" - //}); - - //보안모드 - fn_securityModeToggle($("#securityMode--top").is(":checked")); }; // 현재 선택 자료 변경 이벤트 @@ -157,7 +148,7 @@ integrationSearchControl.remove = (params) => { * **************************************************************************/ var integrationSearch = {}; - integrationSearch.renderList = (updown) => { + integrationSearch.renderList = (updown, tabGroup) => { var tbody = updown == "up" ? "upTbody--${pageName}" : "downTbody--${pageName}"; var trs = ""; @@ -176,13 +167,17 @@ var integrationSearch = {}; var temp = ds._items; var filtered = []; - - if(updown == "up"){ - filtered = temp.filter(item => item.data.RCVMT_YN == "N"); + if(tabGroup == null || tabGroup == "" || tabGroup == "전체"){ + if(updown == "up"){ + filtered = temp.filter(item => item.data.RCVMT_YN == "N"); + } else { + filtered = temp.filter(item => item.data.RCVMT_YN == "Y"); + } } else { - filtered = temp.filter(item => item.data.RCVMT_YN == "Y"); + filtered = temp.filter(item => item.data.TAB_GROUP == tabGroup); } + if(filtered.lenth < 1){ trs = notFound; } else { @@ -195,6 +190,9 @@ var integrationSearch = {}; } $("#"+tbody).html(trs.join()); + + //보안모드 + fn_securityModeToggle($("#securityMode--top").is(":checked")); } @@ -265,8 +263,6 @@ integrationSearch.fnReset = () => { integrationSearch.fnSearchList = () => { // 검색조건 integrationSearchControl.query = integrationSearch.getParams(); - integrationSearchControl.query.delYn = "N"; // 삭제 여부 - integrationSearchControl.query.crdnDelYn = "N"; // 단속 대장 삭제 여부 var query = integrationSearchControl.query; var minKeyword = false; @@ -293,6 +289,12 @@ integrationSearch.fnSearchList = () => { return; } + $("#upGridTabs--${pageName}").find("button").not(":eq(0)").removeClass("active"); + $("#upGridTabs--${pageName}").find("button").eq(0).addClass("active"); + $("#downGridTabs--${pageName}").find("button").not(":eq(0)").removeClass("active"); + $("#downGridTabs--${pageName}").find("button").eq(0).addClass("active"); + integrationSearchControl.dataset.clear(); + integrationSearchControl.load(); } @@ -341,9 +343,10 @@ $(document).ready(function() { } else { return; } + + $("#btnSearch--${pageName}").click(); } - $("#btnSearch--${pageName}").click(); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01030-info.jsp index 3f0e94de..ab50cd0a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01030-info.jsp @@ -79,45 +79,53 @@ -
+
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
    • diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01040-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01040-info.jsp index 1b0c1683..b1b14791 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01040-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01040-info.jsp @@ -82,35 +82,41 @@
-
+
  • -
  • -
  • -
  • -
  • -
  • -