From fecd7dc060a91ab521d4880a6387bc099ba982d4 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Mon, 21 Aug 2023 15:12:58 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BB=AC=EB=9F=BC=EB=AA=85=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EB=B0=98=EC=98=81(FFNLG=5FAMT=20->=20FFNLG=5FCRDN?= =?UTF-8?q?=5FAMT)?= 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 | 6 ++-- .../fims/crdn/service/bean/CrdnStngBean.java | 36 +++++++++---------- .../service/bean/CrdnCvlcptServiceBean.java | 6 ++-- .../sql/mapper/fims/crdn/crdn-info-mapper.xml | 4 +-- .../sql/mapper/fims/crdn/crdn-inst-mapper.xml | 4 +-- .../sql/mapper/fims/crdn/crdn-list-mapper.xml | 10 +++--- .../sql/mapper/fims/crdn/crdn-updt-mapper.xml | 4 +-- .../mapper/fims/cvlc/crdnCvlcpt-mapper.xml | 8 ++--- .../WEB-INF/jsp/fims/crdn/crdn06020-main.jsp | 12 +++---- .../WEB-INF/jsp/fims/crdn/crdn06030-main.jsp | 2 +- 11 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/Crdn.java b/src/main/java/cokr/xit/fims/crdn/Crdn.java index 492559d6..ab2aedd3 100644 --- a/src/main/java/cokr/xit/fims/crdn/Crdn.java +++ b/src/main/java/cokr/xit/fims/crdn/Crdn.java @@ -193,9 +193,9 @@ public class Crdn extends AbstractEntity { private String ovtimePrttnYn; /** - * 과태료 금액 + * 과태료 단속 금액 */ - private Integer ffnlgAmt; + private Integer ffnlgCrdnAmt; /** * 과태료 감경 율 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 d3e90c55..c5b7fd98 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 @@ -156,7 +156,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService //금액 계산 int[] basicAmt = crdnStngBean.getBasicAmt(crdn); - crdn.setFfnlgAmt(basicAmt[0]); + crdn.setFfnlgCrdnAmt(basicAmt[0]); crdn.setLevyAmt(basicAmt[0]); crdn.setAdvntceLevyAmt(basicAmt[1]); @@ -269,11 +269,11 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService if(chgAmtSe.equals("0") || chgAmtSe.equals("1")) { int[] basicAmt = crdnStngBean.getBasicAmt(crdn); - crdn.setFfnlgAmt(basicAmt[0]); + crdn.setFfnlgCrdnAmt(basicAmt[0]); crdn.setLevyAmt(basicAmt[0]); crdn.setAdvntceLevyAmt(basicAmt[1]); } else if(chgAmtSe.equals("2")) { - crdn.setFfnlgAmt(10000); + crdn.setFfnlgCrdnAmt(10000); crdn.setLevyAmt(10000); crdn.setAdvntceLevyAmt(8000); } 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 041c3f77..41723951 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 @@ -116,14 +116,14 @@ public class CrdnStngBean extends AbstractComponent { query.setDtlAmtDcsnCd("02"); } - int ffnlgAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0")); + int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0")); - if(ffnlgAmt > 0 && crdn.getOvtimeYn().equals("Y")) { - ffnlgAmt += 10000; + if(ffnlgCrdnAmt > 0 && crdn.getOvtimeYn().equals("Y")) { + ffnlgCrdnAmt += 10000; } - amt[0] = ffnlgAmt; - amt[1] = (int)(ffnlgAmt * 0.8); + amt[0] = ffnlgCrdnAmt; + amt[1] = (int)(ffnlgCrdnAmt * 0.8); } else if(taskSeCd.equals("BPV")) { @@ -138,24 +138,24 @@ public class CrdnStngBean extends AbstractComponent { query.setAmtDcsnCd("03"); } - int ffnlgAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0")); - amt[0] = ffnlgAmt; - amt[1] = ffnlgAmt; + int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0")); + amt[0] = ffnlgCrdnAmt; + amt[1] = ffnlgCrdnAmt; } else if(taskSeCd.equals("DPV")) { query.setAmtDcsnCdGroupId("FIM006"); query.setAmtDcsnCd(crdn.getVltnCd()); - int ffnlgAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0")); - amt[0] = ffnlgAmt; - amt[1] = (int)(ffnlgAmt * 0.8); + int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0")); + amt[0] = ffnlgCrdnAmt; + amt[1] = (int)(ffnlgCrdnAmt * 0.8); } else if(taskSeCd.equals("ECA")) { - int ffnlgAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0")); - amt[0] = ffnlgAmt; - amt[1] = (int)(ffnlgAmt * 0.8); + int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0")); + amt[0] = ffnlgCrdnAmt; + amt[1] = (int)(ffnlgCrdnAmt * 0.8); } else if(taskSeCd.equals("TPV")) { @@ -183,13 +183,13 @@ public class CrdnStngBean extends AbstractComponent { } ; - int ffnlgAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0")); - amt[0] = ffnlgAmt; + int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0")); + amt[0] = ffnlgCrdnAmt; boolean isPenaltyAmt = (crdn.getFfnlgCarmdlCd().equals("13") || crdn.getFfnlgCarmdlCd().equals("14")); //과징금 if(isPenaltyAmt) { - amt[1] = (ffnlgAmt); + amt[1] = (ffnlgCrdnAmt); } else { - amt[1] = (int)(ffnlgAmt * 0.8); + amt[1] = (int)(ffnlgCrdnAmt * 0.8); } } diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java index 7eced90c..b82a3894 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java @@ -390,10 +390,10 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv nonQueryRequest.put("changeAmountYn","N"); } else { int[] basicAmt = crdnStngBean.getBasicAmt(crdn); - int ffnlgAmt = crdnInfo.number("FFNLG_AMT").intValue(); - if(ffnlgAmt != basicAmt[0]){ + int ffnlgCrdnAmt = crdnInfo.number("FFNLG_CRDN_AMT").intValue(); + if(ffnlgCrdnAmt != basicAmt[0]){ nonQueryRequest.put("changeAmountYn","Y"); - crdn.setFfnlgAmt(basicAmt[0]); + crdn.setFfnlgCrdnAmt(basicAmt[0]); crdn.setLevyAmt(basicAmt[0]); crdn.setAdvntceLevyAmt(basicAmt[1]); crdn.setFfnlgRductRt("0"); 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 93ad6493..565ea78e 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 @@ -38,7 +38,7 @@ - + @@ -95,7 +95,7 @@ SELECT C.CRDN_ID , C.CRDN_STTS_CHG_DT , C.LINK_TBL_NM , C.LINK_ID - , C.FFNLG_AMT + , C.FFNLG_CRDN_AMT , C.CRDN_YMD , C.CRDN_TM , C.VLTN_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 08783307..72a52f06 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 @@ -32,7 +32,7 @@ INSERT INTO TB_CRDN ( , VIN , VHCL_NM , VHCL_COLOR - , FFNLG_AMT + , FFNLG_CRDN_AMT , FFNLG_RDUCT_RT , LEVY_AMT , ADVNTCE_BGNG_YMD @@ -81,7 +81,7 @@ INSERT INTO TB_CRDN ( , #{vin} , #{vhclNm} , #{vhclColor} - , #{ffnlgAmt} + , #{ffnlgCrdnAmt} , #{ffnlgRductRt} , #{levyAmt} , #{advntceBgngYmd} 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 8971b67c..b4c9edbd 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 @@ -29,7 +29,7 @@ SELECT C.CRDN_ID , C.VIN , C.VHCL_NM , C.VHCL_COLOR - , C.FFNLG_AMT + , C.FFNLG_CRDN_AMT , C.FFNLG_RDUCT_RT , C.LEVY_AMT , C.ADVNTCE_BGNG_YMD @@ -173,7 +173,7 @@ SELECT C.CRDN_ID , C.CRDN_PLC , C.ATCH_FILE_CNT , C.CRDN_STTS_CD - , C.FFNLG_AMT + , C.FFNLG_CRDN_AMT , C.CRDN_INPT_SE_CD FROM TB_CRDN C @@ -207,7 +207,7 @@ SELECT C.CRDN_ID C.CRDN_PLC C.ATCH_FILE_CNT C.CRDN_STTS_CD - C.FFNLG_AMT + C.FFNLG_CRDN_AMT C.CRDN_INPT_SE_CD #{term} @@ -276,7 +276,7 @@ SELECT GROUP_CONCAT(C.CRDN_ID) AS CRDN_ID_LIST C.CRDN_STDG_NM C.CRDN_PLC C.CRDN_STTS_CD - C.FFNLG_AMT + C.FFNLG_CRDN_AMT P.RTPYR_NM #{term} @@ -320,7 +320,7 @@ SELECT C.CRDN_ID , C.CRDN_STDG_NM , C.CRDN_PLC , C.CRDN_STTS_CD - , C.FFNLG_AMT + , C.FFNLG_CRDN_AMT , P.RTPYR_NM , P.RTPYR_NO FROM TB_CRDN C 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 31749e35..9962055a 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 @@ -26,7 +26,7 @@ , VHCL_NM = #{vhclNm} , VHCL_COLOR = #{vhclColor} , ETC_CN = #{etcCn} - , FFNLG_AMT = #{ffnlgAmt} + , FFNLG_CRDN_AMT = #{ffnlgCrdnAmt} , LEVY_AMT = #{levyAmt} , FFNLG_RDUCT_RT = #{ffnlgRductRt} , ADVNTCE_LEVY_AMT = #{advntceLevyAmt} @@ -96,7 +96,7 @@ UPDATE TB_CRDN SET MDFCN_DT = /* 수정일시 */ , MDFR = #{modifiedBy} /* 수정자 */ - , FFNLG_AMT = #{ffnlgAmt} + , FFNLG_CRDN_AMT = #{ffnlgCrdnAmt} , LEVY_AMT = #{levyAmt} , ADVNTCE_LEVY_AMT = #{advntceLevyAmt} 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 fd21a4a5..94f98e86 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml @@ -93,7 +93,7 @@ SELECT C.CRDN_ID , C.VIN , C.VHCL_NM , C.VHCL_COLOR - , C.FFNLG_AMT + , C.FFNLG_CRDN_AMT , C.FFNLG_RDUCT_RT , C.LEVY_AMT , C.ADVNTCE_BGNG_YMD @@ -348,7 +348,7 @@ SELECT C.CRDN_ID , VHCL_COLOR = #{crdn.vhclColor} /* 차량 색상 */ , ETC_CN = #{crdn.etcCn} /* 기타 내용 */ - , FFNLG_AMT = #{crdn.ffnlgAmt} /* 과태료 금액 */ + , FFNLG_CRDN_AMT = #{crdn.ffnlgCrdnAmt} /* 과태료 금액 */ , LEVY_AMT = #{crdn.levyAmt} /* 부과 금액 */ , FFNLG_RDUCT_RT = #{crdn.ffnlgRductRt} /* 과태료 감경 율 */ , ADVNTCE_LEVY_AMT = #{crdn.advntceLevyAmt} /* 사전통지 부과 금액 */ @@ -436,7 +436,7 @@ INSERT , VIN , VHCL_NM , VHCL_COLOR - , FFNLG_AMT + , FFNLG_CRDN_AMT , FFNLG_RDUCT_RT , LEVY_AMT , ADVNTCE_LEVY_AMT @@ -472,7 +472,7 @@ SELECT #{newCrdnId} , VIN , VHCL_NM , VHCL_COLOR - , FFNLG_AMT + , FFNLG_CRDN_AMT , FFNLG_RDUCT_RT , LEVY_AMT , ADVNTCE_LEVY_AMT diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp index a4d802f4..f36ce5c0 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp @@ -187,7 +187,7 @@ style="min-width: 80px;">사진매수 처리상태 - 원금액 감경금액 @@ -209,7 +209,7 @@ style="max-width:500px;">{CRDN_PLC} {ATCH_FILE_CNT} {CRDN_STTS_CD} - {FFNLG_AMT} + {FFNLG_CRDN_AMT} {unknown} {CRDN_INPT_SE_CD} @@ -298,7 +298,7 @@ >단속장소 처리상태 - 금액 성명 @@ -317,7 +317,7 @@ {CRDN_PLC} {CRDN_STTS_CD} - {FFNLG_AMT} + {FFNLG_CRDN_AMT} {RTPYR_NM} {RTPYR_NO} ************ @@ -371,7 +371,7 @@ $(document).ready(function(){ CRDN_YMD_TM : datetimeFormat, CRDN_INPT_SE_CD : FIM003, CRDN_STTS_CD : FIM010, - FFNLG_AMT : numberFormat + FFNLG_CRDN_AMT : numberFormat //감경금액 } }); @@ -383,7 +383,7 @@ $(document).ready(function(){ urls : { load : "", getInfo : "" }, dataGetter : obj => obj["List"], appendData:true, keymapper : info => info ? info.CRDN_ID_LIST : "", - formats: { CRDN_CNT : numberFormat, FFNLG_AMT : numberFormat } + formats: { CRDN_CNT : numberFormat, FFNLG_CRDN_AMT : numberFormat } }, { urls : { load : "", getInfo : "" }, 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 aa87f1c1..6efabd70 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 @@ -144,7 +144,7 @@ $(document).ready(function(){ formats: { CRDN_INPT_SE_CD : FIM003, CRDN_YMD_TM : datetimeFormat, - FFNLG_AMT : numberFormat, + FFNLG_CRDN_AMT : numberFormat, CRDN_STTS_CD : FIM010, BLNC : numberFormat }