From e06398412e219fd406aaace9777c0789fcb485c2 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 1 Jun 2023 15:28:17 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=88=98=EC=A0=95=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/xit/fims/biz/cmm/FimsCrackdownDTO.java | 4 +- .../java/kr/xit/fims/biz/ec/CtznStmtDTO.java | 3 +- .../bean/EcNatlNewspaperServiceBean.java | 2 +- .../cmm/cmm-fims-crackdown-mysql-mapper.xml | 38 ++++++------- .../biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml | 54 ++++++------------- .../biz/cmm/cmmFimsCrackdownEditPopup.jsp | 6 +-- .../fims/biz/cmm/cmmIntegratedSearchForm.jsp | 2 +- .../jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp | 4 +- .../fims/biz/rt/rtAnswerTargetDataForm.jsp | 2 +- .../jsp/fims/biz/rt/rtAnswerWaitDataForm.jsp | 2 +- .../jsp/fims/biz/rt/rtInitialDataForm.jsp | 2 +- 11 files changed, 51 insertions(+), 68 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 acef74c5..f8f5d1ef 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/FimsCrackdownDTO.java +++ b/src/main/java/kr/xit/fims/biz/cmm/FimsCrackdownDTO.java @@ -46,8 +46,8 @@ public class FimsCrackdownDTO { private String cvlcptRcptNo; private String cvlcptRcptYmd; private String cvlcptAplcntNm; - private String cvlcptPrcsPd; - + private String cvlcptPrcsPrnmntDt; + private String cvlcptPrcsPrnmntYmd; // 소유자(납부자) 정보 private String addrSeCd; private String zip; 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 0a13d1ec..93f0df36 100644 --- a/src/main/java/kr/xit/fims/biz/ec/CtznStmtDTO.java +++ b/src/main/java/kr/xit/fims/biz/ec/CtznStmtDTO.java @@ -87,7 +87,8 @@ public class CtznStmtDTO { //extends ExtlEsbDataType { /** * 민원처리기간-peti_end_d */ - private String cvlcptPrcsPd; + private String cvlcptPrcsPrnmntDt; + private String cvlcptPrcsPrnmntYmd; /** * 민원 등록 일시 */ 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 2186c46f..f4fab68e 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 @@ -262,7 +262,7 @@ public class EcNatlNewspaperServiceBean extends AbstractServiceBean implements E dto.setCvlcptAplyTtlNm(xmlDto.getPetiTitleV()); dto.setCvlcptAplyCn(reasonStr); dto.setCvlcptAplyDt(xmlDto.getPetiRegD()); - dto.setCvlcptPrcsPd(xmlDto.getPetiEndD()); + dto.setCvlcptPrcsPrnmntDt(xmlDto.getPetiEndD()); dto.setCvlcptRegistDt(xmlDto.getRegD()); dto.setCtznSttemntProcessSttus(FimsConst.CtznStmtDtlStsCode.UNPROCESSED.getCode()); dto.setRgtr(getUserInfo().getUniqId()); 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 8fd9cfdf..fb792116 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 @@ -49,7 +49,8 @@ , tecs.cvlcpt_rcpt_no -- 접수번호 , tecs.cvlcpt_rcpt_ymd -- 접수일자 , tecs.cvlcpt_aplcnt_nm -- 신고자 - , tecs.cvlcpt_prcs_pd -- 처리기한 + , tecs.cvlcpt_prcs_prnmnt_dt -- 처리기한 + , SUBSTR(tecs.cvlcpt_prcs_prnmnt_dt,1,8) AS cvlcpt_prcs_prnmnt_ymd , tei.duty_id_v -- 담당자 , tei.pcd_tel_v -- 담당자 전화번호 , tre.erpp_id @@ -155,17 +156,18 @@ , tecs.cvlcpt_aply_no , tecs.cvlcpt_rcpt_no , tecs.cvlcpt_aplcnt_nm - , tecs.cvlcpt_aplcnt_zip - , tecs.cvlcpt_aplcnt_adres - , tecs.cvlcpt_aplcnt_email_adres - , tecs.cvlcpt_aplcnt_moblphon_no - , tecs.cvlcpt_aplcnt_tlphon_no + , '' AS cvlcpt_aplcnt_zip + , '' AS cvlcpt_aplcnt_adres + , '' AS cvlcpt_aplcnt_email_adres + , '' AS cvlcpt_aplcnt_moblphon_no + , '' AS cvlcpt_aplcnt_tlphon_no , tecs.cvlcpt_aply_ttl_nm , tecs.cvlcpt_aply_cn , tecs.cvlcpt_aply_dt , tecs.cvlcpt_rcpt_ymd - , tecs.cvlcpt_prcs_pd - , tecs.cvlcpt_regist_dt + , tecs.cvlcpt_prcs_prnmnt_dt + , SUBSTR(cvlcpt_prcs_prnmnt_dt,1,8) AS cvlcpt_prcs_prnmnt_ymd + , '' AS cvlcpt_regist_dt , tecs.ctzn_sttemnt_process_sttus , tecsd.ctzn_sttemnt_detail_sn , tecsd.crdn_plc @@ -279,11 +281,11 @@ , cvlcpt_rcpt_no , cvlcpt_gist , cvlcpt_prcs_sumry - , prcs_dept_code - , cvlcpt_prcs_deptnm - , charger_nm - , charger_email - , charger_tlphon_no + , '' AS prcs_dept_code + , '' AS cvlcpt_prcs_deptnm + , '' AS charger_nm + , '' AS charger_email + , '' AS charger_tlphon_no , cvlcpt_prcs_rslt_cn , cvlcpt_prcs_cmptn_dt , reg_dt @@ -351,11 +353,11 @@ , tecsa.cvlcpt_rcpt_no -- 민원접수번호 , tecsa.cvlcpt_gist -- 민원요지 , tecsa.cvlcpt_prcs_sumry -- 민원처리요약 - , tecsa.prcs_dept_code -- 처리부서코드 - , tecsa.cvlcpt_prcs_deptnm -- 민원처리부서명 - , tecsa.charger_nm -- 담당자명 - , tecsa.charger_email -- 담당자이메일 - , tecsa.charger_tlphon_no -- 담당자전화번호 + , '' AS prcs_dept_code -- 처리부서코드 + , '' AS cvlcpt_prcs_deptnm -- 민원처리부서명 + , '' AS charger_nm -- 담당자명 + , '' AS charger_email -- 담당자이메일 + , '' AS charger_tlphon_no -- 담당자전화번호 , tecsa.cvlcpt_prcs_rslt_cn -- 민원처리결과 , tecsa.cvlcpt_prcs_cmptn_dt -- 처리완료일시 , tei.sys_gubun_c 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 90b8b8e0..998624a3 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 @@ -14,17 +14,18 @@ , cvlcpt_aply_no , cvlcpt_rcpt_no , cvlcpt_aplcnt_nm - , cvlcpt_aplcnt_zip - , cvlcpt_aplcnt_adres - , cvlcpt_aplcnt_email_adres - , cvlcpt_aplcnt_moblphon_no - , cvlcpt_aplcnt_tlphon_no + , '' AS cvlcpt_aplcnt_zip + , '' AS cvlcpt_aplcnt_adres + , '' AS cvlcpt_aplcnt_email_adres + , '' AS cvlcpt_aplcnt_moblphon_no + , '' AS cvlcpt_aplcnt_tlphon_no , cvlcpt_aply_ttl_nm , cvlcpt_aply_cn , cvlcpt_aply_dt , cvlcpt_rcpt_ymd - , cvlcpt_prcs_pd - , cvlcpt_regist_dt + , cvlcpt_prcs_prnmnt_dt + , SUBSTR(cvlcpt_prcs_prnmnt_dt,1,8) AS cvlcpt_prcs_prnmnt_ymd + , '' AS cvlcpt_regist_dt , ctzn_sttemnt_process_sttus , rgtr , mdfcn_dt @@ -52,17 +53,11 @@ , cvlcpt_aply_no , cvlcpt_rcpt_no , cvlcpt_aplcnt_nm - , cvlcpt_aplcnt_zip - , cvlcpt_aplcnt_adres - , cvlcpt_aplcnt_email_adres - , cvlcpt_aplcnt_moblphon_no - , cvlcpt_aplcnt_tlphon_no , cvlcpt_aply_ttl_nm , cvlcpt_aply_cn , cvlcpt_aply_dt , cvlcpt_rcpt_ymd - , cvlcpt_prcs_pd - , cvlcpt_regist_dt + , cvlcpt_prcs_prnmnt_dt , ctzn_sttemnt_process_sttus , reg_dt , rgtr @@ -72,17 +67,11 @@ , #{cvlcptAplyNo} , #{cvlcptRcptNo} , #{cvlcptAplcntNm} - , #{cvlcptAplcntZip} - , #{cvlcptAplcntAdres} - , #{cvlcptAplcntEmailAdres} - , #{cvlcptAplcntMoblphonNo} - , #{cvlcptAplcntTlphonNo} , #{cvlcptAplyTtlNm} , #{cvlcptAplyCn} , #{cvlcptAplyDt} , #{cvlcptRcptYmd} - , #{cvlcptPrcsPd} - , #{cvlcptRegistDt} + , #{cvlcptPrcsPrnmntDt} , #{ctznSttemntProcessSttus} , DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') , #{rgtr} @@ -359,11 +348,11 @@ , cvlcpt_rcpt_no -- 민원접수번호 , cvlcpt_gist -- 민원요지 , cvlcpt_prcs_sumry -- 민원처리요약 - , prcs_dept_code -- 처리부서코드 - , cvlcpt_prcs_deptnm -- 민원처리부서명 - , charger_nm -- 담당자명 - , charger_email -- 담당자이메일 - , charger_tlphon_no -- 담당자전화번호 + , '' AS prcs_dept_code -- 처리부서코드 + , '' AS cvlcpt_prcs_deptnm -- 민원처리부서명 + , '' AS charger_nm -- 담당자명 + , '' AS charger_email -- 담당자이메일 + , '' AS charger_tlphon_no -- 담당자전화번호 , cvlcpt_prcs_rslt_cn -- 민원처리결과 , cvlcpt_prcs_cmptn_dt -- 처리완료일시 FROM tb_ec_ctzn_sttemnt_answer @@ -380,11 +369,6 @@ , cvlcpt_rcpt_no , cvlcpt_gist , cvlcpt_prcs_sumry - , prcs_dept_code - , cvlcpt_prcs_deptnm - , charger_nm - , charger_email - , charger_tlphon_no , cvlcpt_prcs_rslt_cn , cvlcpt_prcs_cmptn_dt , reg_dt @@ -396,11 +380,6 @@ , #{cvlcptRcptNo} , #{cvlcptGist} , #{cvlcptPrcsSumry} - , #{prcsDeptCode} - , #{cvlcptPrcsDeptnm} - , #{chargerNm} - , #{chargerEmail} - , #{chargerTlphonNo} , #{cvlcptPrcsRsltCn} , DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') , DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') @@ -472,7 +451,8 @@ - + + 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 49c67558..cb2feb89 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 @@ -164,8 +164,8 @@ Date Author Description 답변기한 - - + @@ -586,7 +586,7 @@ Date Author Description ,cvlcptAplcntMoblphonNo: $('input[name=cvlcptAplcntMoblphonNo]').val() ,cvlcptAplyCn: $('input[name=cvlcptAplyCn]').val() ,cvlcptRcptYmd: $('input[name=cvlcptRcptYmd]').val() - ,cvlcptPrcsPd: $('input[name=cvlcptPrcsPd]').val() + ,cvlcptPrcsPrnmntYmd: $('input[name=cvlcptPrcsPrnmntYmd]').val() ,cvlcptAplyCn: $('input[name=cvlcptAplyCn]').val() } 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 77e1329c..c38f834a 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 @@ -627,7 +627,7 @@ Date Author Description }, { header: '처리기한', - name: 'cvlcptPrcsPd', + name: 'cvlcptPrcsPrnmntDt', minWidth: 80, sortable: false, align: 'center', 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 dcbd9feb..640eb39b 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 @@ -106,8 +106,8 @@ 민원처리기간 - - + + 민원등록일시 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 b88de46b..df066ddc 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 @@ -624,7 +624,7 @@ }, { header: '처리기한', - name: 'cvlcptPrcsPd', + name: 'cvlcptPrcsPrnmntDt', minWidth: 80, sortable: false, align: 'center', 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 f7e882a4..5eeef49f 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 @@ -620,7 +620,7 @@ }, { header: '처리기한', - name: 'cvlcptPrcsPd', + name: 'cvlcptPrcsPrnmntDt', minWidth: 80, sortable: false, align: 'center', 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 4926a9e6..6cff9f0d 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 @@ -622,7 +622,7 @@ }, { header: '처리기한', - name: 'cvlcptPrcsPd', + name: 'cvlcptPrcsPrnmntDt', minWidth: 80, sortable: false, align: 'center',