From 245e81e14ba91d75a29a2bd6f6feea9103b773d0 Mon Sep 17 00:00:00 2001 From: jjh Date: Mon, 19 Aug 2024 18:23:15 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EC=9D=98=EA=B2=AC=EC=A0=9C=EC=B6=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.=202.=20=EA=B8=B0=ED=83=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/excl/web/Excl01Controller.java | 14 ++++++-------- .../xit/fims/excl/web/Excl02Controller.java | 18 ++++-------------- src/main/java/cokr/xit/fims/rcvm/Rcvmt.java | 10 +++++----- src/main/java/cokr/xit/fims/rdca/Rdamt.java | 13 ++++++++++++- .../xit/fims/sprt/web/Sprt02Controller.java | 4 ++-- .../sql/mapper/fims/rcvm/rcvmt-mapper.xml | 18 +++++++++--------- 6 files changed, 38 insertions(+), 39 deletions(-) diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java index 4f9576e1..c17a9d04 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java @@ -196,14 +196,12 @@ public class Excl01Controller extends ApplicationController { addCodes(commonCodes, mav, "FIM021", "FIM022"); return mav - .addObject("openerPageName", hReq.getParameter("openerPageName")) // 호출한 Jsp PageName - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("pageName", "excl01020") // jsp pageName - .addObject("infoPrefix", "levyExcl") // prefix - .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("FIM021List", commonCodes.get("FIM021")) // 부과 제외 구분 코드(LEVY_EXCL_SE_CD) - .addObject("FIM022List", commonCodes.get("FIM022")) // 부과 제외 사유 코드(LEVY_EXCL_RSN_CD) - .addObject("levyExclInfo", json ? info : toJson(info)) // 부과제외 정보 + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("pageName", "excl01020") // jsp pageName + .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl + .addObject("FIM021List", commonCodes.get("FIM021")) // 부과 제외 구분 코드(LEVY_EXCL_SE_CD) + .addObject("FIM022List", commonCodes.get("FIM022")) // 부과 제외 사유 코드(LEVY_EXCL_RSN_CD) + .addObject("info", json ? info : toJson(info)) // 부과제외 정보 .addObject("saveCallbackFuncName", hReq.getParameter("saveCallbackFuncName")) .addObject("savedCallbackFuncName", hReq.getParameter("savedCallbackFuncName")) ; diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java index edd11cf2..d4327c0c 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -109,7 +109,6 @@ public class Excl02Controller extends ApplicationController { return mav .addObject("pageName", "excl02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("infoPrefix", "opnnSbmsn") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) @@ -134,7 +133,7 @@ public class Excl02Controller extends ApplicationController { public ModelAndView getOpinionSubmissionList(LevyExclQuery req) { if (!"xls".equals(req.getDownload())) { List result = opnnSbmsnService.getOpnnSbmsnList(setFetchSize(req)); - return setCollectionInfo(new ModelAndView("jsonView"), result, "opnnSbmsn"); + return setCollectionInfo(new ModelAndView("jsonView"), result, ""); } else { // 현재 날짜 구하기 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); @@ -228,18 +227,15 @@ public class Excl02Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM019", "FIM029", "FIM030", "FIM032", "FIM033", "FIM054"); return mav - .addObject("openerPageName", hReq.getParameter("openerPageName")) // 호출한 Jsp PageName .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 .addObject("pageName", "excl02020") // jsp pageName - .addObject("infoPrefix", "opnnSbmsn") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl .addObject("FIM019List", commonCodes.get("FIM019")) // 감경 사유 구분 코드(RDCT_RSN_CD) .addObject("FIM029List", commonCodes.get("FIM029")) // 접수 구분 코드(RCPT_SE_CD) .addObject("FIM030List", commonCodes.get("FIM030")) // 통보 구분 코드(NTFCTN_SE_CD) .addObject("FIM032List", commonCodes.get("FIM032")) // 소유주 관계 구분 코드(OWNR_REL_CD) .addObject("FIM033List", commonCodes.get("FIM033")) // 의견 제출 구분 코드(OPNN_SBMSN_SE_CD) - .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) - .addObject("opnnSbmsnInfo", json ? info : toJson(info)) // 의견제출 정보 + .addObject("info", json ? info : toJson(info)) // 의견제출 정보 ; } } @@ -320,24 +316,20 @@ public class Excl02Controller extends ApplicationController { DataObject info = opnnSbmsnService.getOpnnSbmsnInfo(req); boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/excl/excl02030-info"); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM019", "FIM030", "FIM031", "FIM033", "FIM054"); return mav - .addObject("openerPageName", hReq.getParameter("openerPageName")) // 호출한 Jsp PageName .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 .addObject("pageName", "excl02030") // jsp pageName - .addObject("infoPrefix", "opnnSbmsn") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl .addObject("FIM019List", commonCodes.get("FIM019")) // 감경 사유 구분 코드(RDCT_RSN_CD) .addObject("FIM030List", commonCodes.get("FIM030")) // 통보 구분 코드(NTFCTN_SE_CD) .addObject("FIM031List", commonCodes.get("FIM031")) // 의견 제출 상태 코드(OPNN_SBMSN_STTS_CD) .addObject("FIM033List", commonCodes.get("FIM033")) // 의견 제출 구분 코드(OPNN_SBMSN_SE_CD) - .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) - .addObject("opnnSbmsnInfo", json ? info : toJson(info)) + .addObject("info", json ? info : toJson(info)) ; } @@ -452,12 +444,10 @@ public class Excl02Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/excl/excl02040-info"); return mav - .addObject("openerPageName", hReq.getParameter("openerPageName")) // 호출한 Jsp PageName .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 .addObject("pageName", "excl02040") // jsp pageName - .addObject("infoPrefix", "opnnDlbrMbr") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("opnnDlbrMbrInfo", json ? info : toJson(info)) + .addObject("info", json ? info : toJson(info)) ; } diff --git a/src/main/java/cokr/xit/fims/rcvm/Rcvmt.java b/src/main/java/cokr/xit/fims/rcvm/Rcvmt.java index ba3776d6..1392f840 100644 --- a/src/main/java/cokr/xit/fims/rcvm/Rcvmt.java +++ b/src/main/java/cokr/xit/fims/rcvm/Rcvmt.java @@ -137,16 +137,16 @@ public class Rcvmt extends AbstractEntity { */ private String payMthdSeCd; - /** - * 가상계좌번호 - */ - private String vractno; - /** * 전자납부번호 */ private String epayno; + /** + * 가상계좌번호 + */ + private String vrActno; + /** * 수납 취소 여부 */ diff --git a/src/main/java/cokr/xit/fims/rdca/Rdamt.java b/src/main/java/cokr/xit/fims/rdca/Rdamt.java index 02a786b5..964bfbb8 100644 --- a/src/main/java/cokr/xit/fims/rdca/Rdamt.java +++ b/src/main/java/cokr/xit/fims/rdca/Rdamt.java @@ -11,6 +11,7 @@ import cokr.xit.foundation.AbstractEntity; @Getter @Setter public class Rdamt extends AbstractEntity { + /** * 감액 ID */ @@ -81,5 +82,15 @@ public class Rdamt extends AbstractEntity { */ private String delRsn; -} + // 추가 ///////////////////////////////////////////////////////////////////// + /** + * 부과 Ids + */ + private String[] levyIds; + /** + * 시군구 코드 + */ + private String sggCd; + +} diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java index ea4ff804..2a137c7a 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java @@ -220,10 +220,10 @@ public class Sprt02Controller extends ApplicationController { sndbQuery.setCrdnId(req.getCrdnId()); // 단속 ID sndbQuery.setDelYn(req.getDelYn()); // 삭제 여부 - sndbQuery.setOrderBy("SD.REG_DT DESC, SD.SNDNG_DTL_ID DESC"); // 정렬 + sndbQuery.setOrderBy("SD.REG_DT, SD.SNDNG_DTL_ID"); // 정렬 List sndngDtls = sndngDtlService.getSndngDtls(sndbQuery); // 발송 상세 정보 - sndbQuery.setOrderBy("SV.REG_DT DESC, SV.SVBTC_ID DESC"); // 정렬 + sndbQuery.setOrderBy("SV.REG_DT, SV.SVBTC_ID"); // 정렬 List svbtcDtls = svbtcService.getSvbtcDtls(sndbQuery); // 공시송달 정보 return mav 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 f78a3282..f64c8d66 100644 --- a/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml @@ -33,8 +33,8 @@ - - + + @@ -80,8 +80,8 @@ , R.RCVMT_BANK_NM , R.PAY_MTHD_SE_CD , (SELECT GET_CODE_NM('FIM045', R.PAY_MTHD_SE_CD) FROM DUAL) AS PAY_MTHD_SE_NM - , R.VRACTNO , R.EPAYNO + , R.VR_ACTNO , R.RCVMT_RTRCN_YN , (SELECT GET_CODE_NM('CMN005', R.RCVMT_RTRCN_YN) FROM DUAL) AS RCVMT_RTRCN_NM , R.RCVMT_RTRCN_DT @@ -301,8 +301,8 @@ , R.RCVMT_BANK_NM , R.PAY_MTHD_SE_CD , (SELECT GET_CODE_NM('FIM045', R.PAY_MTHD_SE_CD) FROM DUAL) AS PAY_MTHD_SE_NM - , R.VRACTNO , R.EPAYNO + , R.VR_ACTNO , R.RCVMT_RTRCN_YN , R.RCVMT_RTRCN_DT , R.RCVMT_RTRCN_RSN @@ -311,9 +311,9 @@ , (SELECT GET_CODE_NM('FIM020', R.RCVMT_STTS_CD) FROM DUAL) AS RCVMT_STTS_NM , R.DEL_YN , R.REG_DT + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = R.RGTR) AS RGTR_NM , R.MDFCN_DT - , R.DEL_DT - , R.DEL_RSN + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = R.MDFR) AS MDFR_NM , L.LEVY_ID , C.CRDN_ID FROM TB_RCVMT R @@ -391,7 +391,7 @@ , RCVMT_BANK_NM , PAY_MTHD_SE_CD , EPAYNO - , VRACTNO + , VR_ACTNO , RCVMT_RTRCN_YN , RCVMT_RTRCN_DT , RCVMT_RTRCN_RSN @@ -429,7 +429,7 @@ , #{rcvmtBankNm} , #{payMthdSeCd} , #{epayno} - , #{vractno} + , #{vrActno} , #{rcvmtRtrcnYn} , #{rcvmtRtrcnDt} , #{rcvmtRtrcnRsn} @@ -458,7 +458,7 @@ , RCVMT_BANK_NM = #{rcvmtBankNm} , PAY_MTHD_SE_CD = #{payMthdSeCd} , EPAYNO = #{epayno} - , VRACTNO = #{vractno} + , VR_ACTNO = #{vrActno} , RCVMT_RTRCN_YN = #{rcvmtRtrcnYn} , RCVMT_RTRCN_DT = #{rcvmtRtrcnDt} , RCVMT_RTRCN_RSN = #{rcvmtRtrcnRsn}