From c26b5e3951c80383bca9f2733edf466b2a9c66d7 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 26 May 2023 16:10:07 +0900 Subject: [PATCH] =?UTF-8?q?refactor=20:=20=EB=8B=A8=EC=86=8D=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kr/xit/fims/biz/rt/RtDTO.java | 6 ++--- .../cmm/cmm-fims-crackdown-mysql-mapper.xml | 6 ++--- .../biz/rt/rt-reglt-and-erpp-mysql-mapper.xml | 24 +++++++++---------- .../biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp | 6 ++--- .../jsp/fims/biz/rt/rtRegltMgtForm.jsp | 2 +- .../jsp/fims/biz/rt/rtRegltMgtPopup.jsp | 6 ++--- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/kr/xit/fims/biz/rt/RtDTO.java b/src/main/java/kr/xit/fims/biz/rt/RtDTO.java index 8774cab6..abcbea3e 100644 --- a/src/main/java/kr/xit/fims/biz/rt/RtDTO.java +++ b/src/main/java/kr/xit/fims/biz/rt/RtDTO.java @@ -130,7 +130,7 @@ public class RtDTO { /** * 감경 금액 */ - private long redutionAmount; + private long minusAmt; /** * 감경 후 금액 */ @@ -138,7 +138,7 @@ public class RtDTO { /** * 수납 금액 */ - private long rcivAmount; + private long rcvmtAmt; /** * 감액 */ @@ -146,7 +146,7 @@ public class RtDTO { /** * 가산금 */ - private long adamt; + private long adtnAmt; /** * 단속 특별 구역 구분 코드 */ diff --git a/src/main/resources/sql/mapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml b/src/main/resources/sql/mapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml index 7ac3bcae..d44369fa 100644 --- a/src/main/resources/sql/mapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml @@ -26,11 +26,11 @@ , trr.towng_yn -- 견인여부 코드 , trr.crdn_sn -- 스티커 번호 , trr.atch_file_cnt -- 이미지매수 - , trr.redution_amount -- 감경금액 + , trr.minus_amt -- 감경금액 , '' AS redution_aft_amount -- 감경후 금액 - , trr.rciv_amount -- 수납금액 + , trr.rcvmt_amt -- 수납금액 , '' AS rdcamt -- 감액 - , trr.adamt -- 가산금 + , trr.adtnAmt -- 가산금 , trr.vhrno -- 차량번호 , trr.vhcl_nm -- 차량명 , trr.carmdl_clsf_nm -- 차종분류명 diff --git a/src/main/resources/sql/mapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml b/src/main/resources/sql/mapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml index a591f586..4d88715f 100644 --- a/src/main/resources/sql/mapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml @@ -27,11 +27,11 @@ , trr.towng_yn -- 견인여부 코드 , trr.crdn_sn -- 스티커 번호 , trr.atch_file_cnt -- 이미지매수 - , trr.redution_amount -- 감경금액 + , trr.minus_amt -- 감경금액 , '' AS redution_aft_amount -- 감경후 금액 - , trr.rciv_amount -- 수납금액 + , trr.rcvmt_amt -- 수납금액 , '' AS rdcamt -- 감액 - , trr.adamt -- 가산금 + , trr.adtnAmt -- 가산금 , trr.vhrno -- 차량번호 , trr.vhcl_nm -- 차량명 , trr.carmdl_clsf_nm -- 차종분류명 @@ -114,9 +114,9 @@ , crdn_ymd , crdn_plc , vltn_nmtm - , redution_amount - , rciv_amount - , adamt + , minus_amt + , rcvmt_amt + , adtnAmt , vhrno , vhcl_nm , reg_dt @@ -133,9 +133,9 @@ , #{crdnYmd} , #{crdnPlc} , #{vltnNmtm} - , #{redutionAmount} - , #{rcivAmount} - , #{adamt} + , #{minusAmt} + , #{rcvmtAmt} + , #{adtnAmt} , #{vhrno} , #{vhclNm} , #{regDt} @@ -153,9 +153,9 @@ , crdn_inpt_se_cd = IF(crdn_inpt_se_cd = #{crdnInptSeCd}, crdn_inpt_se_cd, #{crdnInptSeCd}) , crdn_plc = IF(crdn_plc = #{crdnPlc}, crdn_plc, #{crdnPlc}) , vltn_nmtm = IF(vltn_nmtm = #{vltnNmtm}, vltn_nmtm, #{vltnNmtm}) - , redution_amount = IF(redution_amount = #{redutionAmount}, redution_amount, #{redutionAmount}) - , rciv_amount = IF(rciv_amount = #{rcivAmount}, rciv_amount, #{rcivAmount}) - , adamt = IF(adamt = #{adamt}, adamt, #{adamt}) + , minus_amt = IF(minus_amt = #{minusAmt}, minus_amt, #{minusAmt}) + , rcvmt_amt = IF(rcvmt_amt = #{rcvmtAmt}, rcvmt_amt, #{rcvmtAmt}) + , adtnAmt = IF(adtnAmt = #{adtnAmt}, adtnAmt, #{adtnAmt}) , vhrno = IF(vhrno = #{vhrno}, vhrno, #{vhrno}) , vhcl_nm = IF(vhcl_nm = #{vhclNm}, vhcl_nm, #{vhclNm}) , violt_dtls_code = IF(violt_dtls_code = #{violtDtlsCode}, violt_dtls_code, #{violtDtlsCode}) diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp index 12d7a2bf..74dca663 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp @@ -228,11 +228,11 @@ Date Author Description 감경금액 - + 총수납액 - + 잔액 @@ -496,7 +496,7 @@ Date Author Description 감경금액 - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtForm.jsp index ac6a43fd..80bd6304 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtForm.jsp @@ -268,7 +268,7 @@ }, { header: '수납금액', - name: 'rcivAmount', + name: 'rcvmtAmt', minWidth: 100, sortable: false, align: 'right' diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtPopup.jsp index 5ec3758f..681b4f87 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtPopup.jsp @@ -69,17 +69,17 @@ 감경금액 - + 감경후 금액 수납금액 - + 감액 가산금 - +