From c7be15ee15013cf85e2183b6a14b6ca499ad6687 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 26 May 2023 14:55:37 +0900 Subject: [PATCH] =?UTF-8?q?fix=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(=EB=B2=95=EC=A0=95?= =?UTF-8?q?=EB=8F=99)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kr/xit/fims/biz/cmm/NtriDTO.java | 8 ++++---- src/main/java/kr/xit/fims/biz/rt/RtDTO.java | 2 +- .../mapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml | 10 +++++----- .../sql/mapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml | 4 ++-- .../mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml | 6 +++--- .../mapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml | 2 +- .../jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp | 6 +++--- .../jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) 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 fb3b2967..c21dc91c 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/NtriDTO.java +++ b/src/main/java/kr/xit/fims/biz/cmm/NtriDTO.java @@ -146,7 +146,7 @@ public class NtriDTO { @NotEmpty @Size(min = 10, max = 10, message = "지역코드") @Builder.Default - private String violtStdgCd = "0000000000"; + private String crdnStdgCd = "0000000000"; /** * gps X: 20 * 단속정보를 파일명으로 하는 인터페이스( _0002, _0004)의 경우에만 기본값 "000" @@ -243,8 +243,8 @@ public class NtriDTO { this.regionSe = StringUtils.rightPad(nvl(regionSe), 1, " "); } - public void setVioltStdgCd(String violtStdgCd) { - this.violtStdgCd = StringUtils.rightPad(nvl(violtStdgCd), 10, " "); + public void setCrdnStdgCd(String crdnStdgCd) { + this.crdnStdgCd = StringUtils.rightPad(nvl(crdnStdgCd), 10, " "); } public void setGpsX(String gpsX) { @@ -295,7 +295,7 @@ public class NtriDTO { sb.append(crdnPlc).append('|'); sb.append(crdnSpareaCd).append('|'); sb.append(regionSe).append('|'); - sb.append(violtStdgCd).append('|'); + sb.append(crdnStdgCd).append('|'); if((Checks.isEmpty(gpsX) || Checks.isEmpty(gpsX.trim())) && (SendNtriPhotoInterfaceId.PARK_FILE_NAME.getCode().equals(ifId) 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 5f083e81..dcb7985c 100644 --- a/src/main/java/kr/xit/fims/biz/rt/RtDTO.java +++ b/src/main/java/kr/xit/fims/biz/rt/RtDTO.java @@ -78,7 +78,7 @@ public class RtDTO { /** * 위반 법정동 코드 */ - private String violtStdgCd; + private String crdnStdgNm; /** * gps_x */ 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 f27192b4..50d8068e 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 @@ -20,7 +20,7 @@ , trr.violt_dtls_etc_cn -- 위반내역 기타 내용 , trr.crdn_plc -- 위반장소 , trr.vltn_nmtm -- 위반횟수 - , trr.violt_stdg_cd -- 위반법정코드 + , trr.crdn_stdg_nm -- 위반법정동명 , trr.gps_x , trr.gps_y , trr.towng_yn -- 견인여부 코드 @@ -196,7 +196,7 @@ , crdn_bgng_tm = IF(crdn_bgng_tm = REPLACE(#{crdnBgngTm}, ':', ''), crdn_bgng_tm, REPLACE(#{crdnBgngTm}, ':', '')) , atch_file_cnt = IF(atch_file_cnt = #{atchFileCnt}, atch_file_cnt, #{atchFileCnt}) , crdn_plc = IF(crdn_plc = #{crdnPlc}, crdn_plc, #{crdnPlc}) - , violt_stdg_cd = IF(violt_stdg_cd = #{violtStdgCd}, violt_stdg_cd, #{violtStdgCd}) + , crdn_stdg_nm = IF(crdn_stdg_nm = #{crdnStdgNm}, crdn_stdg_nm, #{crdnStdgNm}) , vhrno = IF(vhrno = #{vhrno}, vhrno, #{vhrno}) , vhcl_nm = IF(vhcl_nm = #{vhclNm}, vhcl_nm, #{vhclNm}) , vin = IF(vin = #{vin}, vin, #{vin}) @@ -467,10 +467,10 @@ , trr.crdn_plc -- 위반장소 , trr.crdn_sparea_cd -- 단속특별구역구분 , '1' AS regionSe -- 지역구분 - , CASE WHEN NULLIF(trr.violt_stdg_cd, '') IS NULL + , CASE WHEN NULLIF(trr.crdn_stdg_nm, '') IS NULL THEN '0000000000' - ELSE trr.violt_stdg_cd - END AS violtStdgCd -- 지역코드 + ELSE trr.crdn_stdg_nm + END AS crdnStdgCd -- 지역코드 , trr.gps_x , trr.gps_y , '' AS vhclNoX -- 자동차등록번호판위치 X축 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 3371f570..10e70d39 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 @@ -219,7 +219,7 @@ , violt_dtls_etc_cn , crdn_plc , vltn_nmtm - , violt_stdg_cd + , crdn_stdg_nm , crdn_sparea_cd , gps_x , gps_y @@ -246,7 +246,7 @@ , '' -- 위반 내역 기타 내용 , ecsd.crdn_plc , '1' -- 위반 횟수 - , (SELECT tgt.stdg_cd + , (SELECT tgt.stdg_nm FROM tb_stdg_info tgt WHERE tgt.stdg_nm = null limit 1 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 0ca231c0..49a09fcb 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 @@ -151,7 +151,7 @@ , violt_dtls_etc_cn , crdn_plc , vltn_nmtm - , violt_stdg_cd + , crdn_stdg_nm , crdn_sparea_cd , gps_x , gps_y @@ -182,11 +182,11 @@ , '' -- 위반 내역 기타 내용 , #{crdnPlc} -- crdn_plc , '1' -- 위반 횟수 - , (SELECT tgt.stdg_cd + , (SELECT tgt.stdg_nm FROM tb_stdg_info tgt WHERE tgt.stdg_nm = #{regltDongNm} limit 1 - ) -- 위반 법정동 코드 + ) -- 위반 법정동 명 , (SELECT tgt.mapng_code FROM tb_cmm_code_mapng tgt WHERE tgt.transr_code_nm = #{regltSpeclZoneNm} 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 47407dfc..203c9e59 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 @@ -21,7 +21,7 @@ , trr.violt_dtls_etc_cn -- 위반내역 기타 내용 , trr.crdn_plc -- 위반장소 , trr.vltn_nmtm -- 위반횟수 - , trr.violt_stdg_cd -- 위반법정코드 + , trr.crdn_stdg_nm -- 위반법정코드 , trr.gps_x , trr.gps_y , trr.towng_yn -- 견인여부 코드 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 100576c4..8b288376 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 @@ -127,11 +127,11 @@ Date Author Description 시군구 - + 법정동 - + @@ -532,7 +532,7 @@ Date Author Description //시군군 추가 - ,violtStdgCd: $('input[name=violtStdgCd]').val() + ,crdnStdgNm: $('input[name=crdnStdgNm]').val() ,vhrno: $('input[name=vhrno]').val() //면제차량 여부 추가 : $('input:checkbox[name=sysSeCd]:checked').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 d7a82b36..db0d9aff 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 @@ -207,11 +207,11 @@ Date Author Description 시군구 - + 법정동 - +