From f3d3f213024c4edfbe187b8b5e69954d9a043c14 Mon Sep 17 00:00:00 2001 From: jjh Date: Thu, 30 Nov 2023 11:21:54 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EC=88=98=EA=B8=B0=20=EC=88=98=EB=82=A9=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EC=88=98=EC=A0=95.=202.=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A0=AC=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fims/excl/service/bean/CrdnReRegBean.java | 9 ++- .../fims/excl/service/bean/LevyExclBean.java | 9 ++- .../fims/excl/service/bean/OpnnSbmsnBean.java | 11 +++- .../xit/fims/levy/service/bean/LevyBean.java | 18 ++++++ .../xit/fims/levy/service/bean/RductBean.java | 5 +- .../xit/fims/rcvm/service/bean/RcvmtBean.java | 6 +- .../sql/mapper/fims/levy/levy-mapper.xml | 28 +++++---- .../sql/mapper/fims/rcvm/rcvmt-mapper.xml | 63 +++++++++---------- .../WEB-INF/jsp/fims/sndb/sndb01240-main.jsp | 10 +-- .../WEB-INF/jsp/fims/sprt/sprt02070-info.jsp | 52 ++++++++++----- 10 files changed, 142 insertions(+), 69 deletions(-) diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/CrdnReRegBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/CrdnReRegBean.java index 9e255136..a90c1b7d 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/CrdnReRegBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/CrdnReRegBean.java @@ -52,6 +52,13 @@ public class CrdnReRegBean extends AbstractComponent { * @return 단속 재등록 목록 */ public List getCrdnReRegList(LevyExclQuery req) { + if (req.getDelYn() == null) { + req.setDelYn("N"); + } + if (req.getOrderBy() == null) { + req.setOrderBy("REG_DT"); + } + return crdnReRegMapper.selectCrdnReRegList(req); } @@ -61,7 +68,7 @@ public class CrdnReRegBean extends AbstractComponent { */ public List getCrdnReRegs(LevyExclQuery req) { if (req.getOrderBy() == null) { - req.setOrderBy("CRR.REG_DT DESC, CRR.RE_REG_ID DESC"); + req.setOrderBy("CRR.RE_REG_ID DESC"); } return crdnReRegMapper.selectCrdnReRegs(req); diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java index 52006396..0c76bbf9 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java @@ -41,6 +41,13 @@ public class LevyExclBean extends AbstractComponent { * @return 부과제외 대장 목록 */ public List getLevyExclList(LevyExclQuery req) { + if (req.getDelYn() == null) { + req.setDelYn("N"); + } + if (req.getOrderBy() == null) { + req.setOrderBy("REG_DT"); + } + return levyExclMapper.selectLevyExclList(req); } @@ -50,7 +57,7 @@ public class LevyExclBean extends AbstractComponent { */ public List getLevyExcls(LevyExclQuery req) { if (req.getOrderBy() == null) { - req.setOrderBy("LE.REG_DT"); + req.setOrderBy("LE.LEVY_EXCL_ID DESC"); } return levyExclMapper.selectLevyExcls(req); diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnBean.java index f7ee3cb5..2b6b009c 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnBean.java @@ -55,6 +55,13 @@ public class OpnnSbmsnBean extends AbstractComponent { * @return 의견제출 대장 목록 */ public List getOpnnSbmsnList(LevyExclQuery req) { + if (req.getDelYn() == null) { + req.setDelYn("N"); + } + if (req.getOrderBy() == null) { + req.setOrderBy("REG_DT"); + } + return opnnSbmsnMapper.selectOpnnSbmsnList(req); } @@ -64,7 +71,7 @@ public class OpnnSbmsnBean extends AbstractComponent { */ public List getOpnnSbmsns(LevyExclQuery req) { if (req.getOrderBy() == null) { - req.setOrderBy("OS.REG_DT DESC, OS.OPNN_ID DESC"); + req.setOrderBy("OS.OPNN_ID DESC"); } return opnnSbmsnMapper.selectOpnnSbmsns(req); @@ -84,7 +91,7 @@ public class OpnnSbmsnBean extends AbstractComponent { */ public List getOpnnSbmsnDlbrDecsns(LevyExclQuery req) { if (req.getOrderBy() == null) { - req.setOrderBy("OS.REG_DT DESC, OS.OPNN_ID DESC"); + req.setOrderBy("OS.OPNN_ID DESC"); } return opnnSbmsnMapper.selectOpnnSbmsnDlbrDecsns(req); diff --git a/src/main/java/cokr/xit/fims/levy/service/bean/LevyBean.java b/src/main/java/cokr/xit/fims/levy/service/bean/LevyBean.java index 1e58184c..0f0b3474 100644 --- a/src/main/java/cokr/xit/fims/levy/service/bean/LevyBean.java +++ b/src/main/java/cokr/xit/fims/levy/service/bean/LevyBean.java @@ -41,6 +41,13 @@ public class LevyBean extends AbstractComponent { * @return 부과 대장 목록 */ public List getRductLevyTrgtList(LevyQuery req) { + if (req.getDelYn() == null) { + req.setDelYn("N"); + } + if (req.getOrderBy() == null) { + req.setOrderBy("REG_DT"); + } + return levyMapper.selectRductLevyTrgtList(req); } @@ -49,6 +56,13 @@ public class LevyBean extends AbstractComponent { * @return 부과 대장 목록 */ public List getLevyList(LevyQuery req) { + if (req.getDelYn() == null) { + req.setDelYn("N"); + } + if (req.getOrderBy() == null) { + req.setOrderBy("REG_DT"); + } + return levyMapper.selectLevyList(req); } @@ -57,6 +71,10 @@ public class LevyBean extends AbstractComponent { * @return 부과 대장 객체 목록 */ public List getLevys(LevyQuery req) { + if (req.getOrderBy() == null) { + req.setOrderBy("L.LEVY_ID DESC"); + } + return levyMapper.selectLevys(req); } diff --git a/src/main/java/cokr/xit/fims/levy/service/bean/RductBean.java b/src/main/java/cokr/xit/fims/levy/service/bean/RductBean.java index 3059ec8f..4462bb72 100644 --- a/src/main/java/cokr/xit/fims/levy/service/bean/RductBean.java +++ b/src/main/java/cokr/xit/fims/levy/service/bean/RductBean.java @@ -40,6 +40,9 @@ public class RductBean extends AbstractComponent { * @return 과태료 감경 대장 목록 */ public List getRductList(LevyQuery req) { + if (req.getDelYn() == null) { + req.setDelYn("N"); + } if (req.getOrderBy() == null) { req.setOrderBy("REG_DT"); } @@ -53,7 +56,7 @@ public class RductBean extends AbstractComponent { */ public List getRducts(LevyQuery req) { if (req.getOrderBy() == null) { - req.setOrderBy("R.REG_DT DESC, R.RDUCT_ID DESC"); + req.setOrderBy("R.RDUCT_ID DESC"); } return rductMapper.selectRducts(req); diff --git a/src/main/java/cokr/xit/fims/rcvm/service/bean/RcvmtBean.java b/src/main/java/cokr/xit/fims/rcvm/service/bean/RcvmtBean.java index 0c73f778..a96d2173 100644 --- a/src/main/java/cokr/xit/fims/rcvm/service/bean/RcvmtBean.java +++ b/src/main/java/cokr/xit/fims/rcvm/service/bean/RcvmtBean.java @@ -50,7 +50,7 @@ public class RcvmtBean extends AbstractComponent { req.setDelYn("N"); } if (req.getOrderBy() == null) { - req.setOrderBy("RCVMT_ID"); + req.setOrderBy("REG_DT"); } return rcvmtMapper.selectRcvmtList(req); @@ -61,6 +61,10 @@ public class RcvmtBean extends AbstractComponent { * @return 수납 대장 객체 목록 */ public List getRcvmts(RcvmtQuery req) { + if (req.getOrderBy() == null) { + req.setOrderBy("R.RCVMT_ID DESC"); + } + return rcvmtMapper.selectRcvmts(req); } diff --git a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml index d6214366..f0152455 100644 --- a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml +++ b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml @@ -147,24 +147,24 @@ LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_ID = CC.CVLCPT_LINK_ID AND C.CVLCPT_LINK_YN = 'Y' AND CC.DEL_YN = 'N') LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID AND L.DEL_YN = 'N') - WHERE C.SGG_CD = #{sggCd} /* 시군구 코드 */ - AND C.TASK_SE_CD = #{taskSeCd} /* 업무 구분 코드 */ - AND C.CRDN_STTS_CD BETWEEN '21' AND '31' /* 단속 상태 코드 */ - AND C.RTPYR_ID IS NOT NULL /* 납부자 ID */ - AND C.DEL_YN = 'N' /* 삭제 여부 */ + WHERE C.SGG_CD = #{sggCd} /* 시군구 코드 */ + AND C.TASK_SE_CD = #{taskSeCd} /* 업무 구분 코드 */ + AND C.CRDN_STTS_CD BETWEEN '21' AND '31' /* 단속 상태 코드 */ + AND C.RTPYR_ID IS NOT NULL /* 납부자 ID */ + AND C.DEL_YN = #{delYn} /* 삭제 여부 */ AND (CC.CVLCPT_PRCS_CD IS NULL OR CC.CVLCPT_PRCS_CD ]]> '00') /* 민원 처리 코드 */ - AND L.LEVY_ID IS NULL /* 부과 ID */ + AND L.LEVY_ID IS NULL /* 부과 ID */ - AND C.CRDN_YMD = ]]> #{schCrdnYmdFrom} /* 단속 일자 시작 */ + AND C.CRDN_YMD = ]]> #{schCrdnYmdFrom} /* 단속 일자 시작 */ - AND C.CRDN_YMD #{schCrdnYmdTo} /* 단속 일자 종료 */ + AND C.CRDN_YMD #{schCrdnYmdTo} /* 단속 일자 종료 */ - AND C.VHRNO = #{schVhrno} /* 차량번호 */ + AND C.VHRNO = #{schVhrno} /* 차량번호 */ - AND P.RTPYR_NM = #{schRtpyrNm} /* 납부자 명 */ + AND P.RTPYR_NM = #{schRtpyrNm} /* 납부자 명 */ @@ -189,12 +189,12 @@ - AND C.RGTR = #{schDetailCrdnRgtrCd} /* 등록자 코드 */ + AND C.RGTR = #{schDetailCrdnRgtrCd} /* 등록자 코드 */ - AND C.MDFR = #{schDetailCrdnRgtrCd} /* 수정자 코드 */ + AND C.MDFR = #{schDetailCrdnRgtrCd} /* 수정자 코드 */ @@ -332,7 +332,9 @@ diff --git a/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml b/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml index 608da918..235a1cef 100644 --- a/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml @@ -130,17 +130,17 @@ , P.ADDR /* 주소 */ , P.DTL_ADDR /* 상세 주소 */ , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM /* 납부자 구분 명 */ - FROM TB_RCVMT R - INNER JOIN TB_LEVY L ON (R.LEVY_ID = L.LEVY_ID) - 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) + FROM TB_RCVMT R + INNER JOIN TB_LEVY L ON (R.LEVY_ID = L.LEVY_ID) + 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) /* 수납 대장 수납취소 정보 수정(rcvmtMapper.updateRcvmtRtrcn) */ UPDATE TB_RCVMT - SET RCVMT_RTRCN_YN = #{rcvmt.rcvmtRtrcnYn} /* 수납 취소 여부 */ - , RCVMT_RTRCN_DT = #{rcvmt.rcvmtRtrcnDt} /* 수납 취소 일시 */ - , RCVMT_RTRCN_RSN = #{rcvmt.rcvmtRtrcnRsn} /* 수납 취소 사유 */ - , MDFCN_DT = #{rcvmt.lastModified} /* 수정 일시 */ - , MDFR = #{rcvmt.modifiedBy} /* 수정자 */ - WHERE RCVMT_ID = #{rcvmt.rcvmtId} /* 수납 ID */ - AND DEL_YN = 'N' /* 삭제 여부 */ + SET RCVMT_RTRCN_YN = #{rcvmt.rcvmtRtrcnYn} /* 수납 취소 여부 */ + , RCVMT_RTRCN_DT = #{rcvmt.rcvmtRtrcnDt} /* 수납 취소 일시 */ + , RCVMT_RTRCN_RSN = #{rcvmt.rcvmtRtrcnRsn} /* 수납 취소 사유 */ + , MDFCN_DT = #{rcvmt.lastModified} /* 수정 일시 */ + , MDFR = #{rcvmt.modifiedBy} /* 수정자 */ + WHERE RCVMT_ID = #{rcvmt.rcvmtId} /* 수납 ID */ + AND DEL_YN = 'N' /* 삭제 여부 */ /* 수납 대장 등록(rcvmtMapper.insertRcvmt) */ @@ -356,7 +356,6 @@ , #{rcvmt.taskSeCd} /* 업무 구분 코드 */ , #{rcvmt.levyId} /* 부과 ID */ , #{rcvmt.rcvmtInptSeCd} /* 수납 입력 구분 코드 */ - , #{rcvmt.spclAcntgBizCd} /* 특별 회계 사업 코드 */ , #{rcvmt.fyr} /* 회계 연도 */ , #{rcvmt.acntgSeCd} /* 회계 구분 코드 */ , #{rcvmt.txitmCd} /* 세목 코드 */ diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp index 59ef30aa..d03ec287 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp @@ -344,7 +344,7 @@ } // 공시송달 수정 callback - callbackSvbtcInfo${pageName} = (obj) => { + getSvbtcInfo${pageName} = (obj) => { let taskSeCd = $("input[name='taskSeCd']:checked").val(); // 업무 구분 코드 let svbtcId = ${pageName}Control.dataset.getValue("SVBTC_ID"); // 공시송달 ID @@ -374,7 +374,7 @@ } // 공시송달 삭제 callback - callbackRemoveSvbtcs${pageName} = (obj) => { + removeSvbtcs${pageName} = (obj) => { let taskSeCd = $("input[name='taskSeCd']:checked").val(); // 업무 구분 코드 let selected = ${pageName}Control.dataset.getKeys("selected"); // 선택 자료 @@ -523,7 +523,9 @@ // 공시송달 수정 버튼 이벤트 fnSvbtcInfo${pageName} = () => { - let callbackFuncName = "callbackSvbtcInfo${pageName}"; + + + let callbackFuncName = "getSvbtcInfo${pageName}"; let taskSeCd = $("input:radio[name='taskSeCd']:checked").val(); let popupWidth = 640; @@ -554,7 +556,7 @@ if (selected.length < 1) return; - let callbackFuncName = "callbackRemoveSvbtcs${pageName}"; + let callbackFuncName = "removeSvbtcs${pageName}"; let popupWidth = 640; let popupHeight = 360; let popupX = (window.screen.width / 2) - (popupWidth / 2); 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 4566fd4f..716c8fa0 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 @@ -12,14 +12,14 @@ - - - @@ -411,7 +411,31 @@ // 수기 수납 취소 fnUpdateRcvmtRtrcn${pageName} = () => { + // 수납 ID + let rcvmtId = ${pageName}Control.dataset.getValue("RCVMT_ID"); + // 수납 ID 가 없다면.. return + if (typeof rcvmtId == "undefined" || rcvmtId == null || rcvmtId == "") return; + + dialog.alert({ + content : "수납 취소시 과오납 대장이 생성됩니다." + , onOK : () => { + let callbackFuncName = "updateRcvmtRtrcn${pageName}"; + let popupWidth = 640; + let popupHeight = 360; + let popupX = (window.screen.width / 2) - (popupWidth / 2); + let popupY= (window.screen.height / 2) - (popupHeight / 2); + + window.open( + wctx.url("/resources/html/inputRsnDialog.html" + + "?callbackFuncName=" + callbackFuncName + + "&CALL_PURPOSE=" + "remove" + ) + , "inputDelRsnDialog" + , 'status=no, height=' + popupHeight + ', width=' + popupWidth + ', left='+ popupX + ', top='+ popupY + ); + } + }); } // 수기 수납 삭제 @@ -432,14 +456,14 @@ return; } // 수납 취소 여부가 "Y" 일때만 삭제 가능 - if (${pageName}Control.dataset.getValue("RCVMT_RTRCN_YN") != "Y") { - dialog.alert({ - content : "수납이 취소된 자료만 삭제 가능합니다." - , onOK : () => { } - }); - - return; - } +// if (${pageName}Control.dataset.getValue("RCVMT_RTRCN_YN") != "Y") { +// dialog.alert({ +// content : "수납이 취소된 자료만 삭제 가능합니다." +// , onOK : () => { } +// }); + +// return; +// } let callbackFuncName = "removeRcvmt${pageName}"; let popupWidth = 640;