From 4f86997ecf14a7243750e2d03fa5baa62d9ac19f Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 26 May 2023 10:15:19 +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=BB=AC=EB=9F=BC=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 +- .../kr/xit/fims/biz/ec/CctvCrackdownDTO.java | 2 +- .../java/kr/xit/fims/biz/ec/CtznStmtDTO.java | 2 +- .../bean/EcCctvCrackdownServiceBean.java | 2 +- .../bean/EcNatlNewspaperServiceBean.java | 2 +- src/main/java/kr/xit/fims/biz/rt/RtDTO.java | 4 +- .../bean/XitBbsCreateMngServiceBean.java | 38 +------------------ .../cmm/cmm-fims-crackdown-mysql-mapper.xml | 8 ++-- .../biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml | 4 +- .../ec/ec-extrl-reglt-cntc-mysql-mapper.xml | 4 +- .../biz/rt/rt-reglt-and-erpp-mysql-mapper.xml | 6 +-- .../fims/biz/cmm/cmmEnlightDisallowPopup.jsp | 2 +- .../biz/cmm/cmmFimsCrackdownEditPopup.jsp | 6 +-- .../biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp | 2 +- .../jsp/fims/biz/cmm/cmmImposePopup.jsp | 2 +- .../fims/biz/cmm/cmmIntegratedSearchForm.jsp | 4 +- .../fims/biz/rt/rtCrackdownMgtMainForm.jsp | 4 +- .../jsp/fims/biz/rt/rtInitialDataForm.jsp | 4 +- .../jsp/template/fims/templateForm.jsp | 4 +- .../js/fims/biz/common/codeComboData.js | 2 +- 20 files changed, 34 insertions(+), 70 deletions(-) diff --git a/src/main/java/kr/xit/fims/biz/FimsConst.java b/src/main/java/kr/xit/fims/biz/FimsConst.java index 7177842b..5a407c23 100644 --- a/src/main/java/kr/xit/fims/biz/FimsConst.java +++ b/src/main/java/kr/xit/fims/biz/FimsConst.java @@ -141,7 +141,7 @@ public class FimsConst { */ @Getter @AllArgsConstructor - public enum RegistSeCode { + public enum CrdnRegSeCd { AUTO_REGIST("10", "자동등록"), MANUAL_REGIST("20", "수기등록"), ; 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 62d157bb..548f34df 100644 --- a/src/main/java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java +++ b/src/main/java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java @@ -249,7 +249,7 @@ public class CctvCrackdownDTO { private String regltSeCode; private String inputSeCode; - private String registSeCode; + private String crdnRegSeCd; // 단속 데이타 생성시 필요 private String violtLrgNm; 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 594523e0..2b9b529c 100644 --- a/src/main/java/kr/xit/fims/biz/ec/CtznStmtDTO.java +++ b/src/main/java/kr/xit/fims/biz/ec/CtznStmtDTO.java @@ -355,7 +355,7 @@ public class CtznStmtDTO { //extends ExtlEsbDataType { * 답변생성 여부 */ private boolean ansCreate; - private String registSeCode; + private String crdnRegSeCd; private String violtDtlsNm; } } 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 a2a11ede..69556c54 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 @@ -338,7 +338,7 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E .regltSeCode(extrDTO.getRegltSeCode()) .inputSeCode(extrDTO.getInputSeCode()) .jobSeCode(FimsBizUtils.getFileJobSeCode(extrDTO.getRegltSeCode())) - .registSeCode(FimsConst.RegistSeCode.AUTO_REGIST.getCode()) + .crdnRegSeCd(FimsConst.CrdnRegSeCd.AUTO_REGIST.getCode()) .regltProcessSttusCode(FimsConst.RegltProcessSttusCode.CRACKDOWN_INIT.getCode()) .regltPlace(extrDTO.getRegltPlace()) .regltDongNm(extrDTO.getRegltDongNm()) 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 d0d2d328..86157292 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 @@ -151,7 +151,7 @@ public class EcNatlNewspaperServiceBean extends AbstractServiceBean implements E .crdnId(dtl.getCrdnId()) .regltProcessSttusCode(FimsConst.RegltProcessSttusCode.CRACKDOWN_INIT.getCode()) .violtDtlsNm(violtDtlsNm) - .registSeCode(FimsConst.RegistSeCode.AUTO_REGIST.getCode()) + .crdnRegSeCd(FimsConst.CrdnRegSeCd.AUTO_REGIST.getCode()) .rgtr(getUserInfo().getUniqId()) .build(); 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 5c41a471..472d2b2f 100644 --- a/src/main/java/kr/xit/fims/biz/rt/RtDTO.java +++ b/src/main/java/kr/xit/fims/biz/rt/RtDTO.java @@ -162,7 +162,7 @@ public class RtDTO { /** * 자료등록구분코드 */ - private String registSeCode; + private String crdnRegSeCd; /** * 등록 일시 */ @@ -373,7 +373,7 @@ public class RtDTO { /** * 등록구분코드 : FIM026 - 10:자동등록, 20:수기등록 */ - private String registSeCode; + private String crdnRegSeCd; /** * 등록 일시 */ diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBbsCreateMngServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBbsCreateMngServiceBean.java index 41374f1a..4087448f 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBbsCreateMngServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBbsCreateMngServiceBean.java @@ -92,43 +92,7 @@ public class XitBbsCreateMngServiceBean extends AbstractServiceBean implements X bbsPrcuseVO.setRgtr(vo.getRgtr()); bbsPrcuseVO.setUse_yn("Y"); - /* ******************************************** - * 등록구분(XIT_BBS_PRCUSE.REGIST_SE_CODE)에 따라 처리 분기 - ******************************************** */ -// UserInfVO userVO = new UserInfVO(); -// userVO.setTrgetId(vo.getTrgetId()); -// List tmpList = null; -// Iterator iter = null; -// if ("REGC05".equals(vo.getRegistSeCode())) { -// tmpList = userService.selectAllClubUser(userVO); -// iter = tmpList.iterator(); -// while (iter.hasNext()) { -// bbsPrcuseVO = new BoardUseInf(); -// -// bbsPrcuseVO.setBbsId(bbsId); -// bbsPrcuseVO.setTrgetId(((UserInfVO)iter.next()).getUniqId()); -// bbsPrcuseVO.setRegistSeCode("REGC07"); -// bbsPrcuseVO.setUseYn("Y"); -// bbsPrcuseVO.setRgtr(vo.getRgtr()); -// -// bbsUseDAO.insertBBSUseInf(bbsPrcuseVO); -// } -// } else if ("REGC06".equals(vo.getRegistSeCode())) { -// tmpList = userService.selectAllCmmntyUser(userVO); -// iter = tmpList.iterator(); -// while (iter.hasNext()) { -// bbsPrcuseVO = new BoardUseInf(); -// -// bbsPrcuseVO.setBbsId(bbsId); -// bbsPrcuseVO.setTrgetId(((UserInfVO)iter.next()).getUniqId()); -// bbsPrcuseVO.setRegistSeCode("REGC07"); -// bbsPrcuseVO.setUseYn("Y"); -// bbsPrcuseVO.setRgtr(vo.getRgtr()); -// -// bbsUseDAO.insertBBSUseInf(bbsPrcuseVO); -// } -// } - } + 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 52e5b3d1..adcbb98c 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 @@ -42,7 +42,7 @@ , trr.reglt_process_sttus_code , trr.last_process_dt -- 최종처리일시 , trr.last_opetr -- 최종 처리자 - , trr.regist_se_code -- 등록구분 + , trr.crdn_reg_se_cd -- 등록구분 , CONCAT(trr.reglt_de, trr.reglt_begin_time) AS regltDeTime , trr.reg_dt , teerc.extrl_reglt_cntc_id -- CCTV data ID : 접수번호로 보여줄 것 @@ -129,8 +129,8 @@ AND trr.reglt_se_code = #{regltSeCode} - - AND trr.regist_se_code = #{registSeCode} + + AND trr.crdn_reg_se_cd = #{crdnRegSeCd} ORDER BY trr.sys_se_cd, trr.reglt_se_code @@ -190,7 +190,7 @@ /* cmm-fims-crackdown-mysql-mapper|updateRtReglt-단속 정보 초기 자료 반영|julim */ UPDATE tb_rt_reglt SET reglt_se_code = IF(reglt_se_code = #{regltSeCode}, reglt_se_code, #{regltSeCode}) - , regist_se_code = IF(regist_se_code = #{registSeCode}, regist_se_code, #{registSeCode}) + , crdn_reg_se_cd = IF(crdn_reg_se_cd = #{crdnRegSeCd}, crdn_reg_se_cd, #{crdnRegSeCd}) , sys_se_cd = IF(sys_se_cd = #{sysSeCd}, sys_se_cd, #{sysSeCd}) , reglt_de = IF(reglt_de = REPLACE(#{regltDe}, '-', ''), reglt_de, REPLACE(#{regltDe}, '-', '')) , reglt_begin_time = IF(reglt_begin_time = REPLACE(#{regltBeginTime}, ':', ''), reglt_begin_time, REPLACE(#{regltBeginTime}, ':', '')) 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 9f2c155a..35fcb516 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 @@ -229,7 +229,7 @@ , image_nmrs , vhrno , reglt_process_sttus_code - , regist_se_code + , crdn_reg_se_cd , reg_dt , rgtr ) SELECT ecsd.crdn_id @@ -273,7 +273,7 @@ AND tcfm.file_mastr_id = tcfd.file_mastr_id) -- 이미지 매수 , ecsd.vhrno , #{regltProcessSttusCode} -- 단속:10, 서손:11 - , #{registSeCode} + , #{crdnRegSeCd} , DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') , #{rgtr} FROM tb_ec_ctzn_sttemnt_detail ecsd 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 9633ec75..bcc482aa 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 @@ -161,7 +161,7 @@ , image_nmrs , vhrno , reglt_process_sttus_code - , regist_se_code + , crdn_reg_se_cd , reg_dt , rgtr ) SELECT #{crdnId} @@ -212,7 +212,7 @@ AND tcfm.file_mastr_id = tcfd.file_mastr_id) -- 이미지 매수 , vhrno , #{regltProcessSttusCode} -- 단속:10, 서손:11 - , #{registSeCode} + , #{crdnRegSeCd} , DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') , #{rgtr} FROM tb_ec_extrl_reglt_cntc 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 feaf3d57..64551e3d 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 @@ -43,7 +43,7 @@ , trr.last_process_dt , trr.last_opetr , trr.reg_dt - , trr.regist_se_code + , trr.crdn_reg_se_cd , CONCAT(trr.reglt_de, trr.reglt_begin_time) AS regltDeTime FROM tb_rt_reglt trr @@ -74,8 +74,8 @@ AND trr.reglt_se_code = #{regltSeCode} - - AND trr.regist_se_code = #{registSeCode} + + AND trr.crdn_reg_se_cd = #{crdnRegSeCd} 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 c0e4da06..80ac67bf 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 @@ -22,7 +22,7 @@ Date Author Description font-weight: bold; } - #registSeCode { + #crdnRegSeCd { color: #2a48ff; background-color: #d8e7ff; } 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 faf25831..27fdaf93 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 @@ -17,7 +17,7 @@ Date Author Description