From 9177183307ee99d917140cbf7bd8f228d377368d Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 25 May 2023 11:23:35 +0900 Subject: [PATCH] =?UTF-8?q?refactor=20:=20=EA=B8=B0=EA=B4=80=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/sql/외부연계.sql | 4 +-- .../kr/xit/fims/biz/cmm/FimsCrackdownDTO.java | 2 +- .../bean/CctvBusOnlyCrackDownServiceBean.java | 2 +- .../bean/FimsCrackdownMgtServiceBean.java | 6 ++-- .../kr/xit/fims/biz/ec/CctvCrackdownDTO.java | 2 +- .../java/kr/xit/fims/biz/ec/CtznStmtDTO.java | 8 ++--- .../bean/EcCctvCrackdownServiceBean.java | 4 +-- .../bean/EcCtznSttemntServiceBean.java | 2 +- .../bean/EcNatlNewspaperServiceBean.java | 4 +-- src/main/java/kr/xit/fims/biz/rt/RtDTO.java | 8 ++--- .../fims/biz/rt/dao/RtCrackdownMgtMapper.java | 2 +- .../biz/rt/service/RtCrackdownMgtService.java | 2 +- .../fims/framework/biz/cmm/XitLoginVO.java | 2 +- .../cmm/service/bean/XitSessionMapping.java | 2 +- .../framework/biz/mng/user/XitUserInfoVO.java | 2 +- .../cmm/cmm-fims-crackdown-mysql-mapper.xml | 20 +++++------ .../biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml | 30 ++++++++-------- .../ec/ec-extrl-reglt-cntc-mysql-mapper.xml | 14 ++++---- .../biz/rt/rt-reglt-and-erpp-mysql-mapper.xml | 34 +++++++++---------- .../jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp | 2 +- .../fims/biz/ec/ecCtznSttemntAnsMgtPopup.jsp | 2 +- .../jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp | 4 +-- .../jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp | 4 +-- .../jsp/fims/biz/rt/rtRegltMgtPopup.jsp | 2 +- .../js/fims/biz/common/codeComboData.js | 2 +- 25 files changed, 82 insertions(+), 84 deletions(-) diff --git a/db/sql/외부연계.sql b/db/sql/외부연계.sql index 6747f2bf..a55a3c5f 100644 --- a/db/sql/외부연계.sql +++ b/db/sql/외부연계.sql @@ -8,7 +8,7 @@ DELETE FROM tb_ec_ctzn_sttemnt_answer; DELETE FROM tb_rt_reglt; DELETE FROM tb_rt_erpp; -DELETE FROM old_payer; +DELETE FROM tb_payer; DELETE FROM tb_rt_process_sttus_change_hist; DELETE FROM tb_ec_extrl_reglt_cntc; @@ -30,7 +30,7 @@ select * from tb_ec_ctzn_sttemnt_answer; SELECT * FROM tb_rt_reglt; SELECT * FROM tb_rt_erpp; -SELECT * FROM old_payer; +SELECT * FROM tb_payer; SELECT * FROM tb_rt_process_sttus_change_hist; /*--------------------------------*/ 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 6d430f1d..dd0e46f0 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/FimsCrackdownDTO.java +++ b/src/main/java/kr/xit/fims/biz/cmm/FimsCrackdownDTO.java @@ -184,7 +184,7 @@ public class FimsCrackdownDTO { /** * 기관코드 */ - private String insttCode; + private String sggCd; /** * 수정 일시 */ diff --git a/src/main/java/kr/xit/fims/biz/cmm/service/bean/CctvBusOnlyCrackDownServiceBean.java b/src/main/java/kr/xit/fims/biz/cmm/service/bean/CctvBusOnlyCrackDownServiceBean.java index 6bb79f2e..8aba1dc5 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/service/bean/CctvBusOnlyCrackDownServiceBean.java +++ b/src/main/java/kr/xit/fims/biz/cmm/service/bean/CctvBusOnlyCrackDownServiceBean.java @@ -66,7 +66,7 @@ public class CctvBusOnlyCrackDownServiceBean implements ExtrStrategyService { // data set // CctvCrackdownDTO.ExtrlRegltCntc extrRegltDTO = getExtrlRegltCntcDTO(txtNames[0], records); // extrRegltDTO.setSysSeCd(getUserInfo().getOrgnztId()); - // extrRegltDTO.setInsttCode(getUserInfo().getPstinstCode()); + // extrRegltDTO.setSggCd(getUserInfo().getPstinstCode()); // // if(records.size() >= 3){ // extrRegltDTO.setRegltSeCode(FimsConst.RegltSeCode.CCTV_DRV.getCode()); 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 96e1d781..b0cae506 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 @@ -260,7 +260,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements erppDTO.setRgtr(getUserInfo().getUniqId()); erppDTO.setSysSeCd(getUserInfo().getOrgnztId()); - erppDTO.setInsttCode(getUserInfo().getPstinstCode()); + erppDTO.setSggCd(getUserInfo().getPstinstCode()); rtCrackdownMgtMapper.insertRtErpp(erppDTO); // 시민신고인 경우 @@ -311,7 +311,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements @Override public void addCtznSttemntCmplt(final FimsCrackdownDTO.CtznSttemntCmplt dto) { - dto.setInsttCode(getUserInfo().getPstinstCode()); + dto.setSggCd(getUserInfo().getPstinstCode()); dto.setRgtr(getUserInfo().getUniqId()); mapper.insertCtznSttemntCmplt(dto); } @@ -412,7 +412,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements String ansTxt = getAnswerText(mapper.selectCtznAnswerTmplInfo(ansReqDTO)); CtznStmtDTO.Ans ansDTO = CtznStmtDTO.Ans.builder() - .insttCode(getUserInfo().getPstinstCode()) + .sggCd(getUserInfo().getPstinstCode()) .sysSeCd(getUserInfo().getOrgnztId()) .interfaceSeqN(saveDTO.getInterfaceSeqN()) .cvplProcessResult(ansTxt) 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 45add5fc..cd42b524 100644 --- a/src/main/java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java +++ b/src/main/java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java @@ -107,7 +107,7 @@ public class CctvCrackdownDTO { /** * 기관코드 */ - private String insttCode; + private String sggCd; /** * 시스템코드 */ 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 f68edd63..ef189819 100644 --- a/src/main/java/kr/xit/fims/biz/ec/CtznStmtDTO.java +++ b/src/main/java/kr/xit/fims/biz/ec/CtznStmtDTO.java @@ -27,7 +27,7 @@ public class CtznStmtDTO { //extends ExtlEsbDataType { /** * 기관코드-anc_code_v */ - private String insttCode; + private String sggCd; /** * 과태료코드:88-sys_gubun_c */ @@ -193,7 +193,7 @@ public class CtznStmtDTO { //extends ExtlEsbDataType { /** * 기관코드 */ - private String insttCode; + private String sggCd; /** * 과태료코드 */ @@ -227,7 +227,7 @@ public class CtznStmtDTO { //extends ExtlEsbDataType { /** * 기관 코드 */ - private String insttCode; + private String sggCd; /** * 시스템 코드 */ @@ -301,7 +301,7 @@ public class CtznStmtDTO { //extends ExtlEsbDataType { private String sysGubunC; /** - * insttCode + * sggCd */ private String ancCodeV; diff --git a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java index 20c9c723..086c89a5 100644 --- a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java +++ b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java @@ -127,7 +127,7 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E // data set CctvCrackdownDTO.ExtrlRegltCntc extrDTO = getExtrlRegltCntcDTO(txtNames[0], records); extrDTO.setSysSeCd(getUserInfo().getOrgnztId()); - extrDTO.setInsttCode(getUserInfo().getPstinstCode()); + extrDTO.setSggCd(getUserInfo().getPstinstCode()); if(records.size() >= 3){ extrDTO.setRegltSeCode(FimsConst.RegltSeCode.CCTV_DRV.getCode()); @@ -183,7 +183,7 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E CctvCrackdownDTO.ExtrlRegltCntc extrDTO = CctvCrackdownDTO.ExtrlRegltCntc .builder() .sysSeCd(getUserInfo().getOrgnztId()) - .insttCode(getUserInfo().getPstinstCode()) + .sggCd(getUserInfo().getPstinstCode()) .vhrno(busOnlyDTO.getVhrno()) //.regltDongNm(mdInfos[1]) //.regltPlace(mdInfos[2]) diff --git a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCtznSttemntServiceBean.java b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCtznSttemntServiceBean.java index 8501772b..f4fe6bfb 100644 --- a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCtznSttemntServiceBean.java +++ b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCtznSttemntServiceBean.java @@ -184,7 +184,7 @@ public class EcCtznSttemntServiceBean extends AbstractServiceBean implements EcC // 답변 테이블 insert(save) dto.setSysSeCd(getUserInfo().getOrgnztId()); - dto.setInsttCode(getUserInfo().getPstinstCode()); + dto.setSggCd(getUserInfo().getPstinstCode()); dto.setRgtr(getUserInfo().getUniqId()); mapper.saveEcCtznSttemntAnswer(dto); diff --git a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcNatlNewspaperServiceBean.java b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcNatlNewspaperServiceBean.java index c1c4d401..3adcf150 100644 --- a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcNatlNewspaperServiceBean.java +++ b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcNatlNewspaperServiceBean.java @@ -240,7 +240,7 @@ public class EcNatlNewspaperServiceBean extends AbstractServiceBean implements E String reasonStr = xmlDto.getPetiReasonL(); dto.setInterfaceSeqN(xmlDto.getInterfaceSeqN()); - dto.setInsttCode(getUserInfo().getPstinstCode()); + dto.setSggCd(getUserInfo().getPstinstCode()); dto.setSysSeCd(getUserInfo().getOrgnztId()); dto.setCvplSe(xmlDto.getPetiGubunC()); dto.setCvplReqstNo(xmlDto.getPetiNoC()); @@ -296,7 +296,7 @@ public class EcNatlNewspaperServiceBean extends AbstractServiceBean implements E dtlDto.setInterfaceSeqN(xmlDto.getInterfaceSeqN()); dtlDto.setCtznSttemntDetailProcessSttus(FimsConst.CtznStmtDtlStsCode.UNPROCESSED.getCode()); dtlDto.setSysSeCd(getUserInfo().getOrgnztId()); - dtlDto.setInsttCode(getUserInfo().getPstinstCode()); + dtlDto.setSggCd(getUserInfo().getPstinstCode()); dtlDto.setRgtr(getUserInfo().getUniqId()); dtlList.add(dtlDto); isFirst = false; 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 df044c13..d5a1e06b 100644 --- a/src/main/java/kr/xit/fims/biz/rt/RtDTO.java +++ b/src/main/java/kr/xit/fims/biz/rt/RtDTO.java @@ -30,7 +30,7 @@ public class RtDTO { /** * 기관 코드 */ - private String insttCode; + private String sggCd; /** * 시스템 코드 */ @@ -212,7 +212,7 @@ public class RtDTO { /** * 기관 코드 */ - private String insttCode; + private String sggCd; /** * 시스템 코드 */ @@ -265,7 +265,7 @@ public class RtDTO { /** * 기관 코드 */ - private String insttCode; + private String sggCd; /** * 시스템 코드 */ @@ -491,7 +491,7 @@ public class RtDTO { /** * 기관 코드 */ - private String insttCode; + private String sggCd; /** * 시스템 코드 */ diff --git a/src/main/java/kr/xit/fims/biz/rt/dao/RtCrackdownMgtMapper.java b/src/main/java/kr/xit/fims/biz/rt/dao/RtCrackdownMgtMapper.java index c5b48d22..eab514eb 100644 --- a/src/main/java/kr/xit/fims/biz/rt/dao/RtCrackdownMgtMapper.java +++ b/src/main/java/kr/xit/fims/biz/rt/dao/RtCrackdownMgtMapper.java @@ -30,7 +30,7 @@ public interface RtCrackdownMgtMapper { //----------------------------------------------------- - // 납부자 : old_payer + // 납부자 : tb_payer //----------------------------------------------------- void insertRtRtpyr(final RtDTO.Rtpyr dto); void updateRtRtpyr(final RtDTO.Rtpyr dto); diff --git a/src/main/java/kr/xit/fims/biz/rt/service/RtCrackdownMgtService.java b/src/main/java/kr/xit/fims/biz/rt/service/RtCrackdownMgtService.java index 17f24af5..d35791ff 100644 --- a/src/main/java/kr/xit/fims/biz/rt/service/RtCrackdownMgtService.java +++ b/src/main/java/kr/xit/fims/biz/rt/service/RtCrackdownMgtService.java @@ -24,7 +24,7 @@ public interface RtCrackdownMgtService { //----------------------------------------------------- - // 납부자 : old_payer + // 납부자 : tb_payer //----------------------------------------------------- diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java b/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java index 6fa2d88d..0f778172 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java @@ -56,7 +56,7 @@ public class XitLoginVO implements Serializable{ private String groupId; /** - * 소속기관 코드 - 업무그룹(instt_code) + * 소속기관 코드 - 업무그룹(sgg_cd) */ private String pstinstCode; /** 업무 데이터 권한 */ diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java index 6aff7494..a6327f7c 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java @@ -75,7 +75,7 @@ public class XitSessionMapping extends EgovUsersByUsernameMapping { loginVO.setOrgnztNm(strOrgnztNm); //조직(부서)ID 명 loginVO.setUniqId(strUniqId); //고유아이디 loginVO.setGroupId(strGroupId); //그룹 - loginVO.setPstinstCode(strPstinstCode); //소속기관-업무그룹(instt_code) + loginVO.setPstinstCode(strPstinstCode); //소속기관-업무그룹(sgg_cd) loginVO.setJobDataAuthor(strJobDataAuthor); //업무 데이터 권한 loginVO.setUserManageAuthor(strUserManageAuthor); //사용자 관리 권한 loginVO.setElctrnsanctnUseYn(strElctrnsanctnUseYn); //전자결재 사용 여부 diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java index 6802905c..38aa0396 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java @@ -46,7 +46,7 @@ public class XitUserInfoVO extends XitUserEtcOptionVO { protected String emailAdres; //이메일 주소 protected String ofcpsNm; //직위 명 protected String houseMiddleTelno; //주택 중간 전화번호 - protected String groupId; //그룹 id - 업무그룹(instt_code) + protected String groupId; //그룹 id - 업무그룹(sgg_cd) protected String pstinstCode; //소속기관 코드 - 시스템코드(sysSeCd) protected String userSttusCode; //사용자 상태 코드 protected String esntlId; //고유 id 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 32af27d3..328fc12b 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 @@ -8,7 +8,7 @@ SELECT trr.reglt_id , trr.rtpyr_id -- 납부자ID - , trr.instt_code -- 기관코드 + , trr.sgg_cd -- 기관코드 , trr.sys_se_cd -- 시스템코드 , trr.reglt_se_code -- 단속구분코드 , trr.input_se_code -- 입력구분코드 @@ -91,7 +91,7 @@ ON tecs.interface_seq_n = teei.interface_seq_n LEFT JOIN tb_rt_erpp tre ON trr.reglt_id = tre.reglt_id - LEFT JOIN old_payer trp + LEFT JOIN tb_payer trp ON trr.rtpyr_id = trp.rtpyr_id @@ -149,7 +149,7 @@ @@ -423,7 +423,7 @@ /* cmm-fims-crackdown-mysql-mapper|selectCtznSttemntCmplt-민원등록 이력 조회|julim */ SELECT tecsc.cmplt_id , tecsc.reglt_id - , tecsc.instt_code + , tecsc.sgg_cd , tecsc.content , tecsc.gubun , tecsc.vhrno 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 2dcf0418..e7e38678 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 @@ -8,7 +8,7 @@ ************************************************************************************************************** --> SELECT interface_seq_n - , instt_code + , sgg_cd , sys_se_cd , cvpl_se , cvpl_reqst_no @@ -48,7 +48,7 @@ INSERT INTO tb_ec_ctzn_sttemnt ( interface_seq_n - , instt_code + , sgg_cd , sys_se_cd , cvpl_se , cvpl_reqst_no @@ -70,7 +70,7 @@ , rgtr ) VALUES ( #{interfaceSeqN} - , #{insttCode} + , #{sggCd} , #{sysSeCd} , #{cvplSe} , #{cvplReqstNo} @@ -102,7 +102,7 @@ , tecsd.ctzn_sttemnt_detail_sn , tecsd.vhrno , tecsd.reglt_id - , tecsd.instt_code + , tecsd.sgg_cd , tecsd.sys_se_cd , tecsd.reglt_de_time , tecsd.reglt_place @@ -154,7 +154,7 @@ , ctzn_sttemnt_detail_sn , vhrno , reglt_id - , instt_code + , sgg_cd , sys_se_cd , reglt_de_time , reglt_place @@ -169,7 +169,7 @@ , #{ctznSttemntDetailSn} , #{vhrno} , #{regltId} - , #{insttCode} + , #{sggCd} , #{sysSeCd} , #{regltDeTime} , #{regltPlace} @@ -207,7 +207,7 @@ /* ec-ctzn-sttemnt-mysql-mapper|insertRtRegltFromCtznStmt-시민신고 단속 생성|julim */ INSERT INTO tb_rt_reglt ( reglt_id - , instt_code + , sgg_cd , sys_se_cd , reglt_se_code , input_se_code @@ -233,7 +233,7 @@ , reg_dt , rgtr ) SELECT ecsd.reglt_id - , ecsd.instt_code + , ecsd.sgg_cd , ecsd.sys_se_cd , #{regltSeCode} , #{inputSeCode} -- 입력 구분 코드 @@ -292,7 +292,7 @@ INSERT INTO tb_rt_erpp ( erpp_id , reglt_id - , instt_code + , sgg_cd , sys_se_cd , erpp_process_de -- 서손 처리 일자 , erpp_se_code -- 서손 구분 코드 @@ -301,7 +301,7 @@ , rgtr ) SELECT #{erppId} , #{regltId} - , ecsd.instt_code + , ecsd.sgg_cd , ecsd.sys_se_cd , DATE_FORMAT(NOW(), '%Y%m%d') , '' @@ -345,7 +345,7 @@ /* ec-ctzn-sttemnt-mysql-mapper|selectCreateEcCtznSttemntAnswer-시민신고답변 생성 데이타 조회|cjm */ SELECT teei.interface_seq_n , teei.sys_gubun_c -- sysSeCd - , teei.anc_code_v -- insttCode + , teei.anc_code_v -- sggCd , teei.peti_gubun_c AS cvplSe -- 민원구분 , teei.peti_no_c AS cvplReqstNo -- 민원신청번호 , teei.civil_no_c AS cvplRceptNo -- 민원접수번호 @@ -378,7 +378,7 @@ /* ec-ctzn-sttemnt-mysql-mapper|selectEcCtznSttemntAnswer-시민신고답변 데이타 조회|cjm */ SELECT interface_seq_n , sys_se_cd -- sysGubunC - , instt_code -- ancCodeV + , sgg_cd -- ancCodeV , cvpl_se -- 민원구분 , cvpl_reqst_no -- 민원신청번호 , cvpl_rcept_no -- 민원접수번호 @@ -400,7 +400,7 @@ INSERT INTO tb_ec_ctzn_sttemnt_answer ( interface_seq_n - , instt_code + , sgg_cd , sys_se_cd , cvpl_se , cvpl_reqst_no @@ -418,7 +418,7 @@ , rgtr ) VALUES ( #{interfaceSeqN} - , #{insttCode} + , #{sggCd} , #{sysSeCd} , #{cvplSe} , #{cvplReqstNo} @@ -486,7 +486,7 @@ - + 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 aa7e9f26..e446a61b 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 @@ -9,7 +9,7 @@ SELECT extrl_reglt_cntc_id , reglt_id - , instt_code + , sgg_cd , sys_se_cd , reglt_se_code , input_se_code @@ -80,7 +80,7 @@ INTO tb_ec_extrl_reglt_cntc ( extrl_reglt_cntc_id , reglt_id - , instt_code + , sgg_cd , sys_se_cd , reglt_se_code , input_se_code @@ -103,7 +103,7 @@ ) VALUES ( #{extrlRegltCntcId} , #{regltId} - , #{insttCode} + , #{sggCd} , #{sysSeCd} , #{regltSeCode} , #{inputSeCode} @@ -139,7 +139,7 @@ /* ec-extrl-reglt-cntc-mysql-mapper|insertRtRegltFromEcExtrRegltCntc-외부연계 단속 자료 생성|julim */ INSERT INTO tb_rt_reglt ( reglt_id - , instt_code + , sgg_cd , sys_se_cd , reglt_se_code , input_se_code @@ -165,7 +165,7 @@ , reg_dt , rgtr ) SELECT #{regltId} - , instt_code + , sgg_cd , sys_se_cd , #{regltSeCode} , #{inputSeCode} -- 입력 구분 코드 @@ -224,7 +224,7 @@ INSERT INTO tb_rt_erpp ( erpp_id , reglt_id - , instt_code + , sgg_cd , sys_se_cd , erpp_process_de -- 서손 처리 일자 , erpp_se_code -- 서손 구분 코드 @@ -233,7 +233,7 @@ , rgtr ) SELECT #{erppId} , #{regltId} - , instt_code + , 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 bbbd69af..9e1ebaa0 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 @@ -9,7 +9,7 @@ SELECT trr.reglt_id , trr.rtpyr_id -- 납부자ID - , trr.instt_code -- 기관코드 + , trr.sgg_cd -- 기관코드 , trr.sys_se_cd -- 시스템코드 , trr.reglt_se_code -- 단속구분코드 , trr.input_se_code -- 입력구분코드 @@ -46,12 +46,10 @@ , trr.regist_se_code , CONCAT(trr.reglt_de, trr.reglt_begin_time) AS regltDeTime FROM tb_rt_reglt trr - -- LEFT OUTER JOIN tb_rt_erpp tre - -- ON trr.reglt_id = tre.reglt_id @@ -108,7 +106,7 @@ /* rt-reglt-and-erpp-mysql-mapper|insertRtReglt-단속 정보 등록|julim */ insert into tb_rt_reglt( reglt_id - , instt_code + , sgg_cd , sys_se_cd , reglt_se_code , input_se_code @@ -129,7 +127,7 @@ , rgtr ) VALUES ( LPAD(NEXTVAL(seq_rt_reglt), 16, '0') - , #{insttCode} + , #{sggCd} , #{sysSeCd} , #{regltSeCode} , #{inputSeCode} @@ -188,7 +186,7 @@ INTO tb_rt_erpp ( erpp_id , reglt_id - , instt_code + , sgg_cd , sys_se_cd , erpp_process_de , erpp_se_code @@ -198,7 +196,7 @@ ) VALUES ( LPAD(NEXTVAL(seq_rt_erpp), 12, '0') , #{regltId} - , #{insttCode} + , #{sggCd} , #{sysSeCd} , #{erppProcessDe} , #{erppSeCode} @@ -209,12 +207,12 @@ @@ -255,9 +253,9 @@ SELECT LPAD(NEXTVAL(seq_rt_rtpyr), 12, '0') INSERT - INTO old_payer ( + INTO tb_payer ( rtpyr_id - , instt_code + , sgg_cd , sys_se_cd , rtpyr_se_cd , rtpyr_no @@ -288,7 +286,7 @@ , rgtr ) VALUES ( #{rtpyrId} - , #{insttCode} + , #{sggCd} , #{sysSeCd} , #{rtpyrSeCd} , #{rtpyrNo} @@ -322,7 +320,7 @@ /* rt-reglt-and-erpp-mysql-mapper|updateRtRtpyr-납부자 정보 변경|julim */ - UPDATE old_payer + UPDATE tb_payer SET rtpyr_se_cd = IF(rtpyr_se_cd = #{rtpyrSeCd}, rtpyr_se_cd, #{rtpyrSeCd}) , rtpyr_no = IF(rtpyr_no = #{rtpyrNo}, rtpyr_no, #{rtpyrNo}) , rtpyr_nm = IF(rtpyr_nm = #{rtpyrNm}, rtpyr_nm, #{rtpyrNm}) @@ -339,9 +337,9 @@ /* rt-reglt-and-erpp-mysql-mapper|saveRtRtpyr-납부자 정보 등록 / 변경|julim */ INSERT - INTO old_payer ( + INTO tb_payer ( rtpyr_id - , instt_code + , sgg_cd , sys_se_cd , rtpyr_se_cd , rtpyr_no @@ -372,7 +370,7 @@ , rgtr ) VALUES ( LPAD(NEXTVAL(seq_rt_rtpyr), 12, '0') - , #{insttCode} + , #{sggCd} , #{sysSeCd} , #{rtpyrSeCd} , #{rtpyrNo} diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp index f11c2aa4..164ee6d2 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp @@ -67,7 +67,7 @@ 기관코드 - + 단속구분 diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntAnsMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntAnsMgtPopup.jsp index be827ff9..123bb594 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntAnsMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntAnsMgtPopup.jsp @@ -28,7 +28,7 @@ 기관코드 - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp index 4de7e8e5..6b2527ee 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp @@ -378,7 +378,7 @@ }, { header: '기관코드', - name: 'insttCode', + name: 'sggCd', minWidth: 200, sortable: false, align: 'center', @@ -387,7 +387,7 @@ editor: { type: "select", options: { - listItems: ComboCodeData.insttCode + listItems: ComboCodeData.sggCd } }, }, diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp index 14f2285a..d709bd0a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp @@ -33,7 +33,7 @@ 기관코드 - + 시스템코드 @@ -202,7 +202,7 @@ 기관코드 - + 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 c5d69320..9f3bcee6 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 @@ -33,7 +33,7 @@ 기관코드 - + 과태료코드 단속구분 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 f1783e84..7618c72f 100644 --- a/src/main/webapp/resources/js/fims/biz/common/codeComboData.js +++ b/src/main/webapp/resources/js/fims/biz/common/codeComboData.js @@ -8,7 +8,7 @@ ComboCodeData = { ] // 기관코드 : XIT025 - ,insttCode: [ + ,sggCd: [ {value: '3650000', text: '대전광역시 중구'} ,{value: '3670000', text: '대전광역시 유성구'} ]