From a086b600edc3213e0fd1c6dd720f9ed881e6a163 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 29 Jun 2023 16:22:45 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=BC=ED=83=9C=EB=A3=8C=EA=B0=90=EA=B2=BD?= =?UTF-8?q?=EC=9E=90=EB=A3=8C=20=EB=A9=94=EC=9D=B8=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/crdn/CrdnQuery.java | 18 ++ .../fims/crdn/service/bean/Crdn06Bean.java | 26 +-- .../xit/fims/crdn/web/Crdn06Controller.java | 18 +- .../sql/mapper/fims/crdn/crdn06-mapper.xml | 70 +++--- .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 6 +- .../WEB-INF/jsp/fims/crdn/crdn06030-main.jsp | 3 +- .../WEB-INF/jsp/fims/crdn/crdn06040-main.jsp | 213 +++++++----------- 7 files changed, 155 insertions(+), 199 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index ef36590b..651f022d 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -23,6 +23,8 @@ public class CrdnQuery extends QueryRequest { private String schDateFrom; private String schDateTo; private String vhrno; + private String schRductYmdFrom; + private String schRductYmdTo; public String getGrid() { return ifEmpty(grid, () -> null); @@ -87,6 +89,22 @@ public class CrdnQuery extends QueryRequest { return self(); } + public String getSchRductYmdFrom() { + return ifEmpty(schRductYmdFrom, () -> null); + } + + public T setSchRductYmdFrom(String schRductYmdFrom) { + this.schRductYmdFrom = schRductYmdFrom; + return self(); + } + + public String getSchRductYmdTo() { + return ifEmpty(schRductYmdTo, () -> null); + } + public T setSchRductYmdTo(String schRductYmdTo) { + this.schRductYmdTo = schRductYmdTo; + return self(); + } } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java index f22794dd..e1cbe96b 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java @@ -28,21 +28,21 @@ public class Crdn06Bean extends AbstractComponent { * @return 단속자료 목록 */ public List getCrackdownList(CrdnQuery req) { - - if(!isEmpty(req.getBy())) { - if(!req.getBy().startsWith("advancedOption")) { - switch (ifEmpty(req.getBy(), () -> "")) { - default: - req.setBy(EgovStringUtil.convertToUnderScore(req.getBy()).toUpperCase()); - break; - } - } - } - + + //if(!isEmpty(req.getBy())) { + // if(!req.getBy().startsWith("advancedOption")) { + // switch (ifEmpty(req.getBy(), () -> "")) { + // default: + // req.setBy(EgovStringUtil.convertToUnderScore(req.getBy()).toUpperCase()); + // break; + // } + // } + //} + switch (ifEmpty(req.getGrid(), () -> "")) { - case "TagInformationUndefinedData": + case "TagInformationUndefinedData": return crdn06Mapper.selectTagInformationUndefinedDataList(req.setOrderBy("CRDN_ID")); - case "FineReductionData": + case "FineReductionData": return crdn06Mapper.selectFineReductionDataList(req.setOrderBy("CRDN_ID")); default: return crdn06Mapper.selectCrackdownList(req.setOrderBy("CRDN_ID")); 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 aae74018..2fb10309 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -64,7 +64,7 @@ public class Crdn06Controller extends ApplicationController { addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM026"); return mav; } - + /** 과태료 감경 자료 메인화면을 연다. * @return fims/crdn/crdn06040-main */ @@ -73,15 +73,13 @@ public class Crdn06Controller extends ApplicationController { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/crdn/crdn06040-main"); mav.addObject("pageName","crdn06040-main"); - - Map> commonCodes = getCodesOf("FIM001", "FIM002", "FIM003", "FIM010", "FIM026"); - mav.addObject("FIM001List", commonCodes.get("FIM001")); - mav.addObject("FIM002List", commonCodes.get("FIM002")); - mav.addObject("FIM010List", commonCodes.get("FIM010")); - addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM026"); + + Map> commonCodes = getCodesOf("FIM054", "FIM010"); + mav.addObject("FIM054List", commonCodes.get("FIM054")); + addCodes(commonCodes, mav, "FIM010"); return mav; } - + /**단속자료 목록을 조회한다.
* {@link Crdn06Service#getCrackdownList(CrdnQuery)} 참고 * @param req 단속자료 목록 조회 조건 @@ -101,6 +99,6 @@ public class Crdn06Controller extends ApplicationController { "crdn" ); } - - + + } 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 1c21ba41..cb78d86e 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml @@ -240,9 +240,6 @@ SELECT C.CRDN_ID IF(TI.TEAMER_2 != '', TI.TEAMER_2, IF(TI.TEAMER_3 != '', TI.TEAMER_3, TI.TEAMER_4)))) AS APLCNT_CRDN_NM - , CC.CVLCPT_APLCNT_NM - , C.TEAM_ID - , C.VLTN_ID , C.ATCH_FILE_CNT @@ -292,50 +289,55 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%') 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 95504ada..926d19eb 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 @@ -259,11 +259,7 @@ $(document).ready(function(){ { 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', hidden: true }, - { header: '서손ID', name: 'LEVY_EXCL_ID', hidden: true }, - { header: '소유자ID', name: 'RTPYR_ID', hidden: true }, - { header: '서손사유코드', name: 'LEVY_EXCL_RSN_CD', hidden: true }, - { header: 'interfaceSeqN', name: 'INTERFACE_SEQN', hidden: true } + { header: '상태', name: 'CRDN_STTS_CD', width: 150, className: 'text-center' } ]; $P.gridOptions = { by : 'by--${pageName}', diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp index 9bfca339..88281115 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp @@ -229,8 +229,7 @@ $(document).ready(function(){ { header: '처리상태', name: 'CRDN_STTS_CD', width: 80, className: 'text-center' }, { header: '등록일시', name: 'REG_DT', width: 150, className: 'text-center' }, - { header: '최종처리일시', name: 'MDFCN_DT', width: 150, className: 'text-center' }, - { header: 'interfaceSeqN', name: 'INTERFACE_SEQN', hidden: true } + { header: '최종처리일시', name: 'MDFCN_DT', width: 150, className: 'text-center' } ]; $P.gridOptions = { by : 'by--${pageName}', diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp index 5ccc0989..6501869e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp @@ -9,7 +9,7 @@
- + @@ -21,27 +21,24 @@
- + +
- - - 감액일자 + + ~ - @@ -50,38 +47,8 @@ - - -
- -
-
-
-
- - - - - - -
-
@@ -97,18 +64,42 @@
-
+
+ class="datatables-ajax table table-bordered dataTable no-footer"> + + + + + + + + + - - + + +
No.감액일자감액사유접수(위반)일시차량번호감액금액잔액감액특기사항처리상태
@@ -130,61 +121,50 @@ /************************************************************************** * Global Variable **************************************************************************/ -var FIM002 = new CommonCodes(${FIM002}); var FIM010 = new CommonCodes(${FIM010}); -var FIM026 = new CommonCodes(${FIM026}); + pageObject["${pageName}"] = {}; $(document).ready(function(){ var $P = pageObject["${pageName}"]; - + $P.crdnControl = new DatasetControl({ - prefix:"crdn", - prefixName:"종합", - infoSize:"xl", - urls : { - load : "", - getInfo : "" - }, + prefix:"crdn", prefixName:"종합", infoSize:"xl", urls : { load : "", getInfo : "" }, formats: { - CRDN_YMD_TM : datetimeFormat, - REG_DT : datetimeFormat, - MDFCN_DT : datetimeFormat, - CVLCPT_PRCS_PRNMNT_DT : dateFormat, - CVLCPT_RCPT_YMD : dateFormat, - - RCVMT_AMT : numberFormat, - - CRDN_SE_CD: FIM002, - CRDN_STTS_CD : FIM010, - CRDN_REG_SE_CD: FIM026, + RDUCT_YMD : dateFormat, + CRDN_YMD_TM : datetimeFormat, + RDCAMT_PCPTAX : numberFormat, + SUM_AMT : numberFormat, + CRDN_STTS_CD : FIM010 }, - keymapper:info => info ? info.CRDN_ID : "", - dataGetter:obj => obj.crdnList, - appendData:true + keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnList, appendData:true }); - + $P.crdnControl.onDatasetChange = obj => { - var prefix = obj.infoPrefix; - $P.renderCrdnList(obj); + $P.renderCrdnList(); - $("#crdnPaging--${pageName}").setPagingInfo({ + $("#crdnPaging--${pageName}").setPagingInfo({ list: $P.crdnControl.dataset, prefix: "crdnPaging--${pageName}", - start: obj[prefix+"Start"], - totalSize: obj[prefix+"Total"], - fetchSize: obj[prefix+"Fetch"], + start: obj["crdnStart"], + totalSize: obj["crdnTotal"], + fetchSize: obj["crdnFetch"], func: "pageObject['${pageName}'].crdnControl.load({index})" }); }; + $P.fnReset = () => { + $('#schRductYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date); + $('#schRductYmdTo--${pageName}').datepicker('setDate', new Date()); + $P.crdnControl.setData([]); + } $P.fnResetAndChangeBiz = taskSeCd => { - $("#crdnTbody--${pageName}").html(""); + $P.fnReset(); $P.crdnControl.urls.load = wctx.url("/crdn/crdn06/040/"+ taskSeCd +"/list.do"); $P.crdnControl.urls.getInfo = wctx.url("/sprt/sprt01/020/"+ taskSeCd +"/info.do"); } @@ -199,19 +179,23 @@ $(document).ready(function(){ $P.crdnControl.load($P.crdnControl.query.pageNum + 1); } - $P.renderCrdnList = data => { - if(!$P.crdnControl.appendData){ - $("#crdnTbody--${pageName}").html(""); - } - + $P.renderCrdnList = () => { + var crdnList = $P.crdnControl.dataset; - + 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") + '\');"') + .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); @@ -224,56 +208,18 @@ $(document).ready(function(){ var formFields = new FimsFormFields("#frmSearch--${pageName}"); var data = formFields.get(); data.fetchSize = 30; - + return data; } - - /* ******************************* - * Grid - ******************************* */ - $P.gridColumns = [ - { header: '감액일자', name: 'uknown1', width: 80, className: 'text-center' }, - { header: '감액사유', name: 'uknown2', width: 80, className: 'text-start' }, - { header: '접수(위반)일시', name: 'CRDN_YMD_TM', width: 80, className: 'text-center' }, - { header: '차량번호', name: 'VHRNO', width: 80, className: 'text-center' }, - { header: '감액금액', name: 'uknown4', width: 80, className: 'text-end' }, - { header: '감액잔액', name: 'uknown5', width: 80, className: 'text-end' }, - { header: '감액특기사항', name: 'uknown6', width: 80, className: 'text-start' }, - { header: '처리상태', name: 'CRDN_STTS_CD', width: 80}, - { header: 'interfaceSeqN', name: 'INTERFACE_SEQN', hidden: true } - ]; - $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}"); - - $('#schDateFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date); - $('#schDateTo--${pageName}').datepicker('setDate', new Date()); - - var defaultBizValue = $("#layout-navbar input[name='taskSeCd']:checked").val(); $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + defaultBizValue + "']").prop("checked",true); $P.fnResetAndChangeBiz(defaultBizValue); - + //스크롤 이벤트 추가 $("#table-responsive--${pageName}").scroll(function(){ var el = $(this); @@ -284,16 +230,13 @@ $(document).ready(function(){ $P.scrollCrdnList(); } }); - + + $('#btnReset--${pageName}').on('click', () => $P.fnReset()); $('#btnSearch--${pageName}').on('click', () => $P.searchCrdnList()); - //보안모드 - if($("#securityMode--top").is(":checked")){ - fn_securityModeToggle(true); - } else { - fn_securityModeToggle(false); - } + fn_securityModeToggle($("#securityMode--top").is(":checked")); + }); \ No newline at end of file