diff --git a/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java b/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java index 7dfbec58..ff47f0f9 100644 --- a/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java +++ b/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java @@ -209,7 +209,7 @@ public class PayerBean extends AbstractComponent { String retMessage = "[F] "; // 처리 결과 메시지 // 단속 ID로 단속 정보 조회 - DataObject infoCrdn = payerMapper.selectCrdnInfo(payer.getCrdnId()); + DataObject crdnInfo = payerMapper.selectCrdnInfo(payer.getCrdnId()); // 납부자 조회 조건 PayerQuery req = new PayerQuery(); @@ -217,12 +217,12 @@ public class PayerBean extends AbstractComponent { req.setRtpyrNo(payer.getRtpyrNo()); req.setOrderBy("RTPYR_ID DESC"); - Payer infoPayer = getPayer(payer.getVhrno(), payer.getRtpyrNo()); + Payer payerInfo = getPayer(payer.getVhrno(), payer.getRtpyrNo()); // payer.setWholAddr(payer.getAddr() + ", " + payer.getDtlAddr()); // 전체 주소 - if (infoPayer == null) { + if (payerInfo == null) { // 납부자가 신규 등록 retSuccess = payerMapper.insert(payer); if (!retSuccess) { @@ -242,8 +242,9 @@ public class PayerBean extends AbstractComponent { } } else { // 수정할 납부자ID 와 조회한 납부자 ID 확인 - if (!payer.getRtpyrId().equals(infoPayer.getRtpyrId())) { - payer.setRtpyrId(infoPayer.getRtpyrId()); +// if (!payer.getRtpyrId().equals(payerInfo.getRtpyrId())) { + if (!crdnInfo.string("RTPYR_ID").equals(payerInfo.getRtpyrId())) { + payer.setRtpyrId(payerInfo.getRtpyrId()); // 단속 대장의 납부자 ID 수정 및 단속 납부자 이력(TB_CRDN_PAYER_HSTRY) 대장에 등록한다. CrdnPayerHstry crdnPayerHstry = new CrdnPayerHstry(); @@ -258,29 +259,18 @@ public class PayerBean extends AbstractComponent { } // 현재 조회된 납부자 정보에서 주소가 다르다면 update 필요 - if (!(infoPayer.getRtpyrSeCd().equals(payer.getRtpyrSeCd()) && - infoPayer.getRtpyrNm().equals(payer.getRtpyrNm()) && - infoPayer.getRtpyrTelno().equals(payer.getRtpyrTelno()) && - infoPayer.getRtpyrMblTelno().equals(payer.getRtpyrMblTelno()) && - infoPayer.getRtpyrEml().equals(payer.getRtpyrEml()) && - infoPayer.getRtpyrSttsCd().equals(payer.getRtpyrSttsCd()) && - infoPayer.getZip().equals(payer.getZip()) && - infoPayer.getAddr().equals(payer.getAddr()) && - infoPayer.getDtlAddr().equals(payer.getDtlAddr())) ) { - retSuccess = payerMapper.update(payer); - if (!retSuccess) { - // 예외를 발생시켜서 오류메세지를 보내고 DB Rollback - throw new RuntimeException("납부자 수정에 실패하였습니다."); - } + retSuccess = payerMapper.update(payer); + if (!retSuccess) { + throw new RuntimeException("납부자 수정에 실패하였습니다."); // 예외를 발생시켜서 오류메세지를 보내고 DB Rollback } } // 단속 상태 이력(TB_CRDN_STTS_HSTRY) 대장에 등록하고, 단속(TB_CRDN) 대장을 수정한다. - if (infoCrdn.number("CRDN_STTS_CD").intValue() < 21) { // 납부자 등록 완료 + if (crdnInfo.number("CRDN_STTS_CD").intValue() < 21) { // 납부자 등록 완료 CrdnSttsHstry crdnSttsHstry = new CrdnSttsHstry(); - crdnSttsHstry.setCrdnId(infoCrdn.string("CRDN_ID")); - crdnSttsHstry.setBfrSttsCd(infoCrdn.string("CRDN_STTS_CD")); - crdnSttsHstry.setBfrSttsChgDt(infoCrdn.string("CRDN_STTS_CHG_DT")); + crdnSttsHstry.setCrdnId(crdnInfo.string("CRDN_ID")); + crdnSttsHstry.setBfrSttsCd(crdnInfo.string("CRDN_STTS_CD")); + crdnSttsHstry.setBfrSttsChgDt(crdnInfo.string("CRDN_STTS_CHG_DT")); crdnSttsHstry.setCrdnSttsCd("21"); retSuccess = crdnSttsHstryBean.createHstryUpdateCrdnSttsCd(crdnSttsHstry); diff --git a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml index d712337d..fca288d6 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml @@ -220,6 +220,8 @@ AND (SELECT VLTN_ARTCL FROM TB_VLTN WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT('%', /* 민원접수자료 목록 조회(crdnCvlcptMapper.selectCivilComplaintReceiptDataList) */ SELECT C.CRDN_ID + , C.SGG_CD + , C.TASK_SE_CD , C.CRDN_REG_SE_CD , GET_CODE_NM('FIM026', C.CRDN_REG_SE_CD) AS CRDN_REG_SE_NM , CC.CVLCPT_APLCNT_NM @@ -403,6 +405,8 @@ SELECT C.CRDN_ID /* 민원답변대상자료 목록 조회(crdnCvlcptMapper.selectCivilComplaintAnswerTargetDataList) */ SELECT C.CRDN_ID + , C.SGG_CD + , C.TASK_SE_CD , C.CRDN_REG_SE_CD , (SELECT VLTN_ARTCL FROM TB_VLTN diff --git a/src/main/resources/sql/mapper/fims/payer-mapper.xml b/src/main/resources/sql/mapper/fims/payer-mapper.xml index d8a48eb7..b3100103 100644 --- a/src/main/resources/sql/mapper/fims/payer-mapper.xml +++ b/src/main/resources/sql/mapper/fims/payer-mapper.xml @@ -318,65 +318,64 @@ UPDATE TB_PAYER SET - SELECT P.RTPYR_ID - , P.SGG_CD - , (CASE WHEN (P.VHRNO IS NULL OR P.VHRNO = '') THEN C.VHRNO - ELSE P.VHRNO - END) AS VHRNO - , P.RTPYR_INPT_SE_CD - , (SELECT GET_CODE_NM('FIM015', P.RTPYR_INPT_SE_CD) FROM DUAL) AS RTPYR_INPT_SE_NM - , P.RTPYR_SE_CD - , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM - , P.RTPYR_NO - , P.RTPYR_NM - , P.RTPYR_TELNO - , P.RTPYR_MBL_TELNO - , P.RTPYR_EML - , P.RTPYR_BRDT - , P.RTPYR_STTS_CD - , (SELECT GET_CODE_NM('FIM014', P.RTPYR_STTS_CD) FROM DUAL) AS RTPYR_STTS_NM - , P.ADDR_SE_CD - , P.ZIP - , P.ROAD_NM_CD - , P.UDGD_SE_CD - , P.BMNO - , P.BSNO - , P.BLDG_MNG_NO - , P.STDG_CD - , P.DONG_CD - , P.MTN_SE_CD - , P.MNO - , P.SNO - , P.SPCL_DONG - , P.SPCL_HO - , P.SPCL_ADDR - , P.ADDR - , P.DTL_ADDR - , P.WHOL_ADDR - , P.REG_DT - , P.RGTR - , P.MDFCN_DT - , P.MDFR - , C.CRDN_ID - , C.SGG_CD - , C.TASK_SE_CD - , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM - , C.CRDN_STTS_CD - , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM - FROM TB_PAYER P - LEFT OUTER JOIN TB_CRDN C ON (P.RTPYR_ID = C.RTPYR_ID) + SELECT P.RTPYR_ID + , P.SGG_CD + , P.RTPYR_INPT_SE_CD + , P.RTPYR_SE_CD + , P.RTPYR_NO + , P.RTPYR_NM + , P.RTPYR_TELNO + , P.RTPYR_MBL_TELNO + , P.RTPYR_EML + , P.RTPYR_BRDT + , P.RTPYR_STTS_CD + , P.ADDR_SE_CD + , P.ZIP + , P.ROAD_NM_CD + , P.UDGD_SE_CD + , P.BMNO + , P.BSNO + , P.BLDG_MNG_NO + , P.STDG_CD + , P.DONG_CD + , P.MTN_SE_CD + , P.MNO + , P.SNO + , P.SPCL_DONG + , P.SPCL_HO + , P.SPCL_ADDR + , P.ADDR + , P.DTL_ADDR + , P.WHOL_ADDR + , P.REG_DT + , P.RGTR + , P.MDFCN_DT + , P.MDFR + , (CASE WHEN (P.VHRNO IS NULL OR P.VHRNO='') THEN C.VHRNO ELSE P.VHRNO END) AS VHRNO + , (SELECT GET_CODE_NM('FIM015', P.RTPYR_INPT_SE_CD) FROM DUAL) AS RTPYR_INPT_SE_NM + , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM + , (SELECT GET_CODE_NM('FIM014', P.RTPYR_STTS_CD) FROM DUAL) AS RTPYR_STTS_NM + , C.CRDN_ID + , C.SGG_CD + , C.TASK_SE_CD + , C.CRDN_YMD + , C.CRDN_STTS_CD + , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM + , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM + FROM TB_PAYER P + LEFT OUTER JOIN TB_CRDN C ON (P.RTPYR_ID = C.RTPYR_ID) - /* 납부자 대장 객체 가져오기(payerMapper.selectCrdnPayers) */ - AND P.RTPYR_ID = #{rtpyrId} + AND P.RTPYR_ID = #{rtpyrId} - AND C.CRDN_ID = #{crdnId} + AND C.CRDN_ID = #{crdnId} - AND C.DEL_YN = #{delYn} + AND C.DEL_YN = #{delYn} @@ -384,65 +383,64 @@ UPDATE TB_PAYER SET - SELECT PH.RTPYR_ID - , PH.HSTRY_SN - , PH.SGG_CD - , PH.VHRNO - , PH.RTPYR_INPT_SE_CD - , PH.RTPYR_SE_CD - , PH.RTPYR_NO - , PH.RTPYR_NM - , PH.RTPYR_TELNO - , PH.RTPYR_MBL_TELNO - , PH.RTPYR_EML - , PH.RTPYR_BRDT - , PH.RTPYR_STTS_CD - , PH.ADDR_SE_CD - , PH.ZIP - , PH.ROAD_NM_CD - , PH.UDGD_SE_CD - , PH.BMNO - , PH.BSNO - , PH.BLDG_MNG_NO - , PH.STDG_CD - , PH.DONG_CD - , PH.MTN_SE_CD - , PH.MNO - , PH.SNO - , PH.SPCL_DONG - , PH.SPCL_HO - , PH.SPCL_ADDR - , PH.ADDR - , PH.DTL_ADDR - , PH.WHOL_ADDR - , PH.REG_DT - , PH.RGTR - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = PH.RGTR) AS RGTR_NM - FROM TB_PAYER_HSTRY PH + SELECT PH.RTPYR_ID + , PH.HSTRY_SN + , PH.SGG_CD + , PH.VHRNO + , PH.RTPYR_INPT_SE_CD + , PH.RTPYR_SE_CD + , PH.RTPYR_NO + , PH.RTPYR_NM + , PH.RTPYR_TELNO + , PH.RTPYR_MBL_TELNO + , PH.RTPYR_EML + , PH.RTPYR_BRDT + , PH.RTPYR_STTS_CD + , PH.ADDR_SE_CD + , PH.ZIP + , PH.ROAD_NM_CD + , PH.UDGD_SE_CD + , PH.BMNO + , PH.BSNO + , PH.BLDG_MNG_NO + , PH.STDG_CD + , PH.DONG_CD + , PH.MTN_SE_CD + , PH.MNO + , PH.SNO + , PH.SPCL_DONG + , PH.SPCL_HO + , PH.SPCL_ADDR + , PH.ADDR + , PH.DTL_ADDR + , PH.WHOL_ADDR + , PH.REG_DT + , PH.RGTR + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = PH.RGTR) AS RGTR_NM + FROM TB_PAYER_HSTRY PH diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-info.jsp index c0b9b244..77134c83 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-info.jsp @@ -19,11 +19,11 @@
- - +
@@ -48,7 +48,7 @@ - @@ -99,7 +99,7 @@ content : showMessage, init : function(){ focusClose(); } }); - + if (resp.saved) { dialog.close(${pageName}Control.prefix + "Dialog"); } @@ -138,8 +138,8 @@ if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; dialog.alert({ - content : "현재 " + ${pageName}Control.prefixName + " 정보를 저장하시겠습니까?", - init : function() { focusOK(); }, + content : "현재 " + ${pageName}Control.prefixName + " 정보를 저장하시겠습니까?", + init : function() { focusOK(); }, onOK : () => { ${pageName}Control.save(${pageName}Fields.get()); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp index 0eb2f1ee..5e9f56da 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp @@ -82,14 +82,17 @@ -
- - + + +
@@ -122,7 +125,6 @@ - @@ -239,8 +241,6 @@ $("#mtnSeCd--${pageName}").val(info.use_strnghld_mntn); // 사용본거지 산 $("#mno--${pageName}").val(info.use_strnghld_lnbr); // 사용본거지 번지 $("#sno--${pageName}").val(info.use_strnghld_ho); // 사용본거지 호 - - $("#btnEdit--${pageName}").show(); // 수정 버튼이 보이도록.. } // 차적 조회 @@ -277,7 +277,6 @@ $("#addr--${pageName}").attr("readonly", true); // 주소 $("#zip--${pageName}").attr("readonly", true); // 우편번호 $("#dtlAddr--${pageName}").attr("readonly", true); // 상세 주소 - $("#btnZip--${pageName}").hide(); // 우편번호 검색 callbackVehicle${pageName}(resp.vehicle); } @@ -285,19 +284,6 @@ }); } - /************************************************************************** - * 초기 셋팅 - **************************************************************************/ - // 검색조건 초기값 셋팅 - initForm${pageName} = () => { - $("#btnEdit--${pageName}").hide(); - } - - // 이벤트 설정 - setEvent${pageName} = () => { - - } - /************************************************************************** * function **************************************************************************/ @@ -353,31 +339,28 @@ } // 우편번호 검색 결과 fnZipReturn${pageName} = (obj) => { + $("#addr--${pageName}").val(obj.ADDR); // 주소 + $("#zip--${pageName}").val(obj.ZIP); // 우편번호 + $("#dtlAddr--${pageName}").val(obj.DTL_ADDR); // 상세 주소 - $("#addr--${pageName}").val(obj.ADDR); // 주소 - $("#zip--${pageName}").val(obj.ZIP); // 우편번호 - $("#dtlAddr--${pageName}").val(obj.DTL_ADDR); // 상세 주소 - - $("#roadNmCd--${pageName}").val(obj.ROAD_NM_CD); // - $("#udgdSeCd--${pageName}").val(obj.UDGD_SE_CD); // + $("#roadNmCd--${pageName}").val(obj.ROAD_NM_CD); // + $("#udgdSeCd--${pageName}").val(obj.UDGD_SE_CD); // $("#bmno--${pageName}").val(obj.BMNO); // $("#bsno--${pageName}").val(obj.BSNO); // - $("#bldgMngNo--${pageName}").val(obj.BLDG_MNG_NO); // - $("#stdgCd--${pageName}").val(obj.STDG_CD); // - $("#mtnSeCd--${pageName}").val(obj.MTN_SE_CD); // + $("#bldgMngNo--${pageName}").val(obj.BLDG_MNG_NO); // + $("#stdgCd--${pageName}").val(obj.STDG_CD); // + $("#mtnSeCd--${pageName}").val(obj.MTN_SE_CD); // $("#mno--${pageName}").val(obj.MNO); // $("#sno--${pageName}").val(obj.SNO); // - $("#dongCd--${pageName}").val(obj.DONG_CD); // - + $("#dongCd--${pageName}").val(obj.DONG_CD); // } // 화면에서 보여주는 주소입력 부분 수정 fnEdit${pageName} = () => { - $("#rtpyrInptSeCd--${pageName}").val("01"); // 입력 구분 - $("#addr--${pageName}").prop("readonly", false); // 주소 - $("#zip--${pageName}").prop("readonly", false); // 우편번호 - $("#dtlAddr--${pageName}").prop("readonly", false); // 상세 주소 - $("#btnZip--${pageName}").show(); // 우편번호 검색 + $("#rtpyrInptSeCd--${pageName}").val("01"); // 입력 구분 + $("#addr--${pageName}").prop("readonly", false); // 주소 + $("#zip--${pageName}").prop("readonly", false); // 우편번호 + $("#dtlAddr--${pageName}").prop("readonly", false); // 상세 주소 } // 저장 @@ -393,6 +376,22 @@ }); } + /************************************************************************** + * 초기 셋팅 + **************************************************************************/ + // 이벤트 설정 + setEvent${pageName} = () => { + // + } + + // 검색조건 초기값 셋팅 + initForm${pageName} = () => { + // + $("#addr--${pageName}").prop("readonly", true); // 주소 + $("#zip--${pageName}").prop("readonly", true); // 우편번호 + $("#dtlAddr--${pageName}").prop("readonly", true); // 상세 주소 + } + /************************************************************************** * script 진입 **************************************************************************/ diff --git a/src/main/webapp/resources/css/fims/framework/common/xit-core.css b/src/main/webapp/resources/css/fims/framework/common/xit-core.css index 7077edc2..e484edd8 100644 --- a/src/main/webapp/resources/css/fims/framework/common/xit-core.css +++ b/src/main/webapp/resources/css/fims/framework/common/xit-core.css @@ -1770,18 +1770,18 @@ progress { table.compress-cell-w > :not(caption) > * > * { padding-left: 7px !important; - padding-right: 7px !important; + padding-right: 7px !important; } table.compress-cell-h > :not(caption) > * > * { padding-top: 4px !important; - padding-bottom: 4px !important; + padding-bottom: 4px !important; } table.compress-cell > :not(caption) > * > * { padding-left: 7px !important; padding-right: 7px !important; padding-top: 4px !important; - padding-bottom: 4px !important; + padding-bottom: 4px !important; } .table > tbody { @@ -9758,7 +9758,7 @@ form select.selectpicker.is-invalid ~ .btn { @media (min-width: 576px) { .modal-content { box-shadow: 0 2px 20px 0 rgba(67, 89, 113, 0.45); - } + } } .progress { @@ -11096,6 +11096,10 @@ button.list-group-item-gray.active { width: 75% !important; } +.w-78 { + width: 78% !important; +} + .w-80 { width: 80% !important; }