diff --git a/src/main/java/cokr/xit/fims/crdn/Crdn.java b/src/main/java/cokr/xit/fims/crdn/Crdn.java index ab2aedd3..95d414a5 100644 --- a/src/main/java/cokr/xit/fims/crdn/Crdn.java +++ b/src/main/java/cokr/xit/fims/crdn/Crdn.java @@ -203,9 +203,9 @@ public class Crdn extends AbstractEntity { private String ffnlgRductRt; /** - * 부과 금액 + * 과태료 금액 */ - private Integer levyAmt; + private Integer ffnlgAmt; /** * 사전통지 시작 일자 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 c5b7fd98..4f028dbb 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 @@ -106,12 +106,12 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService DataObject dataObject = iterator.next(); String state = dataObject.string("CRDN_STTS_CD"); int advntceLevyAmt = dataObject.number("ADVNTCE_LEVY_AMT").intValue(); - int levyAmt = dataObject.number("LEVY_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,levyAmt,minusAmt,adtnAmt,rcvmtAmt)); + dataObject.set("BLNC", crdnStngBean.getBalance(state,advntceLevyAmt,ffnlgAmt,minusAmt,adtnAmt,rcvmtAmt)); } } else if(ifEmpty(query.getGridType(), () -> "").equals("photo")) { Iterator iterator = dataObjectList.iterator(); @@ -157,7 +157,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService //금액 계산 int[] basicAmt = crdnStngBean.getBasicAmt(crdn); crdn.setFfnlgCrdnAmt(basicAmt[0]); - crdn.setLevyAmt(basicAmt[0]); + crdn.setFfnlgAmt(basicAmt[0]); crdn.setAdvntceLevyAmt(basicAmt[1]); //TODO : 납부자 저장 @@ -270,11 +270,11 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService if(chgAmtSe.equals("0") || chgAmtSe.equals("1")) { int[] basicAmt = crdnStngBean.getBasicAmt(crdn); crdn.setFfnlgCrdnAmt(basicAmt[0]); - crdn.setLevyAmt(basicAmt[0]); + crdn.setFfnlgAmt(basicAmt[0]); crdn.setAdvntceLevyAmt(basicAmt[1]); } else if(chgAmtSe.equals("2")) { crdn.setFfnlgCrdnAmt(10000); - crdn.setLevyAmt(10000); + crdn.setFfnlgAmt(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 41723951..6352e296 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 @@ -39,13 +39,13 @@ public class CrdnStngBean extends AbstractComponent { /**잔액을 계산한다. * @param state 대장 자료 상태 * @param advntceLevyAmt 사전통지부과금액 - * @param levyAmt 부과금액 + * @param ffnlgAmt 과태료금액 * @param minusAmt 감경금액 * @param adtnAmt 가산금액 * @param rcvmtAmt 수납금액 * @return 잔액 */ - public int getBalance(String state, int advntceLevyAmt, int levyAmt, int minusAmt, int adtnAmt, int rcvmtAmt) { + public int getBalance(String state, int advntceLevyAmt, int ffnlgAmt, int minusAmt, int adtnAmt, int rcvmtAmt) { int result = 0; if(Integer.parseInt(state) < Integer.parseInt("51")) { result = advntceLevyAmt - rcvmtAmt - minusAmt; @@ -63,7 +63,7 @@ public class CrdnStngBean extends AbstractComponent { state.equals("85")) { } else { - result = levyAmt - rcvmtAmt - minusAmt + adtnAmt; + result = ffnlgAmt - rcvmtAmt - minusAmt + adtnAmt; } return result; 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 b82a3894..0570222b 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 @@ -394,7 +394,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv if(ffnlgCrdnAmt != basicAmt[0]){ nonQueryRequest.put("changeAmountYn","Y"); crdn.setFfnlgCrdnAmt(basicAmt[0]); - crdn.setLevyAmt(basicAmt[0]); + crdn.setFfnlgAmt(basicAmt[0]); crdn.setAdvntceLevyAmt(basicAmt[1]); crdn.setFfnlgRductRt("0"); } else { 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 565ea78e..653c05a4 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 @@ -40,7 +40,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 72a52f06..a213fd4c 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 @@ -34,7 +34,7 @@ INSERT INTO TB_CRDN ( , VHCL_COLOR , FFNLG_CRDN_AMT , FFNLG_RDUCT_RT - , LEVY_AMT + , FFNLG_AMT , ADVNTCE_BGNG_YMD , ADVNTCE_DUDT_YMD , ADVNTCE_LEVY_AMT @@ -83,7 +83,7 @@ INSERT INTO TB_CRDN ( , #{vhclColor} , #{ffnlgCrdnAmt} , #{ffnlgRductRt} - , #{levyAmt} + , #{ffnlgAmt} , #{advntceBgngYmd} , #{advntceDudtYmd} , #{advntceLevyAmt} 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 b4c9edbd..c657bfab 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 @@ -31,7 +31,7 @@ SELECT C.CRDN_ID , C.VHCL_COLOR , C.FFNLG_CRDN_AMT , C.FFNLG_RDUCT_RT - , C.LEVY_AMT + , C.FFNLG_AMT , C.ADVNTCE_BGNG_YMD , C.ADVNTCE_DUDT_YMD , C.ADVNTCE_LEVY_AMT @@ -343,7 +343,7 @@ SELECT C.CRDN_ID , C.CRDN_STDG_NM , '' AS APLCNT_CRDN_NM , C.CRDN_STTS_CD - , C.LEVY_AMT + , C.FFNLG_AMT , C.ADVNTCE_LEVY_AMT , C.MINUS_AMT , C.ADTN_AMT @@ -397,7 +397,7 @@ SELECT C.CRDN_ID , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM , C.VHRNO , RD.RDUCT_AMT - , C.LEVY_AMT + , C.FFNLG_AMT , C.ADVNTCE_LEVY_AMT , C.MINUS_AMT , C.ADTN_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 9962055a..1f19f00b 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 @@ -27,7 +27,7 @@ , VHCL_COLOR = #{vhclColor} , ETC_CN = #{etcCn} , FFNLG_CRDN_AMT = #{ffnlgCrdnAmt} - , LEVY_AMT = #{levyAmt} + , FFNLG_AMT = #{ffnlgAmt} , FFNLG_RDUCT_RT = #{ffnlgRductRt} , ADVNTCE_LEVY_AMT = #{advntceLevyAmt} @@ -97,7 +97,7 @@ SET MDFCN_DT = /* 수정일시 */ , MDFR = #{modifiedBy} /* 수정자 */ , FFNLG_CRDN_AMT = #{ffnlgCrdnAmt} - , LEVY_AMT = #{levyAmt} + , FFNLG_AMT = #{ffnlgAmt} , 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 94f98e86..08b9450f 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml @@ -95,7 +95,7 @@ SELECT C.CRDN_ID , C.VHCL_COLOR , C.FFNLG_CRDN_AMT , C.FFNLG_RDUCT_RT - , C.LEVY_AMT + , C.FFNLG_AMT , C.ADVNTCE_BGNG_YMD , C.ADVNTCE_DUDT_YMD , C.ADVNTCE_LEVY_AMT @@ -348,8 +348,8 @@ SELECT C.CRDN_ID , VHCL_COLOR = #{crdn.vhclColor} /* 차량 색상 */ , ETC_CN = #{crdn.etcCn} /* 기타 내용 */ - , FFNLG_CRDN_AMT = #{crdn.ffnlgCrdnAmt} /* 과태료 금액 */ - , LEVY_AMT = #{crdn.levyAmt} /* 부과 금액 */ + , FFNLG_CRDN_AMT = #{crdn.ffnlgCrdnAmt} /* 과태료 단속 금액 */ + , FFNLG_AMT = #{crdn.ffnlgAmt} /* 과태료 금액 */ , FFNLG_RDUCT_RT = #{crdn.ffnlgRductRt} /* 과태료 감경 율 */ , ADVNTCE_LEVY_AMT = #{crdn.advntceLevyAmt} /* 사전통지 부과 금액 */ @@ -438,7 +438,7 @@ INSERT , VHCL_COLOR , FFNLG_CRDN_AMT , FFNLG_RDUCT_RT - , LEVY_AMT + , FFNLG_AMT , ADVNTCE_LEVY_AMT , ETC_CN ) @@ -474,7 +474,7 @@ SELECT #{newCrdnId} , VHCL_COLOR , FFNLG_CRDN_AMT , FFNLG_RDUCT_RT - , LEVY_AMT + , FFNLG_AMT , ADVNTCE_LEVY_AMT , ETC_CN FROM TB_CRDN