From aeabec4d79ba55fbcd6925c8bcbaa03274b5766f Mon Sep 17 00:00:00 2001 From: jjh Date: Fri, 12 Jul 2024 18:33:43 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BB=AC=EB=9F=AC=EB=AA=85=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=EC=9C=BC=EB=A1=9C=20=EC=86=8C=EC=8A=A4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=88=84=EB=9D=BD.=201.=20TB=5FCRDN=5FADI=20=20=20?= =?UTF-8?q?OVTIME=5FYN=20->=20OVTM=5FYN=20=20=20OVTIME=5FPRTTN=5FYN=20->?= =?UTF-8?q?=20OVTM=5FPRTTN=5FYN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cokr/xit/fims/crdn/Crdn.java | 4 +- .../crdn/service/bean/CrdnServiceBean.java | 12 ++-- .../fims/crdn/service/bean/CrdnStngBean.java | 2 +- .../fims/crdn/service/bean/ImportBean.java | 4 +- .../cvlc/service/bean/CrdnCvlcptSubBean.java | 2 +- .../sql/mapper/fims/crdn/crdn-info-mapper.xml | 6 +- .../sql/mapper/fims/crdn/crdn-inst-mapper.xml | 6 +- .../sql/mapper/fims/crdn/crdn-list-mapper.xml | 8 +-- .../sql/mapper/fims/crdn/crdn-updt-mapper.xml | 4 +- .../mapper/fims/cvlc/crdnCvlcpt-mapper.xml | 12 ++-- .../sql/mapper/fims/excl/crdnReReg-mapper.xml | 2 +- .../sql/mapper/fims/nxrp/nisA01-mapper.xml | 4 +- .../sql/mapper/fims/sndb/sndng-mapper.xml | 8 +-- .../sql/mapper/fims/sprt/totalInfo-mapper.xml | 8 +-- .../WEB-INF/jsp/fims/crdn/crdn02050-info.jsp | 72 +++++++++---------- .../WEB-INF/jsp/fims/crdn/crdn06020-info.jsp | 4 +- .../WEB-INF/jsp/fims/sprt/sprt02020-info.jsp | 4 +- 17 files changed, 80 insertions(+), 82 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/Crdn.java b/src/main/java/cokr/xit/fims/crdn/Crdn.java index dff64235..4c96f4d4 100644 --- a/src/main/java/cokr/xit/fims/crdn/Crdn.java +++ b/src/main/java/cokr/xit/fims/crdn/Crdn.java @@ -195,12 +195,12 @@ public class Crdn extends AbstractEntity { /** * 시간외 여부 */ - private String ovtimeYn; + private String ovtmYn; /** * 시간외 분할 여부 */ - private String ovtimePrttnYn; + private String ovtmPrttnYn; /** * 과태료 단속 금액 diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java index 716240b7..eaef3779 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java @@ -231,14 +231,14 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService crdn.setFfnlgCarmdlCd(crdnInfo.string("FFNLG_CARMDL_CD")); if(chgAmtSe.equals("0")) { - crdn.setOvtimeYn("N"); - crdn.setOvtimePrttnYn("N"); + crdn.setOvtmYn("N"); + crdn.setOvtmPrttnYn("N"); } else if(chgAmtSe.equals("1")) { - crdn.setOvtimeYn("Y"); - crdn.setOvtimePrttnYn("N"); + crdn.setOvtmYn("Y"); + crdn.setOvtmPrttnYn("N"); } else if(chgAmtSe.equals("2")) { - crdn.setOvtimeYn("Y"); - crdn.setOvtimePrttnYn("Y"); + crdn.setOvtmYn("Y"); + crdn.setOvtmPrttnYn("Y"); } else { throw new RuntimeException("2시간 초과 처리 중 오류가 발생하였습니다."); } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java index c57ef936..fc0ea510 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java @@ -123,7 +123,7 @@ public class CrdnStngBean extends AbstractBean { int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(crdnStngMapper.selectBasicAmt(query), () -> "0")); - if(ffnlgCrdnAmt > 0 && ifEmpty(crdn.getOvtimeYn(), ()-> "").equals("Y")) { + if(ffnlgCrdnAmt > 0 && ifEmpty(crdn.getOvtmYn(), ()-> "").equals("Y")) { ffnlgCrdnAmt += 10000; } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/ImportBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/ImportBean.java index 5faf1dd1..f62c6080 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/ImportBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/ImportBean.java @@ -161,12 +161,10 @@ public class ImportBean extends AbstractBean { crdn.setTowngYn("N"); crdn.setPrkPsbltyRsltCd("0"); - crdn.setOvtimeYn("N"); + crdn.setOvtmYn("N"); crdn.setOpnnSbmsnYn("N"); crdn.setCrdnSttsCd("01"); - crdn.setVltnCd(violationCode); - crdn.setAtchFileCnt(petition.getAttachmentCount()); return crdn; }); diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java index 0ad420b3..c5d738dc 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java @@ -173,7 +173,7 @@ public class CrdnCvlcptSubBean extends AbstractBean { //금액 변경 - if(crdnInfo.string("TASK_SE_CD").equals("PVS") && "Y".equals(crdnInfo.string("OVTIME_PRTTN_YN"))) { + if(crdnInfo.string("TASK_SE_CD").equals("PVS") && "Y".equals(crdnInfo.string("OVTM_PRTTN_YN"))) { nonQueryRequest.put("changeAmountYn","N"); } else { int[] basicAmt = crdnStngBean.getBasicAmt(crdn); diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml index f9f8a423..3fba5400 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml @@ -37,7 +37,7 @@ - + @@ -135,8 +135,8 @@ , CA.FFNLG_CARMDL_CD , CA.PRK_PSBLTY_RSLT_CD , CA.VLTN_NMTM - , CA.OVTIME_YN - , CA.OVTIME_PRTTN_YN + , CA.OVTM_YN + , CA.OVTM_PRTTN_YN , P.RTPYR_ID , PA.ADDR_SN , CC.CVLCPT_LINK_ID diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-inst-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-inst-mapper.xml index a6890721..4dcd3b1b 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-inst-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-inst-mapper.xml @@ -127,8 +127,8 @@ INSERT INTO TB_CRDN_ADI ( , FFNLG_CARMDL_CD , PRK_PSBLTY_RSLT_CD , VLTN_NMTM - , OVTIME_YN - , OVTIME_PRTTN_YN + , OVTM_YN + , OVTM_PRTTN_YN , TEAM_ID , DEL_YN , REG_DT @@ -153,7 +153,7 @@ INSERT INTO TB_CRDN_ADI ( , #{ffnlgCarmdlCd} , #{prkPsbltyRsltCd} , #{vltnNmtm} - , IFNULL(#{ovtimeYn},'N') + , IFNULL(#{ovtmYn},'N') , 'N' , #{teamId} , 'N' 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 8de16bc7..981d214d 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 @@ -70,8 +70,8 @@ SELECT C.CRDN_ID , CA.FFNLG_CARMDL_CD , CA.PRK_PSBLTY_RSLT_CD , (SELECT GET_CODE_NM('FIM034', CA.PRK_PSBLTY_RSLT_CD) FROM DUAL) AS PRK_PSBLTY_RSLT_NM - , CA.VLTN_NMTM - , CA.OVTIME_YN + , CA.VLTN_NMTM + , CA.OVTM_YN , CC.CVLCPT_LINK_ID , CC.DSTRBNC_YN , CC.CVLCPT_RCPT_YMD @@ -245,8 +245,8 @@ SELECT C.CRDN_ID - AND IFNULL(CA.OVTIME_YN,'N') = 'N' - AND IFNULL(CA.OVTIME_PRTTN_YN,'N') = 'N' + AND IFNULL(CA.OVTM_YN,'N') = 'N' + AND IFNULL(CA.OVTM_PRTTN_YN,'N') = 'N' diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-updt-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-updt-mapper.xml index ab5dcb4b..996307f9 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-updt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-updt-mapper.xml @@ -53,7 +53,7 @@ SET MDFCN_DT = /* 수정일시 */ , MDFR = #{modifiedBy} /* 수정자 */ - , OVTIME_YN = #{ovtimeYn} + , OVTM_YN = #{ovtmYn} , CRDN_SPAREA_CD = #{crdnSpareaCd} @@ -95,7 +95,7 @@ /* 시간초과 여부 수정(crdnUpdtMapper.overTimeInfo) */ UPDATE TB_CRDN_ADI - SET OVTIME_YN = #{ovtimeYn} + SET OVTM_YN = #{ovtmYn} , MDFCN_DT = /* 수정일시 */ , MDFR = #{modifiedBy} /* 수정자 */ WHERE CRDN_ID = #{crdnId} /* 단속 ID */ diff --git a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml index e3a388ba..43a6edc2 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml @@ -125,7 +125,7 @@ SELECT C.CRDN_ID , CA.FFNLG_CARMDL_CD , CA.PRK_PSBLTY_RSLT_CD , CA.VLTN_NMTM - , CA.OVTIME_YN + , CA.OVTM_YN , CC.CVLCPT_LINK_ID , CC.DSTRBNC_YN , CC.CVLCPT_RCPT_YMD @@ -631,7 +631,7 @@ SELECT CC.CVLCPT_LINK_ID /* 민원 연계 ID */ SET MDFCN_DT = /* 수정일시 */ , MDFR = #{currentUser.id} /* 수정자 */ - , OVTIME_YN = #{crdn.ovtimeYn} + , OVTM_YN = #{crdn.ovtmYn} , CRDN_SPAREA_CD = #{crdn.crdnSpareaCd} @@ -766,8 +766,8 @@ INSERT , FFNLG_CARMDL_CD , PRK_PSBLTY_RSLT_CD , VLTN_NMTM - , OVTIME_YN - , OVTIME_PRTTN_YN + , OVTM_YN + , OVTM_PRTTN_YN , DEL_YN , REG_DT , RGTR @@ -789,8 +789,8 @@ SELECT #{newCrdnId} , FFNLG_CARMDL_CD , PRK_PSBLTY_RSLT_CD , VLTN_NMTM - , OVTIME_YN - , OVTIME_PRTTN_YN + , OVTM_YN + , OVTM_PRTTN_YN , DEL_YN , , #{currentUser.id} diff --git a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml index a4cdc017..fa0ddd6a 100644 --- a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml @@ -300,7 +300,7 @@ , CA.FFNLG_CARMDL_CD , CA.PRK_PSBLTY_RSLT_NM , CA.VLTN_NMTM - , CA.OVTIME_YN + , CA.OVTM_YN , (SELECT VLTN_CD FROM TB_VLTN X WHERE X.VLTN_ID=C.VLTN_ID AND X.SGG_CD=C.SGG_CD AND X.TASK_SE_CD=C.TASK_SE_CD) AS VLTN_CD FROM TB_CRDN C INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) diff --git a/src/main/resources/sql/mapper/fims/nxrp/nisA01-mapper.xml b/src/main/resources/sql/mapper/fims/nxrp/nisA01-mapper.xml index 5117210c..3a7a2ae5 100644 --- a/src/main/resources/sql/mapper/fims/nxrp/nisA01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/nxrp/nisA01-mapper.xml @@ -568,8 +568,8 @@ , CA.FFNLG_CARMDL_CD , CA.PRK_PSBLTY_RSLT_CD , CA.VLTN_NMTM - , CA.OVTIME_YN - , CA.OVTIME_PRTTN_YN + , CA.OVTM_YN + , CA.OVTM_PRTTN_YN , V.VLTN_ARTCL , V.VLTN_LAW_NM , V.VLTN_LAW1 diff --git a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml index df397109..da5689aa 100644 --- a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml @@ -227,7 +227,7 @@ , CA.FFNLG_CARMDL_CD , CA.PRK_PSBLTY_RSLT_CD , CA.VLTN_NMTM - , CA.OVTIME_YN + , CA.OVTM_YN , (SELECT GET_CODE_NM('FIM002', CA.CRDN_SE_CD) FROM DUAL) AS CRDN_SE_NM , (SELECT GET_CODE_NM('FIM007', CA.CRDN_SPAREA_CD) FROM DUAL) AS CRDN_SPAREA_NM , (SELECT GET_CODE_NM('LVS005', CA.USE_FUEL_CD) FROM DUAL) AS USE_FUEL_NM @@ -381,7 +381,7 @@ CA.FFNLG_CARMDL_CD CA.PRK_PSBLTY_RSLT_CD CA.VLTN_NMTM - CA.OVTIME_YN + CA.OVTM_YN V.VLTN_ARTCL P.RTPYR_NM P.RTPYR_NO @@ -468,7 +468,7 @@ , CA.PRK_PSBLTY_RSLT_CD , (SELECT GET_CODE_NM('FIM034', CA.PRK_PSBLTY_RSLT_CD) FROM DUAL) AS PRK_PSBLTY_RSLT_NM , CA.VLTN_NMTM - , CA.OVTIME_YN + , CA.OVTM_YN , V.VLTN_ID , V.VLTN_CD , V.VLTN_ARTCL @@ -601,7 +601,7 @@ CA.FFNLG_CARMDL_CD CA.PRK_PSBLTY_RSLT_CD CA.VLTN_NMTM - CA.OVTIME_YN + CA.OVTM_YN V.VLTN_ARTCL P.RTPYR_NM P.RTPYR_NO diff --git a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml index b0ef5ead..a608ce62 100644 --- a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml @@ -96,10 +96,10 @@ , CA.PRK_PSBLTY_RSLT_CD , (SELECT GET_CODE_NM('FIM034', CA.PRK_PSBLTY_RSLT_CD) FROM DUAL) AS PRK_PSBLTY_RSLT_NM , CA.VLTN_NMTM - , CA.OVTIME_YN - , (SELECT GET_CODE_NM('CMN006', CA.OVTIME_YN) FROM DUAL) AS OVTIME_NM - , CA.OVTIME_PRTTN_YN - , (SELECT GET_CODE_NM('CMN006', CA.OVTIME_PRTTN_YN) FROM DUAL) AS OVTIME_PRTTN_NM + , CA.OVTM_YN + , (SELECT GET_CODE_NM('CMN006', CA.OVTM_YN) FROM DUAL) AS OVTM_NM + , CA.OVTM_PRTTN_YN + , (SELECT GET_CODE_NM('CMN006', CA.OVTM_PRTTN_YN) FROM DUAL) AS OVTM_PRTTN_NM , V.VLTN_ARTCL , P.RTPYR_ID , P.RTPYR_INPT_SE_CD diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp index 6196b08d..54c7ac7b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp @@ -5,10 +5,10 @@
- +
-