From a41fd2cbd91a875cf00a4aedc6f304993ca80a73 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 26 May 2023 16:04:17 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=88=98=EC=A0=95=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sql/mapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml | 2 +- .../sql/mapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml | 5 +---- src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtPopup.jsp | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) 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 14a838ef..7ac3bcae 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 @@ -29,7 +29,7 @@ , trr.redution_amount -- 감경금액 , '' AS redution_aft_amount -- 감경후 금액 , trr.rciv_amount -- 수납금액 - , trr.rdcamt -- 감액 + , '' AS rdcamt -- 감액 , trr.adamt -- 가산금 , trr.vhrno -- 차량번호 , trr.vhcl_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 90e41fa4..a591f586 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 @@ -30,7 +30,7 @@ , trr.redution_amount -- 감경금액 , '' AS redution_aft_amount -- 감경후 금액 , trr.rciv_amount -- 수납금액 - , trr.rdcamt -- 감액 + , '' AS rdcamt -- 감액 , trr.adamt -- 가산금 , trr.vhrno -- 차량번호 , trr.vhcl_nm -- 차량명 @@ -116,7 +116,6 @@ , vltn_nmtm , redution_amount , rciv_amount - , rdcamt , adamt , vhrno , vhcl_nm @@ -136,7 +135,6 @@ , #{vltnNmtm} , #{redutionAmount} , #{rcivAmount} - , #{rdcamt} , #{adamt} , #{vhrno} , #{vhclNm} @@ -157,7 +155,6 @@ , 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}) - , rdcamt = IF(rdcamt = #{rdcamt}, rdcamt, #{rdcamt}) , adamt = IF(adamt = #{adamt}, adamt, #{adamt}) , vhrno = IF(vhrno = #{vhrno}, vhrno, #{vhrno}) , vhcl_nm = IF(vhcl_nm = #{vhclNm}, vhcl_nm, #{vhclNm}) 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 32db068b..5ec3758f 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 @@ -77,7 +77,7 @@ 감액 - + 가산금