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 @@