From 9a02f9b9d47c5dcb0427e4a47dbc6b76c2ac72f9 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 30 Jun 2023 14:00:16 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=20=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/crdn/CrdnQuery.java | 10 + .../xit/fims/crdn/web/Crdn06Controller.java | 14 +- .../sql/mapper/fims/crdn/crdn06-mapper.xml | 17 +- .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 177 +++++++++--------- 4 files changed, 113 insertions(+), 105 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index 9860c3f6..aa3a42f5 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -27,6 +27,7 @@ public class CrdnQuery extends QueryRequest { private String schRductYmdTo; private String schCrdnYmdFrom; private String schCrdnYmdTo; + private String crdnInptSeCd; public String getGrid() { return ifEmpty(grid, () -> null); @@ -127,4 +128,13 @@ public class CrdnQuery extends QueryRequest { return self(); } + public String getCrdnInptSeCd() { + return ifEmpty(crdnInptSeCd, () -> null); + } + + public T setCrdnInptSeCd(String crdnInptSeCd) { + this.crdnInptSeCd = crdnInptSeCd; + return self(); + } + } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java index ed84958b..f1583da9 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -28,11 +28,11 @@ public class Crdn06Controller extends ApplicationController { mav.setViewName("fims/crdn/crdn06010-main"); mav.addObject("pageName", "crdn06010-main"); - Map> commonCodes = getCodesOf("FIM001", "FIM002", "FIM010", "FIM026"); - mav.addObject("FIM001List", commonCodes.get("FIM001")); - mav.addObject("FIM002List", commonCodes.get("FIM002")); + Map> commonCodes = getCodesOf("FIM002", "FIM003", "FIM010", "FIM026", "FIM054"); + mav.addObject("FIM003List", commonCodes.get("FIM003")); mav.addObject("FIM010List", commonCodes.get("FIM010")); - addCodes(commonCodes, mav, "FIM002", "FIM010", "FIM026"); + mav.addObject("FIM054List", commonCodes.get("FIM054")); + addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM026"); return mav; } @@ -45,10 +45,10 @@ public class Crdn06Controller extends ApplicationController { mav.setViewName("fims/crdn/crdn06020-main"); mav.addObject("pageName", "crdn06020-main"); - Map> commonCodes = getCodesOf("FIM001", "FIM002", "FIM003", "FIM010", "FIM026"); - mav.addObject("FIM001List", commonCodes.get("FIM001")); + Map> commonCodes = getCodesOf("FIM002", "FIM003", "FIM010", "FIM026","FIM054"); mav.addObject("FIM002List", commonCodes.get("FIM002")); mav.addObject("FIM010List", commonCodes.get("FIM010")); + mav.addObject("FIM054List", commonCodes.get("FIM054")); addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM026"); return mav; @@ -77,7 +77,7 @@ public class Crdn06Controller extends ApplicationController { mav.setViewName("fims/crdn/crdn06040-main"); mav.addObject("pageName","crdn06040-main"); - Map> commonCodes = getCodesOf("FIM054", "FIM010"); + Map> commonCodes = getCodesOf("FIM010", "FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); addCodes(commonCodes, mav, "FIM010"); return mav; diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml index ef5ddd0a..8017aedb 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml @@ -207,15 +207,20 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%') AND C.CRDN_ID = #{crdnId} AND C.TASK_SE_CD = #{taskSeCd} AND C.VHRNO LIKE CONCAT('%', #{vhrno}, '%') +AND C.CRDN_INPT_SE_CD = #{crdnInptSeCd} + + AND C.CRDN_YMD = ]]> #{schCrdnYmdFrom} + AND C.CRDN_YMD #{schCrdnYmdTo} + - - AND C.CRDN_YMD = ]]> #{schDateFrom} - AND C.CRDN_YMD #{schDateTo} - AND SUBSTR(C.REG_DT,1,8) = ]]> #{schDateFrom} AND SUBSTR(C.REG_DT,1,8) #{schDateTo} + + AND SUBSTR(C.MDFCN_DT,1,8) = ]]> #{schDateFrom} + AND SUBSTR(C.MDFCN_DT,1,8) #{schDateTo} + @@ -349,8 +354,8 @@ AND FN_GET_CODE_NM('FIM010', C.CRDN_STTS_CD) LIKE CONCAT('%', #{term}, '%') AND C.CRDN_ID = #{crdnId} AND C.TASK_SE_CD = #{taskSeCd} - AND SUBSTR(RD.REG_DT,1,8) = ]]> #{schRductYmdFrom} - AND SUBSTR(RD.REG_DT,1,8) #{schRductYmdTo} + AND SUBSTR(RD.REG_DT,1,8) = ]]> #{schRductYmdFrom} + AND SUBSTR(RD.REG_DT,1,8) #{schRductYmdTo} diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index 10bd56cf..0b9e884b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -9,7 +9,7 @@
- + @@ -21,7 +21,7 @@
- +
- - - + @@ -56,15 +56,30 @@
-
- +
+ + + + + ~ + + + +
+
+
@@ -82,19 +97,7 @@
- - - - - ~ - - - +
@@ -123,10 +126,48 @@ > + No. + 자료출처 + 차량번호 + 위반일시 + 신고/단속자 + 위반장소 + 체납액 + 영상매체 + 사진건수 + 발행번호 + 차량확인 + 처리상태 + 제외사유 + 제외처리일자 + 제외내역 - - + + +
@@ -149,6 +190,7 @@ * Global Variable **************************************************************************/ var FIM002 = new CommonCodes(${FIM002}); +var FIM003 = new CommonCodes(${FIM003}); var FIM010 = new CommonCodes(${FIM010}); var FIM026 = new CommonCodes(${FIM026}); pageObject["${pageName}"] = {}; @@ -167,6 +209,7 @@ $(document).ready(function(){ getInfo : "" }, formats: { + CRDN_INPT_SE_CD: FIM003, CRDN_YMD_TM : datetimeFormat, REG_DT : datetimeFormat, MDFCN_DT : datetimeFormat, @@ -207,8 +250,14 @@ $(document).ready(function(){ $("#crdnTbody--${pageName}").setCurrentRow(key); } + $P.fnReset = () => { + $('#schCrdnYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date); + $('#schCrdnYmdTo--${pageName}').datepicker('setDate', new Date()); + $P.crdnControl.setData([]); + } + $P.fnResetAndChangeBiz = taskSeCd => { - $("#crdnTbody--${pageName}").html(""); + $P.fnReset(); $P.crdnControl.urls.load = wctx.url("/crdn/crdn06/010/"+ taskSeCd +"/list.do"); $P.crdnControl.urls.getInfo = wctx.url("/sprt/sprt01/020/"+ taskSeCd +"/info.do"); } @@ -228,16 +277,18 @@ $(document).ready(function(){ var empty = crdnList.empty; - var trs = empty ? [ $P.tbodyTemplate.notFound ] : crdnList.inStrings($P.tbodyTemplate.found); - + var trs = empty ? + [document.getElementById("crdnNotFound--${pageName}").innerHTML] : + crdnList.inStrings( + document.getElementById("crdnRow--${pageName}").innerHTML, + (str, dataItem) => str + .replace(/{onclick}/gi, 'onclick="pageObject[\'${pageName}\'].crdnControl.setCurrent(\'' + dataItem.getValue("CRDN_ID") + '\');$(\'#crdnTbody--${pageName}\').setCurrentRow(\'' + dataItem.getValue("CRDN_ID") + '\');"') + .replace(/{ondblclick}/gi, 'ondblclick="pageObject[\'${pageName}\'].crdnControl.getInfo(\'' + dataItem.getValue("CRDN_ID") + '\')"') + ); $("#crdnTbody--${pageName}").html(trs.join()); //보안모드 - if($("#securityMode--top").is(":checked")){ - fn_securityModeToggle(true); - } else { - fn_securityModeToggle(false); - } + fn_securityModeToggle($("#securityMode--top").is(":checked")); } $P.getParams = () => { @@ -248,58 +299,9 @@ $(document).ready(function(){ return data; } - - - /* ******************************* - * Grid - ******************************* */ - $P.gridColumns = [ - { header: '차량번호', name: 'VHRNO', width: 80, className: 'text-center' }, - { header: '단속구분(신고방법)', name: 'CRDN_SE_CD', width: 100, className: 'text-center' }, - { header: '위반일시', name: 'CRDN_YMD_TM', width: 120, className: 'text-center' }, - { header: '사진건수', name: 'ATCH_FILE_CNT', width: 40, className: 'text-center' }, - { header: '수납금액', name: 'RCVMT_AMT', width: 100, className: 'text-end' }, - { header: '위반횟수', name: 'VLTN_NMTM', width: 80, className: 'text-center' }, - { header: '위반장소', name: 'CRDN_PLC', width: 150 }, - { header: '주민번호(전체)', name: 'RTPYR_NO', width: 110, className: 'text-center privacy' }, - { header: '주민번호(마스킹)', name: 'RTPYR_NO_MASK', width: 110, className: 'text-center privacy-mask' }, - { header: '특기사항', name: 'ETC_CN', width: 80, className: 'text-center' }, - { header: '서손사유', name: 'ETC_CN', width: 80, className: 'text-center' }, - { header: '처리상태명', name: 'CRDN_STTS_NM', width: 80}, - { header: '민원접수번호', name: 'CVLCPT_RCPT_NO', width: 150, className: 'text-center' }, - { header: '민원접수일자', name: 'CVLCPT_RCPT_YMD', width: 80, className: 'text-center' }, - { header: '처리기한', name: 'CVLCPT_PRCS_PRNMNT_DT', width: 80, className: 'text-center' }, - { header: '신고자', name: 'CVLCPT_APLCNT_NM', width: 80, className: 'text-center' }, - { header: '등록구분', name: 'CRDN_REG_SE_CD', width: 50, className: 'text-center' }, - { header: '등록일시', name: 'REG_DT', width: 150, className: 'text-center' }, - { header: '최종처리일시', name: 'MDFCN_DT', width: 150, className: 'text-center' }, - { header: '상태', name: 'CRDN_STTS_CD', width: 150, className: 'text-center' } - ]; - $P.gridOptions = { - by : 'by--${pageName}', - byOutput : 'byOutput--${pageName}', - theadTr: 'crdnTheadTr--${pageName}', - rowHeader: 'No.', - trDataKey: 'CRDN_ID', - infoPrefix: "crdn", - prefixName : "단속", - clickEvent : "pageObject['${pageName}'].crdnControl.setCurrent('{CRDN_ID}')", - dblClickEvent : "pageObject['${pageName}'].crdnControl.getInfo({})", - columns: $P.gridColumns - }; - - $P.tbodyTemplate = {}; - - //그리드 정보 초기화 - $P.tbodyTemplate = initGrid($P.gridOptions); - //달력 초기화 initDatepicker("frmSearch--${pageName}"); - $('#schCrdnYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date); - $('#schCrdnYmdTo--${pageName}').datepicker('setDate', new Date()); - - var defaultBizValue = $("#layout-navbar input[name='taskSeCd']:checked").val(); $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + defaultBizValue + "']").prop("checked",true); @@ -317,22 +319,13 @@ $(document).ready(function(){ } }); + $('#btnReset--${pageName}').on('click', () => $P.fnReset()); $('#btnSearch--${pageName}').on('click', () => $P.searchCrdnList()); - $('#btnMenualRegist--${pageName}').on('click', () => { - - }); - - $('#btnExtrRegist--${pageName}').on('click', () => { - - }); //보안모드 - if($("#securityMode--top").is(":checked")){ - fn_securityModeToggle(true); - } else { - fn_securityModeToggle(false); - } + fn_securityModeToggle($("#securityMode--top").is(":checked")); + });