From 93fb474f4ca14ce69c2bfab822d02264dfe2f116 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Mon, 14 Aug 2023 17:57:17 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B6=80=EA=B3=BC=EC=A0=9C=EC=99=B8=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=ED=9B=84=20=EC=BD=9C=EB=B0=B1=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/crdn/CrdnQuery.java | 10 +++++ .../sql/mapper/fims/crdn/crdn-list-mapper.xml | 7 +++- .../WEB-INF/jsp/fims/crdn/crdn06020-main.jsp | 14 +++++-- .../WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp | 3 ++ .../WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp | 40 ++++++++++++++++--- .../WEB-INF/jsp/fims/cvlc/cvlc01030-main.jsp | 3 ++ 6 files changed, 67 insertions(+), 10 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index 47f4cfb3..d6e23790 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -49,6 +49,7 @@ public class CrdnQuery extends CmmnQuery { private String dtlAmtDcsnCd; private String crdnInptSeCd; private String cvlcptPrcsCd; + private String crdnSttsCd; //포함, 제외, 특정 자료 private String schOnlySamePlace; @@ -267,6 +268,15 @@ public class CrdnQuery extends CmmnQuery { return self(); } + public String getCrdnSttsCd() { + return ifEmpty(crdnSttsCd, () -> null); + } + + public T setCrdnSttsCd(String crdnSttsCd) { + this.crdnSttsCd = crdnSttsCd; + return self(); + } + public String getAplcnYmd() { return ifEmpty(aplcnYmd, () -> null); } diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml index f16c1e66..e57b1537 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml @@ -214,7 +214,9 @@ SELECT C.CRDN_ID - + +AND C.CRDN_STTS_CD = #{crdnSttsCd} + @@ -271,6 +273,9 @@ SELECT GROUP_CONCAT(C.CRDN_ID) AS CRDN_ID_LIST + +AND C.CRDN_STTS_CD = #{crdnSttsCd} + GROUP BY C.VHRNO, C.CRDN_STDG_NM HAVING COUNT(*) = ]]> diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp index 8bbb6bfe..ea638697 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp @@ -620,7 +620,9 @@ $(document).ready(function(){ var params = { "crdnId" : info.data.CRDN_ID, - "levyExclSeCd" : levyExclSeCd + "levyExclSeCd" : levyExclSeCd, + "openerPageName" : "crdn06020-main", + "callbackFuncName" : "pageObject['crdn06020-main']['exclCallback']", }; ajax.get({ @@ -639,15 +641,19 @@ $(document).ready(function(){ content : resp, size : "lg", init : () => {}, - onClose : () => { - $P.refreshInspectionList(); - } + onClose : () => {} }); } }); }; + $P.exclCallback = (saved) => { + if(saved){ + $P.refreshInspectionList(); + } + } + $P.renderInspectionDataList = (total, renderDataType) => { switch (renderDataType) { diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp index c13cc621..bf0dcf5d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp @@ -505,6 +505,9 @@ $(document).ready(function(){ }, "holdRow" : function(currentKey){ $P.fnHold(currentKey); + }, + "refreshList" : function(){ + $P.refreshCrdnList(); } }; diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp index 5207ac2a..050351bd 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp @@ -326,7 +326,8 @@ pageObject.childReq.push({ getNextKey : function(){ return ""; }, getPrevKey : function(){ return ""; }, selectRow : function(){}, - holdRow : function(){} + holdRow : function(){}, + refreshList : function(){} }); $(document).ready(function(){ @@ -602,7 +603,9 @@ $(document).ready(function(){ var params = { "crdnId" : crdnId, - "levyExclSeCd" : levyExclSeCd + "levyExclSeCd" : levyExclSeCd, + "openerPageName" : "cvlc01020-info", + "callbackFuncName" : "pageObject['cvlc01020-info']['exclCallback']", }; ajax.get({ @@ -611,17 +614,44 @@ $(document).ready(function(){ success : resp => { dialog.open({ - id : "levyExcldialog--${pageName}", + id : "levyExcldialog", title : "부과제외 정보", content : resp, size : "lg", - init : () => { }, - onClose : () => { $P.fnGo(crdnId); } // callback + init : () => {}, + onClose : () => {} }); } }); }; + $P.exclCallback = function(saved){ + if(saved){ + + var crdnId = $("#crdnId--${pageName}").val(); + + var cursorKey = ""; + + var nextKey = $P.provided.getNextKey(crdnId); + if(nextKey != ""){ + cursorKey = nextKey; + } else { + var prevKey = $P.provided.getPrevKey(crdnId); + if(prevKey != ""){ + cursorKey = prevKey; + } + } + + $P.provided.refreshList(); + + if(cursorKey != ""){ + $P.fnGo(cursorKey); + } else { + dialog.close("cvlcptInitialDataEditDialog--${openerPageName}"); + } + } + }; + $P.fnPrev = () => { var prevKey = $P.provided.getPrevKey($("#crdnId--${pageName}").val()); if(prevKey != ""){ diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01030-main.jsp index 8f6b1357..8db6181c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01030-main.jsp @@ -405,6 +405,9 @@ $(document).ready(function(){ }, "selectRow" : function(currentKey){ $P.clickCrdnList(currentKey); + }, + "refreshList" : function(){ + $P.refreshCrdnList(); } };