diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java index e0991c8c..bf72aa78 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -49,15 +49,25 @@ public class Sprt01Controller extends ApplicationController { public ModelAndView integrationSearchMain(HttpServletRequest req) { ModelAndView mav = new ModelAndView("fims/sprt/sprt01010-main"); - Map> commonCodes = getCodesOf("FIM003", "FIM010", "FIM026", "FIM054"); + Map> commonCodes = getCodesOf("FIM003", "FIM010", "FIM026", "FIM054" + ,"FIM004","FIM005","FIM006","FIM061","FIM064"); mav.addObject("VLTNList", null); + mav.addObject("FIM003List", commonCodes.get("FIM003")); mav.addObject("FIM010List", commonCodes.get("FIM010")); mav.addObject("FIM026List", commonCodes.get("FIM026")); mav.addObject("FIM054List", commonCodes.get("FIM054")); - addCodes(commonCodes, mav, "FIM003", "FIM010", "FIM026", "FIM054", "VLTN"); + mav.addObject("FIM004List", commonCodes.get("FIM004")); + mav.addObject("FIM005List", commonCodes.get("FIM005")); + mav.addObject("FIM006List", commonCodes.get("FIM006")); + mav.addObject("FIM061List", commonCodes.get("FIM061")); + mav.addObject("FIM064List", commonCodes.get("FIM064")); + + + addCodes(commonCodes, mav, "FIM003", "FIM010", "FIM026", "FIM054" + ,"FIM004","FIM005","FIM006","FIM061","FIM064"); mav.addObject("pageName", "sprt01010");// View(jsp)에서 사용할 id 뒤에 붙일 suffix 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 be40350e..366adce0 100644 --- a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml @@ -251,6 +251,9 @@ LEFT OUTER JOIN TB_RCVMT R ON (L.LEVY_ID = R.LEVY_ID AND R.DEL_YN = 'N AND L.EPAYNO = #{item.value} + + AND VI.VLTN_CD = #{item.value} + AND C.CRDN_STTS_CD = #{item.value} 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 1000858d..e1245824 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 @@ -38,6 +38,12 @@ var fastSearch = ${fastSearch}; // 공통 코드 var FIM054 = new CommonCodes(${FIM054}, true); +var FIM004 = new CommonCodes(${FIM004}, true); +var FIM005 = new CommonCodes(${FIM005}, true); +var FIM006 = new CommonCodes(${FIM006}, true); +var FIM061 = new CommonCodes(${FIM061}, true); +var FIM064 = new CommonCodes(${FIM064}, true); + /************************************************************************** * DatasetControl **************************************************************************/ @@ -135,6 +141,38 @@ integrationSearch.getParams = () => { } // 초기화 +integrationSearch.fnResetAndChangeBiz = (taskSeCd) => { + + // 항목 초기화 + $("#ischVltnCd--${pageName}").empty(); + + $("#ischVltnCd--${pageName}").append(""); + + + // 업무에 따른 위반 내용 + var vltnIdCode = []; + if (taskSeCd == "PVS") { // 주정차 위반 + vltnIdCode = FIM004.list(); + } else if (taskSeCd == "BPV") { // 전용차로 위반 + vltnIdCode = FIM005.list(); + } else if (taskSeCd == "DPV") { // 장애인 전용 + vltnIdCode = FIM006.list(); + } else if (taskSeCd == "ECA") { // 전기차 주차 위반 + vltnIdCode = FIM061.list(); + } else if (taskSeCd == "TPV") { // 밤샘 주차 위반 + vltnIdCode = FIM064.list(); + } + + if(taskSeCd != ""){ + $(vltnIdCode).each(function(index, item) { + $("#ischVltnCd--${pageName}").append(""); + }) + } + + integrationSearch.fnReset(); + +} + integrationSearch.fnReset = () => { integrationSearchControl.updataset.clear(); @@ -355,7 +393,7 @@ $(document).ready(function() { // 보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); - integrationSearch.fnReset(); + integrationSearch.fnResetAndChangeBiz(""); if(fastSearch != null){ if(fastSearch.fastBy == "vhrno"){ diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01020-info.jsp index e59900ac..307ea6be 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01020-info.jsp @@ -58,13 +58,13 @@ @@ -175,13 +175,11 @@ - +
- +