From 136b954c7783098629847250110aa5236e6feb8d Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 2 Jun 2023 18:32:18 +0900 Subject: [PATCH] =?UTF-8?q?refactor=20:=20=EC=97=85=EB=AC=B4=EC=98=81?= =?UTF-8?q?=EC=97=AD=EC=97=90=EC=84=9C=20=EA=B8=B0=EC=A1=B4=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/xit/fims/biz/cmm/FimsCrackdownDTO.java | 10 +++---- .../bean/FimsCrackdownMgtServiceBean.java | 2 +- .../kr/xit/fims/biz/ec/CctvCrackdownDTO.java | 2 +- .../java/kr/xit/fims/biz/ec/CtznStmtDTO.java | 2 +- src/main/java/kr/xit/fims/biz/rt/RtDTO.java | 8 ++--- .../cmm/cmm-fims-crackdown-mysql-mapper.xml | 8 ++--- .../biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml | 22 ++++++-------- .../ec/ec-extrl-reglt-cntc-mysql-mapper.xml | 16 ++++------ .../biz/rt/rt-reglt-and-erpp-mysql-mapper.xml | 30 ++++++++----------- .../fims/biz/cmm/cmmEnlightDisallowPopup.jsp | 16 +++++----- .../biz/cmm/cmmFimsCrackdownEditPopup.jsp | 6 ++-- .../biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp | 6 ++-- .../fims/biz/cmm/cmmIntegratedSearchForm.jsp | 6 ++-- .../fims/biz/rt/rtAnswerTargetDataForm.jsp | 8 ++--- .../jsp/fims/biz/rt/rtAnswerWaitDataForm.jsp | 8 ++--- .../jsp/fims/biz/rt/rtInitialDataForm.jsp | 8 ++--- 16 files changed, 73 insertions(+), 85 deletions(-) diff --git a/src/main/java/kr/xit/fims/biz/cmm/FimsCrackdownDTO.java b/src/main/java/kr/xit/fims/biz/cmm/FimsCrackdownDTO.java index ea4e0612..c6756eab 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/FimsCrackdownDTO.java +++ b/src/main/java/kr/xit/fims/biz/cmm/FimsCrackdownDTO.java @@ -54,9 +54,9 @@ public class FimsCrackdownDTO { private String stdgCd; // 서손 - private String erppId; - private String erppSeCode; - private String erppResnDetail; + private String levyExclId; + private String levyExclRsnCd; + private String etcCn; } @EqualsAndHashCode(callSuper = true) @@ -157,9 +157,9 @@ public class FimsCrackdownDTO { private String crdnSttsCd; private String enlightResnCode; - private String erppId; + private String levyExclId; private String erppResnCode; - private String erppResnDetail; + private String etcCn; private String rtpyrId; private String tmplatId; diff --git a/src/main/java/kr/xit/fims/biz/cmm/service/bean/FimsCrackdownMgtServiceBean.java b/src/main/java/kr/xit/fims/biz/cmm/service/bean/FimsCrackdownMgtServiceBean.java index 62337040..ff546354 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/service/bean/FimsCrackdownMgtServiceBean.java +++ b/src/main/java/kr/xit/fims/biz/cmm/service/bean/FimsCrackdownMgtServiceBean.java @@ -249,7 +249,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements && Checks.isNotEmpty(saveDTO.getInterfaceSeqN())) { updateCtznAndAnswer(saveDTO, infoDTO, FimsConst.CtznStmtDtlStsCode.NON_ACCEPTABLE.getCode(), - FimsConst.AnswerSeCode.DISALLOW.getCode(), erppDTO.getErppSeCode()); + FimsConst.AnswerSeCode.DISALLOW.getCode(), erppDTO.getLevyExclRsnCd()); } } diff --git a/src/main/java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java b/src/main/java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java index 855cce0a..12d873dc 100644 --- a/src/main/java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java +++ b/src/main/java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java @@ -264,7 +264,7 @@ public class CctvCrackdownDTO { private String linkId; private String sysSeCd; private String inptSeCd; - private String erppId; + private String levyExclId; private String crdnSeCd; private String crdnInptSeCd; diff --git a/src/main/java/kr/xit/fims/biz/ec/CtznStmtDTO.java b/src/main/java/kr/xit/fims/biz/ec/CtznStmtDTO.java index eca11ff2..7dcc4740 100644 --- a/src/main/java/kr/xit/fims/biz/ec/CtznStmtDTO.java +++ b/src/main/java/kr/xit/fims/biz/ec/CtznStmtDTO.java @@ -331,7 +331,7 @@ public class CtznStmtDTO { //extends ExtlEsbDataType { private String gpsX; private String gpsY; - private String erppId; + private String levyExclId; private String mdfr; /** 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 ab5df810..6f7ac7ca 100644 --- a/src/main/java/kr/xit/fims/biz/rt/RtDTO.java +++ b/src/main/java/kr/xit/fims/biz/rt/RtDTO.java @@ -204,7 +204,7 @@ public class RtDTO { /** * 서손 id */ - private String erppId; + private String levyExclId; /** * 단속 id */ @@ -220,15 +220,15 @@ public class RtDTO { /** * 서손 처리 일자 */ - private String erppProcessDe; + private String levyExclYmd; /** * 서손 구분 코드 */ - private String erppSeCode; + private String levyExclRsnCd; /** * 서손 사유 상세 */ - private String erppResnDetail; + private String etcCn; /** * 등록 일시 */ 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 e0bb81fd..ad6a0cc8 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 @@ -52,9 +52,9 @@ , SUBSTR(tcc.cvlcpt_prcs_prnmnt_dt,1,8) AS cvlcpt_prcs_prnmnt_ymd , tei.duty_id_v -- 담당자 , tei.pcd_tel_v -- 담당자 전화번호 - , tre.erpp_id - , tre.erpp_se_code -- 서손구분코드 - , tre.erpp_resn_detail -- 서손사유상세 + , tre.levy_excl_id + , tre.levy_excl_rsn_cd -- 서손구분코드 + , tre.etc_cn -- 서손사유상세 , trp.addr_se_cd -- 지번 도로 주소 구분 코드 , trp.zip , trp.addr @@ -87,7 +87,7 @@ ON tc.link_id = tcc.cvlcpt_link_id LEFT JOIN tb_esb_interface tei ON tc.link_id = tei.interface_seq_n - LEFT JOIN tb_rt_erpp tre + LEFT JOIN tb_levy_excl tre ON tc.crdn_id = tre.crdn_id LEFT JOIN tb_payer trp ON tc.rtpyr_id = trp.rtpyr_id 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 ad5d3a2e..99fb2519 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 @@ -194,24 +194,20 @@ /* ec-ctzn-sttemnt-mysql-mapper|insertRtErppFromCtznStmt-시민신고 서손 생성|julim */ - - SELECT LPAD(IFNULL(MAX(CAST(erpp_id AS UNSIGNED))+1, 1), 12, '0') AS erppId - FROM tb_rt_erpp + + SELECT LPAD(IFNULL(MAX(CAST(levy_excl_id AS UNSIGNED))+1, 1), 20, '0') AS levyExclId + FROM tb_levy_excl - INSERT INTO tb_rt_erpp ( - erpp_id + INSERT INTO tb_levy_excl ( + levy_excl_id , crdn_id - , sgg_cd - , sys_se_cd - , erpp_process_de -- 서손 처리 일자 - , erpp_se_code -- 서손 구분 코드 - , erpp_resn_detail -- 서손 사유 상세 + , levy_excl_ymd -- 서손 처리 일자 + , levy_excl_rsn_cd -- 서손 구분 코드 + , etc_cn -- 서손 사유 상세 , reg_dt , rgtr - ) SELECT #{erppId} + ) SELECT #{levyExclId} , #{crdnId} - , tc.sgg_cd - , tc.sys_se_cd , DATE_FORMAT(NOW(), '%Y%m%d') , '' , '' 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 93b63d09..253c8d0c 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 @@ -187,20 +187,16 @@ /* ec-extrl-reglt-cntc-mysql-mapper|insertRtErppFromEcExtrRegltCntc-외부연계 서손 자료 생성|julim */ - INSERT INTO tb_rt_erpp ( - erpp_id + INSERT INTO tb_levy_excl ( + levy_excl_id , crdn_id - , sgg_cd - , sys_se_cd - , erpp_process_de -- 서손 처리 일자 - , erpp_se_code -- 서손 구분 코드 - , erpp_resn_detail -- 서손 사유 상세 + , levy_excl_ymd -- 서손 처리 일자 + , levy_excl_rsn_cd -- 서손 구분 코드 + , etc_cn -- 서손 사유 상세 , reg_dt , rgtr - ) SELECT #{erppId} + ) SELECT #{levyExclId} , #{crdnId} - , sgg_cd - , sys_se_cd , DATE_FORMAT(NOW(), '%Y%m%d') , '' , '' 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 1401f952..b813be10 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 @@ -180,33 +180,29 @@ /* rt-reglt-and-erpp-mysql-mapper|insertRtErpp-서손 데이타 등록|julim */ - - SELECT LPAD(IFNULL(MAX(CAST(erpp_id AS UNSIGNED))+1, 1), 12, '0') AS erppId - FROM tb_rt_erpp + + SELECT LPAD(IFNULL(MAX(CAST(levy_excl_id AS UNSIGNED))+1, 1), 20, '0') AS levyExclId + FROM tb_levy_excl INSERT - INTO tb_rt_erpp ( - erpp_id + INTO tb_levy_excl ( + levy_excl_id , crdn_id - , sgg_cd - , sys_se_cd - , erpp_process_de - , erpp_se_code - , erpp_resn_detail + , levy_excl_ymd + , levy_excl_rsn_cd + , etc_cn , reg_dt , rgtr ) VALUES ( - #{erppId} + #{levyExclId} , #{crdnId} - , #{sggCd} - , #{sysSeCd} - , #{erppProcessDe} - , #{erppSeCode} - , #{erppResnDetail} + , #{levyExclYmd} + , #{levyExclRsnCd} + , #{etcCn} , DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') , #{rgtr} ) diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmEnlightDisallowPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmEnlightDisallowPopup.jsp index 3680f4f9..cc5ece8f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmEnlightDisallowPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmEnlightDisallowPopup.jsp @@ -71,13 +71,13 @@ Date Author Description 처리사유 - + 특기사항 - + @@ -106,11 +106,11 @@ Date Author Description changeTag: () => { if(bizDiv ==='ENLIGHT'){ $('#enlightResnCode').show(); - $('#erppSeCode').hide(); + $('#levyExclRsnCd').hide(); $('#trErpp').hide(); }else{ $('#enlightResnCode').hide(); - $('#erppSeCode').show(); + $('#levyExclRsnCd').show(); $('#trErpp').show(); } } @@ -131,16 +131,16 @@ Date Author Description bizDiv ,processDt: $('#processDt').val().replaceAll('-','') ,enlightResnCode: $('#enlightResnCode').val() - ,erppSeCode: '' - ,erppResnDetail: '' + ,levyExclRsnCd: '' + ,etcCn: '' }) }else{ window.opener.callbackEnlightErpp({ bizDiv ,processDt: $('#processDt').val().replaceAll('-','') ,enlightResnCode: '' - ,erppSeCode: $('#erppSeCode').val() - ,erppResnDetail: $('#erppResnDetail').val() + ,levyExclRsnCd: $('#levyExclRsnCd').val() + ,etcCn: $('#etcCn').val() }) } window.close() 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 f5f13ac2..4f0f76ab 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 @@ -517,9 +517,9 @@ Date Author Description }else{ const erppDTO = { crdnId: saveData.crdnId - , erppProcessDe:data.processDt - , erppSeCode: data.erppSeCode - , erppResnDetail: data.erppResnDetail + , levyExclYmd:data.processDt + , levyExclRsnCd: data.levyExclRsnCd + , etcCn: data.etcCn } saveData = {...saveData, erppDTO: erppDTO} url = '/fims/biz/cmm/saveDisallow.do'; 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 a27f6198..67c3d69f 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 @@ -528,14 +528,14 @@ Date Author Description 처리일 - + 서손사유 - + @@ -547,7 +547,7 @@ Date Author Description 특이사항 - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmIntegratedSearchForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmIntegratedSearchForm.jsp index 9a1726a5..0e24e560 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmIntegratedSearchForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmIntegratedSearchForm.jsp @@ -661,7 +661,7 @@ Date Author Description }, { header: '서손사유', - name: 'erppResnDetail', //erppSeCode + name: 'etcCn', //levyExclRsnCd width: 80, sortable: false, align: 'center' @@ -673,7 +673,7 @@ Date Author Description }, { header: '서손ID', - name: 'erppId', + name: 'levyExclId', hidden: true }, { @@ -683,7 +683,7 @@ Date Author Description }, { header: '서손사유코드', - name: 'erppSeCode', + name: 'levyExclRsnCd', hidden: true }, { diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerTargetDataForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerTargetDataForm.jsp index b73dd286..16c972b4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerTargetDataForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerTargetDataForm.jsp @@ -459,7 +459,7 @@ rowKey = GRID.store.data.rawData[0]?.rowKey; } const rowDatas = GRID.store.data.rawData.map(d => { - return {tmplatId: '${ctznTmplatId}', answerSeCode: fnBiz.getAnswerSeCode(d.crdnSttsCd), resnCode: d.erppSeCode, interfaceSeqN: d.interfaceSeqN, vhrno: d.vhrno} + return {tmplatId: '${ctznTmplatId}', answerSeCode: fnBiz.getAnswerSeCode(d.crdnSttsCd), resnCode: d.levyExclRsnCd, interfaceSeqN: d.interfaceSeqN, vhrno: d.vhrno} }) popupDiv = 'answerPreview'; @@ -658,7 +658,7 @@ }, { header: '서손사유', - name: 'erppResnDetail', //erppSeCode + name: 'etcCn', //levyExclRsnCd width: 80, sortable: false, align: 'center' @@ -715,7 +715,7 @@ }, { header: '서손ID', - name: 'erppId', + name: 'levyExclId', hidden: true }, { @@ -725,7 +725,7 @@ }, { header: '서손사유코드', - name: 'erppSeCode', + name: 'levyExclRsnCd', hidden: true }, { diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerWaitDataForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerWaitDataForm.jsp index 985405b6..11ffeb1e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerWaitDataForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerWaitDataForm.jsp @@ -455,7 +455,7 @@ rowKey = GRID.store.data.rawData[0]?.rowKey; } const rowDatas = GRID.store.data.rawData.map(d => { - return {tmplatId: '${ctznTmplatId}', answerSeCode: fnBiz.getAnswerSeCode(d.crdnSttsCd), resnCode: d.erppSeCode, interfaceSeqN: d.interfaceSeqN, vhrno: d.vhrno} + return {tmplatId: '${ctznTmplatId}', answerSeCode: fnBiz.getAnswerSeCode(d.crdnSttsCd), resnCode: d.levyExclRsnCd, interfaceSeqN: d.interfaceSeqN, vhrno: d.vhrno} }) popupDiv = 'answerPreview'; @@ -654,7 +654,7 @@ }, { header: '서손사유', - name: 'erppResnDetail', //erppSeCode + name: 'etcCn', //levyExclRsnCd width: 80, sortable: false, align: 'center' @@ -711,7 +711,7 @@ }, { header: '서손ID', - name: 'erppId', + name: 'levyExclId', hidden: true }, { @@ -721,7 +721,7 @@ }, { header: '서손사유코드', - name: 'erppSeCode', + name: 'levyExclRsnCd', hidden: true }, { diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp index 9f0a4fb2..d6efc3c9 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp @@ -457,7 +457,7 @@ rowKey = GRID.store.data.rawData[0]?.rowKey; } const rowDatas = GRID.store.data.rawData.map(d => { - return {tmplatId: '${ctznTmplatId}', answerSeCode: fnBiz.getAnswerSeCode(d.crdnSttsCd), resnCode: d.erppSeCode, interfaceSeqN: d.interfaceSeqN, vhrno: d.vhrno} + return {tmplatId: '${ctznTmplatId}', answerSeCode: fnBiz.getAnswerSeCode(d.crdnSttsCd), resnCode: d.levyExclRsnCd, interfaceSeqN: d.interfaceSeqN, vhrno: d.vhrno} }) popupDiv = 'answerPreview'; @@ -656,7 +656,7 @@ }, { header: '서손사유', - name: 'erppResnDetail', //erppSeCode + name: 'etcCn', //levyExclRsnCd width: 80, sortable: false, align: 'center' @@ -713,7 +713,7 @@ }, { header: '서손ID', - name: 'erppId', + name: 'levyExclId', hidden: true }, { @@ -723,7 +723,7 @@ }, { header: '서손사유코드', - name: 'erppSeCode', + name: 'levyExclRsnCd', hidden: true }, {