From e21607bdddd61106dae9e888c5304a93ef9b81ed Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Mon, 21 Aug 2023 15:27: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(ADVNTCE=5FLEVY=5FAMT=20->=20ADVN?= =?UTF-8?q?TCE=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 ++-- .../xit/fims/crdn/service/bean/CrdnServiceBean.java | 10 +++++----- .../xit/fims/crdn/service/bean/CrdnStngBean.java | 6 +++--- .../cvlc/service/bean/CrdnCvlcptServiceBean.java | 2 +- .../sql/mapper/fims/crdn/crdn-info-mapper.xml | 2 +- .../sql/mapper/fims/crdn/crdn-inst-mapper.xml | 4 ++-- .../sql/mapper/fims/crdn/crdn-list-mapper.xml | 6 +++--- .../sql/mapper/fims/crdn/crdn-updt-mapper.xml | 10 +++++----- .../sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/Crdn.java b/src/main/java/cokr/xit/fims/crdn/Crdn.java index 95d414a5..2c16b142 100644 --- a/src/main/java/cokr/xit/fims/crdn/Crdn.java +++ b/src/main/java/cokr/xit/fims/crdn/Crdn.java @@ -218,9 +218,9 @@ public class Crdn extends AbstractEntity { private String advntceDudtYmd; /** - * 사전통지 부과 금액 + * 사전통지 금액 */ - private Integer advntceLevyAmt; + private Integer advntceAmt; /** * 의견 제출 여부 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 4f028dbb..cfec457f 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 @@ -105,13 +105,13 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService while(iterator.hasNext()) { DataObject dataObject = iterator.next(); String state = dataObject.string("CRDN_STTS_CD"); - int advntceLevyAmt = dataObject.number("ADVNTCE_LEVY_AMT").intValue(); + int advntceAmt = dataObject.number("ADVNTCE_AMT").intValue(); int ffnlgAmt = dataObject.number("FFNLG_AMT").intValue(); int minusAmt = dataObject.number("MINUS_AMT").intValue(); int adtnAmt = dataObject.number("ADTN_AMT").intValue(); int rcvmtAmt = dataObject.number("RCVMT_AMT").intValue(); - dataObject.set("BLNC", crdnStngBean.getBalance(state,advntceLevyAmt,ffnlgAmt,minusAmt,adtnAmt,rcvmtAmt)); + dataObject.set("BLNC", crdnStngBean.getBalance(state,advntceAmt,ffnlgAmt,minusAmt,adtnAmt,rcvmtAmt)); } } else if(ifEmpty(query.getGridType(), () -> "").equals("photo")) { Iterator iterator = dataObjectList.iterator(); @@ -158,7 +158,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService int[] basicAmt = crdnStngBean.getBasicAmt(crdn); crdn.setFfnlgCrdnAmt(basicAmt[0]); crdn.setFfnlgAmt(basicAmt[0]); - crdn.setAdvntceLevyAmt(basicAmt[1]); + crdn.setAdvntceAmt(basicAmt[1]); //TODO : 납부자 저장 //pyrId = 납부자Bean.save(pyrInfoMap); @@ -271,11 +271,11 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService int[] basicAmt = crdnStngBean.getBasicAmt(crdn); crdn.setFfnlgCrdnAmt(basicAmt[0]); crdn.setFfnlgAmt(basicAmt[0]); - crdn.setAdvntceLevyAmt(basicAmt[1]); + crdn.setAdvntceAmt(basicAmt[1]); } else if(chgAmtSe.equals("2")) { crdn.setFfnlgCrdnAmt(10000); crdn.setFfnlgAmt(10000); - crdn.setAdvntceLevyAmt(8000); + crdn.setAdvntceAmt(8000); } int effected = crdnUpdtMapper.updateCrdnAmt(crdn); 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 6352e296..6f0f9dea 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 @@ -38,17 +38,17 @@ public class CrdnStngBean extends AbstractComponent { /**잔액을 계산한다. * @param state 대장 자료 상태 - * @param advntceLevyAmt 사전통지부과금액 + * @param advntceAmt 사전통지금액 * @param ffnlgAmt 과태료금액 * @param minusAmt 감경금액 * @param adtnAmt 가산금액 * @param rcvmtAmt 수납금액 * @return 잔액 */ - public int getBalance(String state, int advntceLevyAmt, int ffnlgAmt, int minusAmt, int adtnAmt, int rcvmtAmt) { + public int getBalance(String state, int advntceAmt, int ffnlgAmt, int minusAmt, int adtnAmt, int rcvmtAmt) { int result = 0; if(Integer.parseInt(state) < Integer.parseInt("51")) { - result = advntceLevyAmt - rcvmtAmt - minusAmt; + result = advntceAmt - rcvmtAmt - minusAmt; } else if(state.equals("71") || state.equals("72") || state.equals("73") || 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 0570222b..d8070fdc 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 @@ -395,7 +395,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv nonQueryRequest.put("changeAmountYn","Y"); crdn.setFfnlgCrdnAmt(basicAmt[0]); crdn.setFfnlgAmt(basicAmt[0]); - crdn.setAdvntceLevyAmt(basicAmt[1]); + crdn.setAdvntceAmt(basicAmt[1]); crdn.setFfnlgRductRt("0"); } else { nonQueryRequest.put("changeAmountYn","N"); 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 653c05a4..f97a4585 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 @@ -43,7 +43,7 @@ - + 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 a213fd4c..9f0f585c 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 @@ -37,7 +37,7 @@ INSERT INTO TB_CRDN ( , FFNLG_AMT , ADVNTCE_BGNG_YMD , ADVNTCE_DUDT_YMD - , ADVNTCE_LEVY_AMT + , ADVNTCE_AMT , OPNN_SBMSN_YN , ETC_CN , LEVY_ID @@ -86,7 +86,7 @@ INSERT INTO TB_CRDN ( , #{ffnlgAmt} , #{advntceBgngYmd} , #{advntceDudtYmd} - , #{advntceLevyAmt} + , #{advntceAmt} , #{opnnSbmsnYn} , #{etcCn} , #{levyId} 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 c657bfab..0a56f337 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 @@ -34,7 +34,7 @@ SELECT C.CRDN_ID , C.FFNLG_AMT , C.ADVNTCE_BGNG_YMD , C.ADVNTCE_DUDT_YMD - , C.ADVNTCE_LEVY_AMT + , C.ADVNTCE_AMT , C.OPNN_SBMSN_YN , C.ETC_CN , C.LEVY_ID @@ -344,7 +344,7 @@ SELECT C.CRDN_ID , '' AS APLCNT_CRDN_NM , C.CRDN_STTS_CD , C.FFNLG_AMT - , C.ADVNTCE_LEVY_AMT + , C.ADVNTCE_AMT , C.MINUS_AMT , C.ADTN_AMT , C.RCVMT_AMT @@ -398,7 +398,7 @@ SELECT C.CRDN_ID , C.VHRNO , RD.RDUCT_AMT , C.FFNLG_AMT - , C.ADVNTCE_LEVY_AMT + , C.ADVNTCE_AMT , C.MINUS_AMT , C.ADTN_AMT , C.RCVMT_AMT 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 1f19f00b..09b11ecc 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 @@ -29,7 +29,7 @@ , FFNLG_CRDN_AMT = #{ffnlgCrdnAmt} , FFNLG_AMT = #{ffnlgAmt} , FFNLG_RDUCT_RT = #{ffnlgRductRt} - , ADVNTCE_LEVY_AMT = #{advntceLevyAmt} + , ADVNTCE_AMT = #{advntceAmt} , CRDN_STTS_CD = #{crdnSttsCd} , CRDN_STTS_CHG_DT = @@ -94,11 +94,11 @@ /* 단속 금액 수정(crdnUpdtMapper.updateCrdnAmt) */ UPDATE TB_CRDN - SET MDFCN_DT = /* 수정일시 */ - , MDFR = #{modifiedBy} /* 수정자 */ + SET MDFCN_DT = /* 수정일시 */ + , MDFR = #{modifiedBy} /* 수정자 */ , FFNLG_CRDN_AMT = #{ffnlgCrdnAmt} - , FFNLG_AMT = #{ffnlgAmt} - , ADVNTCE_LEVY_AMT = #{advntceLevyAmt} + , FFNLG_AMT = #{ffnlgAmt} + , ADVNTCE_AMT = #{advntceAmt} 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 08b9450f..c145d930 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml @@ -98,7 +98,7 @@ SELECT C.CRDN_ID , C.FFNLG_AMT , C.ADVNTCE_BGNG_YMD , C.ADVNTCE_DUDT_YMD - , C.ADVNTCE_LEVY_AMT + , C.ADVNTCE_AMT , C.OPNN_SBMSN_YN , C.ETC_CN , C.LEVY_ID @@ -348,10 +348,10 @@ SELECT C.CRDN_ID , VHCL_COLOR = #{crdn.vhclColor} /* 차량 색상 */ , ETC_CN = #{crdn.etcCn} /* 기타 내용 */ - , FFNLG_CRDN_AMT = #{crdn.ffnlgCrdnAmt} /* 과태료 단속 금액 */ - , FFNLG_AMT = #{crdn.ffnlgAmt} /* 과태료 금액 */ + , FFNLG_CRDN_AMT = #{crdn.ffnlgCrdnAmt} /* 과태료 단속 금액 */ + , FFNLG_AMT = #{crdn.ffnlgAmt} /* 과태료 금액 */ , FFNLG_RDUCT_RT = #{crdn.ffnlgRductRt} /* 과태료 감경 율 */ - , ADVNTCE_LEVY_AMT = #{crdn.advntceLevyAmt} /* 사전통지 부과 금액 */ + , ADVNTCE_AMT = #{crdn.advntceAmt} /* 사전통지 금액 */ , CRDN_STTS_CD = #{crdn.crdnSttsCd} /* 단속 상태 코드 */ @@ -439,7 +439,7 @@ INSERT , FFNLG_CRDN_AMT , FFNLG_RDUCT_RT , FFNLG_AMT - , ADVNTCE_LEVY_AMT + , ADVNTCE_AMT , ETC_CN ) SELECT #{newCrdnId} @@ -475,7 +475,7 @@ SELECT #{newCrdnId} , FFNLG_CRDN_AMT , FFNLG_RDUCT_RT , FFNLG_AMT - , ADVNTCE_LEVY_AMT + , ADVNTCE_AMT , ETC_CN FROM TB_CRDN WHERE CRDN_ID = #{crdnId}