From e1eae0f47f197b806b8a7b70b8f071a332c68aaf Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 26 May 2023 10:48:59 +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/FimsConst.java | 2 +- src/main/java/kr/xit/fims/biz/cmm/NtriDTO.java | 10 +++++----- src/main/java/kr/xit/fims/biz/rt/RtDTO.java | 2 +- .../mapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml | 6 +++--- .../sql/mapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml | 2 +- .../mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml | 2 +- .../mapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml | 2 +- .../jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp | 4 ++-- .../jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp | 2 +- .../resources/js/fims/biz/common/codeComboData.js | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/kr/xit/fims/biz/FimsConst.java b/src/main/java/kr/xit/fims/biz/FimsConst.java index e10fb60d..8e1dc432 100644 --- a/src/main/java/kr/xit/fims/biz/FimsConst.java +++ b/src/main/java/kr/xit/fims/biz/FimsConst.java @@ -225,7 +225,7 @@ public class FimsConst { */ @Getter @AllArgsConstructor - public enum RegltSpeclZoneSeCode { + public enum CrdnSpareaCd { CHILD("01", "어린이보호구역") ,SENIOR("02", "노인보호구역") ,FIRE("03", "소방시설") diff --git a/src/main/java/kr/xit/fims/biz/cmm/NtriDTO.java b/src/main/java/kr/xit/fims/biz/cmm/NtriDTO.java index 502f2cb6..f1b268ce 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/NtriDTO.java +++ b/src/main/java/kr/xit/fims/biz/cmm/NtriDTO.java @@ -123,7 +123,7 @@ public class NtriDTO { private String crdnPlc; /** * 단속특별구역구분: 2 - * FimsConst.RegltSpeclZoneSeCode + * FimsConst.CrdnSpareaCd * 01: 어린이보호구역 * 02: 노인보호구역 * 03: 소방시설 @@ -132,7 +132,7 @@ public class NtriDTO { */ @NotEmpty @Size(min = 2, max = 2, message = "단속특별구역구분") - private String regltSpeclZoneSeCode; + private String crdnSpareaCd; /** * 지역구분: 1 - 필수 */ @@ -245,8 +245,8 @@ public class NtriDTO { this.crdnPlc = StringUtils.rightPad(nvl(crdnPlc), 60, " "); } - public void setRegltSpeclZoneSeCode(String regltSpeclZoneSeCode) { - this.regltSpeclZoneSeCode = StringUtils.rightPad(nvl(regltSpeclZoneSeCode), 2, " "); + public void setCrdnSpareaCd(String crdnSpareaCd) { + this.crdnSpareaCd = StringUtils.rightPad(nvl(crdnSpareaCd), 2, " "); } public void setRegionSe(String regionSe) { @@ -307,7 +307,7 @@ public class NtriDTO { } sb.append(crdnPlc).append('|'); - sb.append(regltSpeclZoneSeCode).append('|'); + sb.append(crdnSpareaCd).append('|'); sb.append(regionSe).append('|'); sb.append(violtStdgCd).append('|'); 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 1eea9f37..d172a191 100644 --- a/src/main/java/kr/xit/fims/biz/rt/RtDTO.java +++ b/src/main/java/kr/xit/fims/biz/rt/RtDTO.java @@ -150,7 +150,7 @@ public class RtDTO { /** * 단속 특별 구역 구분 코드 */ - private String regltSpeclZoneSeCode; + private String crdnSpareaCd; /** * 특기 사항 */ 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 df5f9276..20e3e81f 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 @@ -38,7 +38,7 @@ , trr.vhcty_asort_code -- 차종종별코드 , trr.vin -- 차대번호 , trr.spcmnt_matter -- 특기사항 - , trr.reglt_specl_zone_se_code -- 단속특별구역코드 + , trr.crdn_sparea_cd -- 단속특별구역코드 , trr.reglt_process_sttus_code , trr.last_process_dt -- 최종처리일시 , trr.last_opetr -- 최종 처리자 @@ -203,7 +203,7 @@ , vin = IF(vin = #{vin}, vin, #{vin}) , vhcty_asort_code = IF(vhcty_asort_code = #{vhctyAsortCode}, vhcty_asort_code, #{vhctyAsortCode}) , spcmnt_matter = IF(spcmnt_matter = #{spcmntMatter}, spcmnt_matter, #{spcmntMatter}) - , reglt_specl_zone_se_code = IF(reglt_specl_zone_se_code = #{regltSpeclZoneSeCode}, reglt_specl_zone_se_code, #{regltSpeclZoneSeCode}) + , crdn_sparea_cd = IF(crdn_sparea_cd = #{crdnSpareaCd}, crdn_sparea_cd, #{crdnSpareaCd}) , violt_dtls_code = IF(violt_dtls_code = #{violtDtlsCode}, violt_dtls_code, #{violtDtlsCode}) , reglt_process_sttus_code = IF(reglt_process_sttus_code = #{regltProcessSttusCode}, reglt_process_sttus_code, #{regltProcessSttusCode}) , rtpyr_id = IF(rtpyr_id = #{rtpyrId}, rtpyr_id, #{rtpyrId}) @@ -464,7 +464,7 @@ , trr.violt_dtls_etc_cn -- 위반내역기타내용 , trr.violt_lrg_code -- 위반법규(?? 60자리) , trr.crdn_plc -- 위반장소 - , trr.reglt_specl_zone_se_code -- 단속특별구역구분 + , trr.crdn_sparea_cd -- 단속특별구역구분 , '1' AS regionSe -- 지역구분 , CASE WHEN NULLIF(trr.violt_stdg_cd, '') IS NULL THEN '0000000000' diff --git a/src/main/resources/sql/mapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml b/src/main/resources/sql/mapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml index ff4e1a19..edcad788 100644 --- a/src/main/resources/sql/mapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml @@ -220,7 +220,7 @@ , crdn_plc , violt_co , violt_stdg_cd - , reglt_specl_zone_se_code + , crdn_sparea_cd , gps_x , gps_y , towng_at_code diff --git a/src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml b/src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml index 71dcd914..44ab4dc6 100644 --- a/src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml @@ -152,7 +152,7 @@ , crdn_plc , violt_co , violt_stdg_cd - , reglt_specl_zone_se_code + , crdn_sparea_cd , gps_x , gps_y , towng_at_code 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 f3f52898..66c99858 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 @@ -38,7 +38,7 @@ , trr.vhcty_asort_code -- 차종종별코드 , trr.vin -- 차대번호 , trr.spcmnt_matter -- 특기사항 - , trr.reglt_specl_zone_se_code -- 단속특별구역코드 + , trr.crdn_sparea_cd -- 단속특별구역코드 , trr.reglt_process_sttus_code , trr.last_process_dt , trr.last_opetr diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp index bdff81cf..e4aea57a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp @@ -192,7 +192,7 @@ Date Author Description 특별단속구역 - + 위반내용 @@ -538,7 +538,7 @@ Date Author Description ,spcmntMatter: $('input[name=spcmntMatter]').val() ,vhctyAsortCode: $('select[name=vhctyAsortCode]').val() - ,regltSpeclZoneSeCode: $('select[name=regltSpeclZoneSeCode]').val() + ,crdnSpareaCd: $('select[name=crdnSpareaCd]').val() ,violtDtlsCode: $('select[name=violtDtlsCode]').val() ,vhcleNm: $('input[name=vhcleNm]').val() ,vin: $('input[name=vin]').val() 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 f03887d5..a7bb2e62 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 @@ -255,7 +255,7 @@ Date Author Description 특별단속구역 - + 위반내용 diff --git a/src/main/webapp/resources/js/fims/biz/common/codeComboData.js b/src/main/webapp/resources/js/fims/biz/common/codeComboData.js index e7c051f6..b2d5647c 100644 --- a/src/main/webapp/resources/js/fims/biz/common/codeComboData.js +++ b/src/main/webapp/resources/js/fims/biz/common/codeComboData.js @@ -73,7 +73,7 @@ ComboCodeData = { ] // 단속 특별 구역 구분 코드 : FIM006 - ,regltSpeclZoneSeCode: [ + ,crdnSpareaCd: [ {value: '01', text: '어린이 보호구역'} ,{value: '02', text: '노인 보호구역'} ,{value: '03', text: '소방시설'}