From 2690d7aff060ef48cc82dce3a3d858cdbe02ef0c Mon Sep 17 00:00:00 2001 From: jjh Date: Fri, 20 Oct 2023 09:21:49 +0900 Subject: [PATCH] =?UTF-8?q?DB=EC=97=90=EC=84=9C=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=ED=95=A8=EC=88=98=EB=AA=85=20=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/sndb/web/Sndb01Controller.java | 12 ++++------ .../mapper/fims/epst/epostRcptReg-mapper.xml | 2 +- .../sql/mapper/fims/excl/opnnSbmsn-mapper.xml | 24 +++++++++---------- .../sql/mapper/fims/levy/levy-mapper.xml | 1 - .../sql/mapper/fims/sndb/sndng-mapper.xml | 17 +++++++++++-- .../sql/mapper/fims/sprt/totalInfo-mapper.xml | 12 ++++++---- 6 files changed, 39 insertions(+), 29 deletions(-) diff --git a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java index a4fb16a3..5a0ee203 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -105,8 +105,7 @@ public class Sndb01Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sndb/sndb01020-info"); - return mav - .addObject("pageName", "sndb01020") + return mav.addObject("pageName", "sndb01020") .addObject("sndngSeCd", req.getSndngSeCd()) // 발송 구분 코드 .addObject("wrngSndngTrgts", json ? wrngSndngTrgts : toJson(wrngSndngTrgts)) // 계도장 발송 대상 정보 ; @@ -159,8 +158,7 @@ public class Sndb01Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sndb/sndb01040-info"); - return mav - .addObject("pageName", "sndb01040") + return mav.addObject("pageName", "sndb01040") .addObject("sndngSeCd", req.getSndngSeCd()) // 발송 구분 코드 .addObject("wrngSndngDtlInfo", json ? sndngDtls : toJson(sndngDtls)) // 계도장 발송 현황 세부내용 ; @@ -220,8 +218,7 @@ public class Sndb01Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sndb/sndb01060-info"); - return mav - .addObject("pageName", "sndb01060") + return mav.addObject("pageName", "sndb01060") .addObject("sndngSeCd", req.getSndngSeCd()) // 발송 구분 코드 .addObject("vltnCd", req.getVltnCd()) // 위반 코드 .addObject("advntceSndngTrgs", json ? advntceSndngTrgs : toJson(advntceSndngTrgs)) // 사전통지 발송 대상 정보 @@ -275,8 +272,7 @@ public class Sndb01Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sndb/sndb01080-info"); - return mav - .addObject("pageName", "sndb01080") + return mav.addObject("pageName", "sndb01080") .addObject("sndngSeCd", req.getSndngSeCd()) // 발송 구분 코드 .addObject("advntceSndngDtlInfo", json ? sndngDtls : toJson(sndngDtls)) // 사전통지 발송 현황 세부내용 ; diff --git a/src/main/resources/sql/mapper/fims/epst/epostRcptReg-mapper.xml b/src/main/resources/sql/mapper/fims/epst/epostRcptReg-mapper.xml index 82b2cf96..5fd7ee8c 100644 --- a/src/main/resources/sql/mapper/fims/epst/epostRcptReg-mapper.xml +++ b/src/main/resources/sql/mapper/fims/epst/epostRcptReg-mapper.xml @@ -667,7 +667,7 @@ UPDATE TB_EPOST_RCPT_DTL SET WHERE RGST_NMBR LIKE CONCAT(#{sndngYmd}, '%') - /* 전자우편 등기번호 조회(epostRcptRegMapper.getEpostRgNo) */ SELECT RG_NO , RG_NO_NEXT FROM TB_EPOST_RG_NO diff --git a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml index 0e12f0f6..b7c44c02 100644 --- a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml @@ -56,12 +56,12 @@ , OS.RCPT_NO , OS.RCPT_YMD , OS.RCPT_SE_CD - , (SELECT GET_CODE_NM('FIM029', OS.RCPT_SE_CD) FROM DUAL) AS RCPT_SE_NM + , (SELECT GET_CODE_NM('FIM029', OS.RCPT_SE_CD) FROM DUAL) AS RCPT_SE_NM , OS.OWNR_REL_CD - , (SELECT GET_CODE_NM('FIM032', OS.OWNR_REL_CD) FROM DUAL) AS OWNR_REL_NM + , (SELECT GET_CODE_NM('FIM032', OS.OWNR_REL_CD) FROM DUAL) AS OWNR_REL_NM , OS.STTR_NM , OS.STTR_BRDT - , (SELECT FN_GET_BRDT_FORMAT(OS.STTR_BRDT, '-') FROM DUAL) AS STTR_BRDT_FORMAT + , (SELECT GET_BRDT_FORMAT(OS.STTR_BRDT, '-') FROM DUAL) AS STTR_BRDT_FORMAT , OS.STTR_RRNO , OS.STTR_ADDR , OS.STTR_DADDR @@ -70,15 +70,15 @@ , OS.STTR_EML , OS.OPNN_SBMSN_CN , OS.OPNN_SBMSN_SE_CD - , (SELECT GET_CODE_NM('FIM033', OS.OPNN_SBMSN_SE_CD) FROM DUAL) AS OPNN_SBMSN_SE_NM + , (SELECT GET_CODE_NM('FIM033', OS.OPNN_SBMSN_SE_CD) FROM DUAL) AS OPNN_SBMSN_SE_NM , OS.OPNN_SBMSN_GIST , OS.ATCH_FILE_CNT , OS.DOC_NO , OS.NTFCTN_SE_CD - , (SELECT GET_CODE_NM('FIM030', OS.NTFCTN_SE_CD) FROM DUAL) AS NTFCTN_SE_NM + , (SELECT GET_CODE_NM('FIM030', OS.NTFCTN_SE_CD) FROM DUAL) AS NTFCTN_SE_NM , OS.PIC_RVW_OPNN , OS.OPNN_SBMSN_STTS_CD - , (SELECT GET_CODE_NM('FIM031', OS.OPNN_SBMSN_STTS_CD) FROM DUAL) AS OPNN_SBMSN_STTS_NM + , (SELECT GET_CODE_NM('FIM031', OS.OPNN_SBMSN_STTS_CD) FROM DUAL) AS OPNN_SBMSN_STTS_NM , OS.ANS_YMD , OS.ANS_TM , (CONCAT(OS.ANS_YMD, OS.ANS_TM)) AS ANS_YMD_TM @@ -418,12 +418,12 @@ , OS.RCPT_NO , OS.RCPT_YMD , OS.RCPT_SE_CD - , (SELECT GET_CODE_NM('FIM029', OS.RCPT_SE_CD) FROM DUAL) AS RCPT_SE_NM + , (SELECT GET_CODE_NM('FIM029', OS.RCPT_SE_CD) FROM DUAL) AS RCPT_SE_NM , OS.OWNR_REL_CD - , (SELECT GET_CODE_NM('FIM032', OS.OWNR_REL_CD) FROM DUAL) AS OWNR_REL_NM + , (SELECT GET_CODE_NM('FIM032', OS.OWNR_REL_CD) FROM DUAL) AS OWNR_REL_NM , OS.STTR_NM , OS.STTR_BRDT - , (SELECT FN_GET_BRDT_FORMAT(OS.STTR_BRDT, '-') FROM DUAL) AS STTR_BRDT_FORMAT + , (SELECT GET_BRDT_FORMAT(OS.STTR_BRDT, '-') FROM DUAL) AS STTR_BRDT_FORMAT , OS.STTR_RRNO , OS.STTR_ADDR , OS.STTR_DADDR @@ -432,15 +432,15 @@ , OS.STTR_EML , OS.OPNN_SBMSN_CN , OS.OPNN_SBMSN_SE_CD - , (SELECT GET_CODE_NM('FIM033', OS.OPNN_SBMSN_SE_CD) FROM DUAL) AS OPNN_SBMSN_SE_NM + , (SELECT GET_CODE_NM('FIM033', OS.OPNN_SBMSN_SE_CD) FROM DUAL) AS OPNN_SBMSN_SE_NM , OS.OPNN_SBMSN_GIST , OS.ATCH_FILE_CNT , OS.DOC_NO , OS.NTFCTN_SE_CD - , (SELECT GET_CODE_NM('FIM030', OS.NTFCTN_SE_CD) FROM DUAL) AS NTFCTN_SE_NM + , (SELECT GET_CODE_NM('FIM030', OS.NTFCTN_SE_CD) FROM DUAL) AS NTFCTN_SE_NM , OS.PIC_RVW_OPNN , OS.OPNN_SBMSN_STTS_CD - , (SELECT GET_CODE_NM('FIM031', OS.OPNN_SBMSN_STTS_CD) FROM DUAL) AS OPNN_SBMSN_STTS_NM + , (SELECT GET_CODE_NM('FIM031', OS.OPNN_SBMSN_STTS_CD) FROM DUAL) AS OPNN_SBMSN_STTS_NM , OS.ANS_YMD , OS.ANS_TM , (CONCAT(OS.ANS_YMD, OS.ANS_TM)) AS ANS_YMD_TM 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 4a3d81c8..c372defa 100644 --- a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml +++ b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml @@ -103,7 +103,6 @@ , FYR /* 회계 연도 */ , ACNTG_SE /* 회계 구분 */ , TXITM_CD /* 세목 코드 */ - , TXITM_NM /* 세목 명 */ , LEVY_NO /* 부과 번호 */ , INSPY_SN /* 분납 순번 */ , LEVY_SE_CD /* 부과 구분 코드 */ diff --git a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml index c8b4519b..da82cc9e 100644 --- a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml @@ -598,7 +598,7 @@ , S.MDFR , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = S.MDFR) AS MDFR_NM , AS TODAY - , FN_GET_MASK_DATE(, 'K') AS TODAY_MASK + , GET_MASK_DATE(, 'K') AS TODAY_MASK , AS NOW FROM TB_SNDNG S LEFT OUTER JOIN TB_VLTN_INFO VI ON (S.VLTN_ID = VI.VLTN_ID AND S.SGG_CD = VI.SGG_CD AND S.TASK_SE_CD = VI.TASK_SE_CD) @@ -975,6 +975,18 @@ , L.FRST_DUDT_YMD , L.DUDT_YMD , GET_AFTER_YMD(L.DUDT_YMD, 1, 'MONTH', 'Y') AS AFT_DUDT_YMD + , C.FFNLG_CRDN_AMT + , L.LEVY_PCPTAX + , L.LEVY_ADAMT + , L.INSPY_INT + , L.INSPY_SE + , L.RCVMT_PCPTAX + , L.RCVMT_ADAMT + , L.RDCAMT_PCPTAX + , L.RDCAMT_ADAMT + , L.SUM_AMT + , L.LEVY_PCPTAX-L.RCVMT_PCPTAX-L.RDCAMT_PCPTAX AS PCPTAX + , L.LEVY_ADAMT-L.RCVMT_ADAMT-L.RDCAMT_ADAMT AS ADAMT , L.EPAYNO , L.BANK_NM , L.VR_ACTNO @@ -999,6 +1011,7 @@ , L.BANK_NM11 , L.VR_ACTNO11 FROM TB_SNDNG_DTL SD + INNER JOIN TB_CRDN C ON (SD.CRDN_ID = C.CRDN_ID) INNER JOIN TB_LEVY L ON (SD.LEVY_ID = L.LEVY_ID) WHERE SD.SNDNG_DTL_ID = #{sndngDtlId} @@ -1012,7 +1025,7 @@ , C.CRDN_YMD , C.CRDN_TM , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM - , FN_GET_MASK_DATETIME(C.CRDN_YMD, '-', C.CRDN_TM, ':') AS CRDN_YMD_TM_MASK + , GET_MASK_DATETIME(C.CRDN_YMD, '-', C.CRDN_TM, ':') AS CRDN_YMD_TM_MASK , C.VHRNO , C.CRDN_STDG_NM , C.CRDN_ROAD_NM diff --git a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml index 2c631975..5f13f08a 100644 --- a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml @@ -100,6 +100,8 @@ , (SELECT GET_CODE_NM('FIM006', CA.OVTIME_YN) FROM DUAL) AS OVTIME_YN_NM , CA.OVTIME_PRTTN_YN , (SELECT GET_CODE_NM('FIM006', CA.OVTIME_PRTTN_YN) FROM DUAL) AS OVTIME_PRTTN_YN_NM + , VI.TXITM_NM + , VI.OPER_ITEM_NM , P.RTPYR_ID , P.RTPYR_INPT_SE_CD , (SELECT GET_CODE_NM('FIM015', P.RTPYR_INPT_SE_CD) FROM DUAL) AS RTPYR_INPT_SE_NM @@ -145,7 +147,6 @@ , L.FYR , L.ACNTG_SE , L.TXITM_CD - , L.TXITM_NM , L.LEVY_NO , L.INSPY_SN , (CONCAT(L.FYR, '-', L.LEVY_NO)) AS GOJI_NO @@ -162,11 +163,12 @@ , L.RDCAMT_ADAMT , L.RDCAMT_PCPTAX + L.RDCAMT_ADAMT AS REDUC_AMT , L.SUM_AMT - FROM TB_CRDN C - INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) - LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) + FROM TB_CRDN C + INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) + INNER JOIN TB_VLTN_INFO VI ON (C.VLTN_ID = VI.VLTN_ID) + LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) 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_LEVY L ON (C.CRDN_ID = L.CRDN_ID AND L.DEL_YN = 'N') + LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID AND L.DEL_YN = 'N')