diff --git a/src/main/resources/sql/mapper/fims/epst/epostGdcc-mapper.xml b/src/main/resources/sql/mapper/fims/epst/epostGdcc-mapper.xml index e5973ae8..112e5283 100644 --- a/src/main/resources/sql/mapper/fims/epst/epostGdcc-mapper.xml +++ b/src/main/resources/sql/mapper/fims/epst/epostGdcc-mapper.xml @@ -47,9 +47,7 @@ WHERE EG.SGG_CD = #{sggCd} - AND EG.TASK_SE_CD = #{taskSeCd} - AND EG.SNDNG_SE_CD = #{schSndngSeCd} diff --git a/src/main/resources/sql/mapper/fims/epst/epostRcptDtl-mapper.xml b/src/main/resources/sql/mapper/fims/epst/epostRcptDtl-mapper.xml index bfa3f777..a1873ca8 100644 --- a/src/main/resources/sql/mapper/fims/epst/epostRcptDtl-mapper.xml +++ b/src/main/resources/sql/mapper/fims/epst/epostRcptDtl-mapper.xml @@ -164,44 +164,47 @@ - - AND ERD.DEL_YN = #{delYn} /* 삭제 여부 */ - + + AND ERD.CON_KEY = #{conKey} + + + AND ERD.DEL_YN = #{delYn} + + + + + AND ERD.REG_DT =]]> CONCAT(#{schRegDateFrom},'000000') + + + AND ERD.REG_DT CONCAT(#{schRegDateTo},'235959') + + + + + AND ERD.MDFCN_DT =]]> CONCAT(#{schRegDateFrom},'000000') + + + AND ERD.MDFCN_DT CONCAT(#{schRegDateTo},'235959') + + + + + + + + + AND ERD.RGTR = #{schRgtrCd} + + + + + AND ERD.MDFR = #{schRgtrCd} + + + + + - - - - AND ERD.REG_DT =]]> CONCAT(#{schRegDateFrom},'000000') /* 등록 일자 시작 */ - - - AND ERD.REG_DT CONCAT(#{schRegDateTo},'235959') /* 등록 일자 종료 */ - - - - - AND ERD.MDFCN_DT =]]> CONCAT(#{schRegDateFrom},'000000') /* 수정 일자 시작 */ - - - AND ERD.MDFCN_DT CONCAT(#{schRegDateTo},'235959') /* 수정 일자 종료 */ - - - - - - - - - AND ERD.RGTR = #{schRgtrCd} /* 등록자 코드 */ - - - - - AND ERD.MDFR = #{schRgtrCd} /* 수정자 코드 */ - - - - - @@ -209,8 +212,11 @@ /* 발송 대장 목록 조회(sndngMapper.selectSndngList) */ - WHERE S.SGG_CD = #{sggCd} - AND S.TASK_SE_CD = #{taskSeCd} - + + AND S.SNDNG_YMD =]]> #{schSndngYmdFrom} - - + + AND S.SNDNG_YMD #{schSndngYmdTo} - - + + AND S.SNDNG_REG_SE_CD = #{schSndngRegSeCd} - - + + AND S.SNDNG_SE_CD = #{schSndngSeCd} - - + + AND S.SNDNG_SE_CD = #{sndngSeCd} - - + + AND S.SNDNG_SE_CD =]]> #{sndngSeCdFrom} - - + + AND S.SNDNG_SE_CD #{sndngSeCdTo} - - - - + + + AND S.SGG_CD = #{sggCd} + + + AND S.TASK_SE_CD = #{taskSeCd} + + AND S.DEL_YN = 'N' + + + AND S.REG_DT =]]> CONCAT(#{schRegDateFrom},'000000') - - + + AND S.REG_DT CONCAT(#{schRegDateTo},'235959') - - - - + + + + AND S.MDFCN_DT =]]> CONCAT(#{schRegDateFrom},'000000') - - + + AND S.MDFCN_DT CONCAT(#{schRegDateTo},'235959') - - - - - - - - + + + + + + + + AND S.RGTR = #{schRgtrCd} - - - - + + + + AND S.MDFR = #{schRgtrCd} - - - - - - - - AND S.DEL_YN = #{delYn} - - - AND S.DEL_YN = 'N' - - - - - - - - S.TASK_SE_CD - S.SNDNG_REG_SE_CD - S.SNDNG_SE_CD - S.SNDNG_YMD - S.DUDT_YMD - S.TTL_NM - S.DOC_NO - S.ETC_CN - S.TNOCS - S.GRAMT - S.SNDNG_STTS_CD - - #{term} + - + + + + + + S.TASK_SE_CD + S.SNDNG_REG_SE_CD + S.SNDNG_SE_CD + S.SNDNG_YMD + S.DUDT_YMD + S.TTL_NM + S.DOC_NO + S.ETC_CN + S.TNOCS + S.GRAMT + S.SNDNG_STTS_CD + + #{term} + + + + + + @@ -278,128 +277,134 @@ LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) LEFT OUTER JOIN TB_PAYER_ADDR PA ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN) LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N') - WHERE C.SGG_CD = #{sggCd} - AND C.TASK_SE_CD = #{taskSeCd} - + + AND C.CRDN_ID IN ( - #{crdnId} - ) - - + #{crdnId} + ) + + AND C.CRDN_ID = #{crdnId} - - + + AND C.CRDN_STTS_CD = #{crdnSttsCd} - - + + AND LE.LEVY_EXCL_YMD =]]> #{schLevyExclYmdFrom} - - + + AND LE.LEVY_EXCL_YMD #{schLevyExclYmdTo} - - + + AND LE.LEVY_EXCL_RSN_CD #{schLevyExclRsnCd} - - + + AND C.CRDN_YMD =]]> #{schCrdnYmdFrom} - - + + AND C.CRDN_YMD #{schCrdnYmdTo} - - + + AND C.VHRNO = #{schVhrno} - - + + AND P.RTPYR_NO = #{schRtpyrNo} - - + + AND P.RTPYR_NM = #{schRtpyrNm} - + + + AND C.SGG_CD = #{sggCd} + + + AND C.TASK_SE_CD = #{taskSeCd} + AND C.DEL_YN = 'N' - - - + + + AND LE.REG_DT =]]> CONCAT(#{schRegDateFrom},'000000') - - + + AND LE.REG_DT CONCAT(#{schRegDateTo},'235959') - - - - + + + + AND LE.MDFCN_DT =]]> CONCAT(#{schRegDateFrom},'000000') - - + + AND LE.MDFCN_DT CONCAT(#{schRegDateTo},'235959') - - - - - - - - + + + + + + + + AND LE.RGTR = #{schRgtrCd} - - - - + + + + AND LE.MDFR = #{schRgtrCd} - - - - - - - - - - - C.CRDN_REG_SE_CD - C.CRDN_INPT_SE_CD - C.CRDN_YMD - C.VHRNO - C.CRDN_STDG_NM - C.CRDN_ROAD_NM - C.CRDN_PLC - C.FFNLG_CRDN_AMT - C.FFNLG_AMT - C.ADVNTCE_AMT - C.OPNN_SBMSN_YN - C.CRDN_STTS_CD - CA.CRDN_SE_CD - CA.DTL_CRDN_PLC - CA.CRDN_SPAREA_CD - CA.CRDN_BGNG_TM - CA.CRDN_END_TM - CA.CRDN_SN - CA.USE_FUEL_CD - CA.FFNLG_CARMDL_CD - CA.PARKNG_PSBLTY_RSLT_CD - CA.VLTN_NMTM - CA.OVTIME_YN - V.VLTN_ARTCL - P.RTPYR_NM - P.RTPYR_NO - PA.ZIP - PA.ADDR - PA.DTL_ADDR - CC.CVLCPT_APLY_NO - CC.CVLCPT_RCPT_NO - CC.CVLCPT_RCPT_YMD - CC.CVLCPT_PRCS_PIC_NM - CC.CVLCPT_PRCS_CD - CC.CVLCPT_TRSM_CD - LE.LEVY_EXCL_YMD - LE.LEVY_EXCL_RSN_CD - LE.ETC_CN - - #{term} + - + + + + + + C.CRDN_REG_SE_CD + C.CRDN_INPT_SE_CD + C.CRDN_YMD + C.VHRNO + C.CRDN_STDG_NM + C.CRDN_ROAD_NM + C.CRDN_PLC + C.FFNLG_CRDN_AMT + C.FFNLG_AMT + C.ADVNTCE_AMT + C.OPNN_SBMSN_YN + C.CRDN_STTS_CD + CA.CRDN_SE_CD + CA.DTL_CRDN_PLC + CA.CRDN_SPAREA_CD + CA.CRDN_BGNG_TM + CA.CRDN_END_TM + CA.CRDN_SN + CA.USE_FUEL_CD + CA.FFNLG_CARMDL_CD + CA.PARKNG_PSBLTY_RSLT_CD + CA.VLTN_NMTM + CA.OVTIME_YN + V.VLTN_ARTCL + P.RTPYR_NM + P.RTPYR_NO + PA.ZIP + PA.ADDR + PA.DTL_ADDR + CC.CVLCPT_APLY_NO + CC.CVLCPT_RCPT_NO + CC.CVLCPT_RCPT_YMD + CC.CVLCPT_PRCS_PIC_NM + CC.CVLCPT_PRCS_CD + CC.CVLCPT_TRSM_CD + LE.LEVY_EXCL_YMD + LE.LEVY_EXCL_RSN_CD + LE.ETC_CN + + #{term} + + + + + + /* 사전통지 발송 대상 목록 조회(sndngMapper.selectAdvntceSndngTrgtList) */ @@ -679,44 +690,50 @@ INNER JOIN TB_CRDN C ON (L.CRDN_ID = C.CRDN_ID) LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) LEFT OUTER JOIN TB_PAYER_ADDR PA ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN) - WHERE L.SGG_CD = #{sggCd} - AND L.TASK_SE_CD = #{taskSeCd} - + + AND L.LEVY_ID IN ( - #{levyId} - ) - - + #{levyId} + ) + + AND L.LEVY_ID = #{levyId} - - + + AND C.CRDN_ID IN ( - #{crdnId} - ) - - + #{crdnId} + ) + + AND C.CRDN_ID = #{crdnId} - - + + AND V.VLTN_CD = #{schVltnCd} - - + + AND L.LEVY_YMD = #{schLevyYmd} - - + + AND L.FRST_DUDT_YMD = #{schFrstDudtYmd} - - + + AND L.FYR = #{schFyr} - - + + AND L.LEVY_NO =]]> #{schLevyNoFrom} - - + + AND L.LEVY_NO #{schLevyNoTo} - + + + AND L.SGG_CD = #{sggCd} + + + AND L.TASK_SE_CD = #{taskSeCd} + AND L.DEL_YN = 'N' AND C.DEL_YN = 'N' + /* 공시송달 대상 발송 상세 ID 가져오기(sndngMapper.selectSvbtcsTrgtSndngDtlIds) */ diff --git a/src/main/resources/sql/mapper/fims/sprt/cvlcptDscsn-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/cvlcptDscsn-mapper.xml index 2a027881..b8559936 100644 --- a/src/main/resources/sql/mapper/fims/sprt/cvlcptDscsn-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/cvlcptDscsn-mapper.xml @@ -61,26 +61,30 @@ diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp index f579cc51..cc505bb4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp @@ -368,7 +368,7 @@ , title: params.title , content: resp , size: "lg" - , onClose: () => { $P.fnRefreshDataInfo(); } + , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재조회 }); } }); @@ -516,7 +516,7 @@ , title: params.title , content: resp , size: "lg" - , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재 조회 + , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재조회 }); } }); @@ -538,7 +538,7 @@ , onOK: () => { } }); - if (resp.saved) { $P.fnRefreshDataInfo(); } // 자료 재 조회 + if (resp.saved) { $P.fnRefreshDataInfo(); } // 자료 재조회 } }); } @@ -564,7 +564,7 @@ , title: dialogTitle , content: resp , size: "lg" - , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재 조회 + , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재조회 }); } }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp index 536cc601..2e9295ec 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp @@ -201,7 +201,7 @@ prefix: "opnn" , prefixName: "의견제출" , keymapper: info => info ? info.OPNN_ID : "" - , dataGetter: obj => obj.opnnSbmsn + , dataGetter: obj => obj.opnnSbmsnInfo , formats: { RCPT_YMD: dateFormat , ANS_YMD_TM: datetimeFormat @@ -244,7 +244,7 @@ , title: params.title , content: resp , size: "lg" - , onClose: () => { $P.refreshDataInfo(); } + , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재조회 }); } } @@ -261,9 +261,7 @@ , onOK: () => { } }); - if (resp.saved) { - $P.refreshDataInfo(); // 자료 재조회 - } + if (resp.saved) { $P.fnRefreshDataInfo(); } // 자료 재조회 } // 삭제 @@ -281,7 +279,7 @@ * 사용자 함수(function) **************************************************************************/ // 자료 재조회 - $P.refreshDataInfo = () => { + $P.fnRefreshDataInfo = () => { // 단속 ID let crdnId = $("#crdnId--${pageNameMain}").val(); // 단속 ID 가 없다면.. return @@ -309,7 +307,7 @@ pageObject["${pageNameMain}"].mainControl.setData([resp.totalInfo]); } // 의견제출 정보 - if (resp.opnnSbmsn) { $P.control.setData([resp.opnnSbmsn]); } + if (resp.opnnSbmsnInfo) { $P.control.setData([resp.opnnSbmsnInfo]); } } }); } @@ -327,7 +325,7 @@ , title: params.title , content: resp , size: "lg" - , onClose: () => { $P.refreshDataInfo(); } + , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재조회 }); } }); @@ -643,9 +641,9 @@ $P.initForm(); // 3. Dataset 설정 - let opnnSbmsn = ${opnnSbmsn}; // 의견제출 정보 - if (opnnSbmsn) { - $P.control.setData([opnnSbmsn]); + let opnnSbmsnInfo = ${opnnSbmsnInfo}; // 의견제출 정보 + if (opnnSbmsnInfo) { + $P.control.setData([opnnSbmsnInfo]); } }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02040-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02040-info.jsp index 657cafd7..5da516b8 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02040-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02040-info.jsp @@ -299,7 +299,7 @@ , title: params.title , content: resp , size: "md" - , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재 조회 + , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재조회 }); } }); @@ -316,7 +316,7 @@ , onOK: () => { } }); - if (resp.saved) { $P.fnRefreshDataInfo(); } // 자료 재 조회 + if (resp.saved) { $P.fnRefreshDataInfo(); } // 자료 재조회 } // 개별 반송 삭제 diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp index c639c81d..89d3efd3 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp @@ -340,7 +340,7 @@ , title: params.title , content: resp , size: "lg" - , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재 조회 + , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재조회 }); } } @@ -358,9 +358,7 @@ , onOK: () => { } }); - if (resp.saved) { - $P.fnRefreshDataInfo(); // 자료 재 조회 - } + if (resp.saved) { $P.fnRefreshDataInfo(); } // 자료 재조회 } // 감경 삭제 @@ -403,7 +401,7 @@ , title: params.title , content: resp , size: "md" - , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재 조회 + , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재조회 }); } } @@ -421,7 +419,7 @@ , onOK: () => { } }); - if (resp.saved) { $P.fnRefreshDataInfo(); } // 자료 재 조회 + if (resp.saved) { $P.fnRefreshDataInfo(); } // 자료 재조회 } // 부과제외 삭제 diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02060-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02060-info.jsp index 6e0e8cca..35278a22 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02060-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02060-info.jsp @@ -406,7 +406,7 @@ , title: params.title , content: resp , size: "md" - , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재 조회 + , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재조회 }); } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp index 94c70a87..75a012b2 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp @@ -293,7 +293,7 @@ , title: params.title , content: resp , size: "lg" - , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재 조회 + , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재조회 }); } }); @@ -311,7 +311,7 @@ }); // 자료 재조회 - if (resp.saved) { $P.fnRefreshDataInfo(); } // 자료 재 조회 + if (resp.saved) { $P.fnRefreshDataInfo(); } // 자료 재조회 } // 수기 수납 취소 @@ -337,7 +337,7 @@ }); // 자료 재조회 - if (resp.saved) { $P.fnRefreshDataInfo(); } // 자료 재 조회 + if (resp.saved) { $P.fnRefreshDataInfo(); } // 자료 재조회 } // 수기 수납 삭제 diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02080-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02080-info.jsp index aa11c03f..e216be74 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02080-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02080-info.jsp @@ -153,7 +153,7 @@ , title: params.title , content: resp , size: "lg" - , onClose: () => { $P.fnRefreshDataInfo(); } + , onClose: () => { $P.fnRefreshDataInfo(); } // 자료 재조회 }); } });