From 2438648471b1dcefd88c822b610806bc600dea50 Mon Sep 17 00:00:00 2001 From: jjh Date: Fri, 6 Oct 2023 17:21:12 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EA=B3=84=EA=B3=A0=EC=9E=A5=20=EB=B0=9C?= =?UTF-8?q?=EC=86=A1=20=EB=8C=80=EC=83=81=20=EC=88=98=EC=A0=95.=202.=20?= =?UTF-8?q?=EA=B3=84=EA=B3=A0=EC=9E=A5=20=EB=B0=9C=EC=86=A1=20=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/sndb/SndbQuery.java | 13 +- .../cokr/xit/fims/sndb/dao/SndngMapper.java | 28 +++ .../xit/fims/sndb/service/SndngService.java | 2 +- .../xit/fims/sndb/service/bean/SndngBean.java | 54 +++--- .../sndb/service/bean/SndngServiceBean.java | 4 +- .../xit/fims/sndb/web/Sndb01Controller.java | 10 +- .../cokr/xit/fims/task/web/DpvController.java | 6 +- .../sql/mapper/fims/sndb/sndng-mapper.xml | 182 +++++++++++++++++- .../WEB-INF/jsp/fims/sndb/sndb01020-info.jsp | 8 +- 9 files changed, 253 insertions(+), 54 deletions(-) diff --git a/src/main/java/cokr/xit/fims/sndb/SndbQuery.java b/src/main/java/cokr/xit/fims/sndb/SndbQuery.java index 6476a9ef..f5440943 100644 --- a/src/main/java/cokr/xit/fims/sndb/SndbQuery.java +++ b/src/main/java/cokr/xit/fims/sndb/SndbQuery.java @@ -1,7 +1,6 @@ package cokr.xit.fims.sndb; import cokr.xit.fims.cmmn.CmmnQuery; -import cokr.xit.fims.excl.ExclQuery; /**발송 대장 정보 조회 요청 * @@ -209,7 +208,7 @@ public class SndbQuery extends CmmnQuery { return ifEmpty(schDetailRegDtOpt, () -> null); } - public T setSchDetailRegDtOpt(String schDetailRegDtOpt) { + public T setSchDetailRegDtOpt(String schDetailRegDtOpt) { this.schDetailRegDtOpt = schDetailRegDtOpt; return self(); } @@ -218,7 +217,7 @@ public class SndbQuery extends CmmnQuery { return ifEmpty(schDetailRegDtFrom, () -> null); } - public T setSchDetailRegDtFrom(String schDetailRegDtFrom) { + public T setSchDetailRegDtFrom(String schDetailRegDtFrom) { this.schDetailRegDtFrom = schDetailRegDtFrom; return self(); } @@ -227,7 +226,7 @@ public class SndbQuery extends CmmnQuery { return ifEmpty(schDetailRegDtTo, () -> null); } - public T setSchDetailRegDtTo(String schDetailRegDtTo) { + public T setSchDetailRegDtTo(String schDetailRegDtTo) { this.schDetailRegDtTo = schDetailRegDtTo; return self(); } @@ -236,7 +235,7 @@ public class SndbQuery extends CmmnQuery { return ifEmpty(schDetailRgtrOpt, () -> null); } - public T setSchDetailRgtrOpt(String schDetailRgtrOpt) { + public T setSchDetailRgtrOpt(String schDetailRgtrOpt) { this.schDetailRgtrOpt = schDetailRgtrOpt; return self(); } @@ -245,7 +244,7 @@ public class SndbQuery extends CmmnQuery { return ifEmpty(schDetailRgtrNm, () -> null); } - public T setSchDetailRgtrNm(String schDetailRgtrNm) { + public T setSchDetailRgtrNm(String schDetailRgtrNm) { this.schDetailRgtrNm = schDetailRgtrNm; return self(); } @@ -254,7 +253,7 @@ public class SndbQuery extends CmmnQuery { return ifEmpty(schDetailRgtrCd, () -> null); } - public T setSchDetailRgtr(String schDetailRgtrCd) { + public T setSchDetailRgtr(String schDetailRgtrCd) { this.schDetailRgtrCd = schDetailRgtrCd; return self(); } diff --git a/src/main/java/cokr/xit/fims/sndb/dao/SndngMapper.java b/src/main/java/cokr/xit/fims/sndb/dao/SndngMapper.java index 48f56be8..c3d5bf2e 100644 --- a/src/main/java/cokr/xit/fims/sndb/dao/SndngMapper.java +++ b/src/main/java/cokr/xit/fims/sndb/dao/SndngMapper.java @@ -50,6 +50,34 @@ public interface SndngMapper extends AbstractMapper { List selectAdvntceSndngTrgtList(SndbQuery req); + + + /**지정한 조건에 따라 단속, 납부자, 부과 객체들을 반환한다. + * @param req 발송 대장 조회 조건 + * @return 계도장 발송 대상 객체 목록 + */ + List selectCrdnPayerTrgts(SndbQuery req); + + default DataObject selectCrdnPayerTrgtInfo(String crdnId) { + List InfoCrdnPayerTrgt = selectCrdnPayerTrgts(new SndbQuery().setCrdnId(crdnId)); + + return !InfoCrdnPayerTrgt.isEmpty() ? InfoCrdnPayerTrgt.get(0) : null; + } + + + + + + + + + + + + + + + /**지정한 조건에 따라 계도장 발송 대상 객체들을 반환한다. * @param req 발송 대장 조회 조건 * @return 계도장 발송 대상 객체 목록 diff --git a/src/main/java/cokr/xit/fims/sndb/service/SndngService.java b/src/main/java/cokr/xit/fims/sndb/service/SndngService.java index 4ead0026..61776c64 100644 --- a/src/main/java/cokr/xit/fims/sndb/service/SndngService.java +++ b/src/main/java/cokr/xit/fims/sndb/service/SndngService.java @@ -30,7 +30,7 @@ public interface SndngService { * @param req 발송 대장 조회 조건 * @return 발송 대장 객체 목록 */ - List getWrngSndngTrgtInfo(SndbQuery req); + List getWrngSndngTrgts(SndbQuery req); /**지정한 조건에 따라 사전 통보 발송 대상 목록을 조회하여 반환한다. * @param req 발송 대장 조회 조건 diff --git a/src/main/java/cokr/xit/fims/sndb/service/bean/SndngBean.java b/src/main/java/cokr/xit/fims/sndb/service/bean/SndngBean.java index 51e90b99..df3dfcf7 100644 --- a/src/main/java/cokr/xit/fims/sndb/service/bean/SndngBean.java +++ b/src/main/java/cokr/xit/fims/sndb/service/bean/SndngBean.java @@ -65,7 +65,7 @@ public class SndngBean extends AbstractComponent { * @param req 발송 대장 조회 조건 * @return 계도장 발송 대상 객체 목록 */ - public List getWrngSndngTrgtInfo(SndbQuery req) { + public List getWrngSndngTrgts(SndbQuery req) { if (req.getOrderBy() == null) { req.setOrderBy("CRDN_YMD_TM"); } @@ -178,7 +178,13 @@ public class SndngBean extends AbstractComponent { SndngDtl sndngDtl = new SndngDtl(); // 단속, 납부자 정보 조회 - DataObject infoCrdnSndngTrgt = sndngMapper.selectSndngTrgtInfo(sndng.getCrdnIDs()[iLoop]); + DataObject infoCrdnPayer = sndngMapper.selectCrdnPayerTrgtInfo(sndng.getCrdnIDs()[iLoop]); + + // 납부자 ID가 없다면 오류메세지 + if (infoCrdnPayer.string("RTPYR_ID").equals("")) { + // 예외를 발생시켜서 오류메세지를 보내고 DB Rollback + throw new RuntimeException("발송 상세 등록 작업중 납부자 정보가 확인되지 않았습니다." + "

차량번호 : " + infoCrdnPayer.string("VHRNO")); + } // 주정차 위반, 전용차로 위반 if (sndng.getTaskSeCd().equals("BPV") || sndng.getTaskSeCd().equals("PVS")) { @@ -186,20 +192,20 @@ public class SndngBean extends AbstractComponent { } else if (sndng.getTaskSeCd().equals("DPV") || sndng.getTaskSeCd().equals("ECA") || sndng.getTaskSeCd().equals("TPV")) { // 기본 데이터 셋팅 sndngDtl.setSndngId(sndng.getSndngId()); // 발송 ID - sndngDtl.setCrdnId(infoCrdnSndngTrgt.string("CRDN_ID")); // 단속 ID - sndngDtl.setLevyId(infoCrdnSndngTrgt.string("LEVY_ID")); // 부과 ID - sndngDtl.setVltnCd(infoCrdnSndngTrgt.string("VLTN_CD")); // 위반 코드 - sndngDtl.setVhrno(infoCrdnSndngTrgt.string("VHRNO")); // 차량번호 - sndngDtl.setCrdnDt(infoCrdnSndngTrgt.string("CRDN_YMD_TM_MASK")); // 단속 일시 - sndngDtl.setCrdnPlc(infoCrdnSndngTrgt.string("CRDN_PLC")); // 단속 장소 + sndngDtl.setCrdnId(infoCrdnPayer.string("CRDN_ID")); // 단속 ID + sndngDtl.setLevyId(infoCrdnPayer.string("LEVY_ID")); // 부과 ID + sndngDtl.setVltnCd(infoCrdnPayer.string("VLTN_CD")); // 위반 코드 + sndngDtl.setVhrno(infoCrdnPayer.string("VHRNO")); // 차량번호 + sndngDtl.setCrdnDt(infoCrdnPayer.string("CRDN_YMD_TM_MASK")); // 단속 일시 + sndngDtl.setCrdnPlc(infoCrdnPayer.string("CRDN_PLC")); // 단속 장소 sndngDtl.setSndngYmd(sndng.getSndngYmd()); // 발송 일자 sndngDtl.setDudtYmd(sndng.getDudtYmd()); // 납기 일자 if (sndng.getSndngSeCd().equals("10")) { // 계고장 - ffnlgAmt = infoCrdnSndngTrgt.number("FFNLG_AMT").intValue(); // 과태료 금액 - levyPcptax = infoCrdnSndngTrgt.number("FFNLG_AMT").intValue(); // 부과 본세 + ffnlgAmt = infoCrdnPayer.number("FFNLG_AMT").intValue(); // 과태료 금액 + levyPcptax = infoCrdnPayer.number("FFNLG_AMT").intValue(); // 부과 본세 levyAdamt = 0; // 부과 가산금 - levySumAmt = infoCrdnSndngTrgt.number("FFNLG_AMT").intValue(); // 부과 합계 금액 + levySumAmt = infoCrdnPayer.number("FFNLG_AMT").intValue(); // 부과 합계 금액 } else { ffnlgAmt = 0; // 과태료 금액 levyPcptax = 0; // 부과 본세 @@ -211,11 +217,11 @@ public class SndngBean extends AbstractComponent { sndngDtl.setLevyPcptax(levyPcptax); // 부과 본세 sndngDtl.setLevyAdamt(levyAdamt); // 부과 가산금 sndngDtl.setLevySumAmt(levySumAmt); // 부과 합계 금액 - sndngDtl.setRtpyrNm(infoCrdnSndngTrgt.string("RTPYR_NM")); // 납부자 명 - sndngDtl.setRtpyrNo(infoCrdnSndngTrgt.string("RTPYR_NO")); // 납부자 번호 - sndngDtl.setRtpyrAddr(infoCrdnSndngTrgt.string("ADDR")); // 납부자 주소 - sndngDtl.setRtpyrDtlAddr(infoCrdnSndngTrgt.string("DTL_ADDR")); // 납부자 상세 주소 - sndngDtl.setRtpyrZip(infoCrdnSndngTrgt.string("ZIP")); // 납부자 우편번호 + sndngDtl.setRtpyrNm(infoCrdnPayer.string("RTPYR_NM")); // 납부자 명 + sndngDtl.setRtpyrNo(infoCrdnPayer.string("RTPYR_NO")); // 납부자 번호 + sndngDtl.setRtpyrAddr(infoCrdnPayer.string("ADDR")); // 납부자 주소 + sndngDtl.setRtpyrDtlAddr(infoCrdnPayer.string("DTL_ADDR")); // 납부자 상세 주소 + sndngDtl.setRtpyrZip(infoCrdnPayer.string("ZIP")); // 납부자 우편번호 sndngDtl.setSndngDtlSttsCd("00"); // 발송 상세 상태 코드 - 00 처리전 sndngDtl.setDelYn("N"); // 삭제 여부 } else { @@ -232,9 +238,9 @@ public class SndngBean extends AbstractComponent { // 단속상태이력(TB_CRDN_STTS_HSTRY) CrdnSttsHstry crdnSttsHstry = new CrdnSttsHstry(); - crdnSttsHstry.setCrdnId(infoCrdnSndngTrgt.string("CRDN_ID")); - crdnSttsHstry.setBfrSttsCd(infoCrdnSndngTrgt.string("CRDN_STTS_CD")); - crdnSttsHstry.setBfrSttsChgDt(infoCrdnSndngTrgt.string("CRDN_STTS_CHG_DT")); + crdnSttsHstry.setCrdnId(infoCrdnPayer.string("CRDN_ID")); + crdnSttsHstry.setBfrSttsCd(infoCrdnPayer.string("CRDN_STTS_CD")); + crdnSttsHstry.setBfrSttsChgDt(infoCrdnPayer.string("CRDN_STTS_CHG_DT")); crdnSttsHstry.setCrdnSttsCd(newCrdnSttsCd); crdnSttsHstry.setTaskDtlId(sndngDtl.getSndngDtlId()); @@ -255,15 +261,15 @@ public class SndngBean extends AbstractComponent { // 기존에 등록된 자료가 있다면 삭제 처리 if (infoEnisMtchg != null) { - enisMtchg.setCrdnId(infoCrdnSndngTrgt.string("CRDN_ID")); + enisMtchg.setCrdnId(infoCrdnPayer.string("CRDN_ID")); enisMtchgBean.removeEnisMtchg(enisMtchg); } - enisMtchg.setCrdnId(infoCrdnSndngTrgt.string("CRDN_ID")); - enisMtchg.setCrdnDt(infoCrdnSndngTrgt.string("CRDN_YMD_TM_MASK")); - enisMtchg.setStdgNm(infoCrdnSndngTrgt.string("CRDN_STDG_NM")); - enisMtchg.setCrdnPlc(infoCrdnSndngTrgt.string("CRDN_PLC")); + enisMtchg.setCrdnId(infoCrdnPayer.string("CRDN_ID")); + enisMtchg.setCrdnDt(infoCrdnPayer.string("CRDN_YMD_TM_MASK")); + enisMtchg.setStdgNm(infoCrdnPayer.string("CRDN_STDG_NM")); + enisMtchg.setCrdnPlc(infoCrdnPayer.string("CRDN_PLC")); enisMtchg.setLevyAmt(levyPcptax); // 부과 금액 enisMtchg.setAdtnAmt(levyAdamt); // 가산 금액 enisMtchg.setSumAmt(levySumAmt); // 합계 금액 diff --git a/src/main/java/cokr/xit/fims/sndb/service/bean/SndngServiceBean.java b/src/main/java/cokr/xit/fims/sndb/service/bean/SndngServiceBean.java index 8352edb7..fafb7397 100644 --- a/src/main/java/cokr/xit/fims/sndb/service/bean/SndngServiceBean.java +++ b/src/main/java/cokr/xit/fims/sndb/service/bean/SndngServiceBean.java @@ -37,8 +37,8 @@ public class SndngServiceBean extends AbstractServiceBean implements SndngServic } @Override - public List getWrngSndngTrgtInfo(SndbQuery req) { - return sndngBean.getWrngSndngTrgtInfo(req); + public List getWrngSndngTrgts(SndbQuery req) { + return sndngBean.getWrngSndngTrgts(req); } @Override 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 0d986371..3ecb72d9 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -31,7 +31,7 @@ public class Sndb01Controller extends ApplicationController { public static final String warningSendingTargetMain = "/010/main.do" // 계도장 발송 대상 메인 화면 , getWrngSndngTrgtList = "/010/list.do" // 계도장 발송 대상 목록 조회 - , getWrngSndngTrgtInfo = "/020/info.do" // 발송 대상 조회 + , getWrngSndngTrgts = "/020/info.do" // 계도장 발송 대상 조회 , warningSendingMain = "/030/main.do" // 계도장 발송 현황 메인 화면 , getWrngSndngList = "/030/list.do" // 계도장 발송 현황 목록 조회 , getSndngDltInfo = "/040/info.do" // 발송 상세 대장 조회 @@ -92,8 +92,8 @@ public class Sndb01Controller extends ApplicationController { * "wrngSndngTrgts": [계도장 발송 대상 목록] * } */ - public ModelAndView getWrngSndngTrgtInfo(SndbQuery req) { - List wrngSndngTrgtInfo = sndngService.getWrngSndngTrgtInfo(req); + public ModelAndView getWrngSndngTrgts(SndbQuery req) { + List wrngSndngTrgts = sndngService.getWrngSndngTrgts(req); boolean json = jsonResponse(); @@ -101,8 +101,8 @@ public class Sndb01Controller extends ApplicationController { return mav .addObject("pageName", "sndb01020") - .addObject("sndngSeCd", req.getSndngSeCd()) // 발송 구분 코드 - .addObject("wrngSndngTrgtInfo", json ? wrngSndngTrgtInfo : toJson(wrngSndngTrgtInfo)) // 계도장 발송 대상 정보 + .addObject("sndngSeCd", req.getSndngSeCd()) // 발송 구분 코드 + .addObject("wrngSndngTrgts", json ? wrngSndngTrgts : toJson(wrngSndngTrgts)) // 계도장 발송 대상 정보 ; } diff --git a/src/main/java/cokr/xit/fims/task/web/DpvController.java b/src/main/java/cokr/xit/fims/task/web/DpvController.java index a2b53c1e..e01880e6 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -505,9 +505,9 @@ public class DpvController { } @Override - @RequestMapping(name="장애인과태료업무 계고장 발송 대상 등록", value=METHOD_URL.getWrngSndngTrgtInfo) - public ModelAndView getWrngSndngTrgtInfo(SndbQuery req) { - return super.getWrngSndngTrgtInfo(req); + @RequestMapping(name="장애인과태료업무 계고장 발송 대상 등록", value=METHOD_URL.getWrngSndngTrgts) + public ModelAndView getWrngSndngTrgts(SndbQuery req) { + return super.getWrngSndngTrgts(req); } @Override 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 ac8170ad..7da90459 100644 --- a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml @@ -110,9 +110,6 @@ - SELECT COUNT(*) OVER() AS TNOCS - , SUM(C.FFNLG_AMT) OVER() AS GRAMT - , C.CRDN_ID , C.SGG_CD , C.TASK_SE_CD , C.CRDN_REG_SE_CD @@ -122,7 +119,6 @@ , 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 , C.VHRNO , C.CRDN_STDG_NM , C.CRDN_ROAD_NM @@ -185,6 +181,7 @@ - /* 사전통지 발송 대상 목록 조회(sndngMapper.selectAdvntceSndngTrgtList) */ + + SELECT C.CRDN_ID + WHERE C.SGG_CD = #{sggCd} AND C.TASK_SE_CD = #{taskSeCd} AND C.CRDN_STTS_CD = #{crdnSttsCd} + AND (CC.CVLCPT_PRCS_CD ]]> '00' OR CC.CVLCPT_PRCS_CD IS NULL) AND C.CRDN_YMD = ]]> #{schCrdnYmdFrom} @@ -517,6 +522,167 @@ + + + + SELECT C.CRDN_ID + , C.SGG_CD + , C.TASK_SE_CD + , C.CRDN_INPT_SE_CD + , (SELECT FN_GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) FROM DUAL) AS CRDN_INPT_SE_NM + , 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 + , C.VHRNO + , C.CRDN_STDG_NM + , C.CRDN_ROAD_NM + , C.CRDN_PLC + , C.FFNLG_AMT + , C.ADVNTCE_AMT + , C.CRDN_STTS_CD + , (SELECT FN_GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM + , C.CRDN_STTS_CHG_DT + , C.REG_DT + , C.RGTR + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.RGTR) AS RGTR_NM + , C.MDFCN_DT + , C.MDFR + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.MDFR) AS MDFR_NM + , CA.CRDN_SE_CD + , (SELECT FN_GET_CODE_NM('FIM002', CA.CRDN_SE_CD) FROM DUAL) AS CRDN_SE_NM + , CA.CRDN_SPAREA_CD + , (SELECT FN_GET_CODE_NM('FIM007', CA.CRDN_SPAREA_CD) FROM DUAL) AS CRDN_SPAREA_NM + , CA.PARKNG_PSBLTY_RSLT_CD + , (SELECT FN_GET_CODE_NM('FIM034', CA.PARKNG_PSBLTY_RSLT_CD) FROM DUAL) AS PARKNG_PSBLTY_RSLT_NM + , VI.VLTN_ID + , VI.VLTN_CD + , VI.VLTN_ARTCL + , CC.CVLCPT_LINK_ID + , CC.CVLCPT_RCPT_YMD + , CC.CVLCPT_APLY_NO + , CC.CVLCPT_RCPT_NO + , CC.CVLCPT_PRCS_SUMRY + , CC.CVLCPT_PRCS_CD + , CC.CVLCPT_PRCS_CMPTN_DT + , CC.CVLCPT_TRSM_CD + , CC.CVLCPT_TRSM_DT + , P.RTPYR_ID + , P.RTPYR_NO + , P.RTPYR_NM + , P.RTPYR_BRDT + , P.ZIP + , L.INST_CD + , L.DEPT_CD + , L.FYR + , L.ACNTG_SE + , L.TXITM_CD + , L.TXITM_NM + , L.LEVY_NO + , L.INSPY_SN + , L.LEVY_YMD + , L.DUDT_YMD + , L.FFNLG_AMT + , L.LEVY_PCPTAX + , L.LEVY_ADAMT + , L.INSPY_INT + , L.RCVMT_PCPTAX + , L.RCVMT_ADAMT + , L.RDCAMT_PCPTAX + , L.RDCAMT_ADAMT + , L.SUM_AMT + , L.TXTN_THING + , L.MNG_ARTCL1 + , L.MNG_ARTCL2 + , L.MNG_ARTCL3 + , L.MNG_ARTCL4 + , L.MNG_ARTCL5 + , L.MNG_ARTCL6 + , L.EPAYNO + , L.BANK_NM + , L.VR_ACTNO + , L.BANK_NM2 + , L.VR_ACTNO2 + , L.BANK_NM3 + , L.VR_ACTNO3 + , L.BANK_NM4 + , L.VR_ACTNO4 + , L.BANK_NM5 + , L.VR_ACTNO5 + , L.BANK_NM6 + , L.VR_ACTNO6 + , L.BANK_NM7 + , L.VR_ACTNO7 + , L.BANK_NM8 + , L.VR_ACTNO8 + , L.BANK_NM9 + , L.VR_ACTNO9 + , L.BANK_NM10 + , L.VR_ACTNO10 + , L.BANK_NM11 + , L.VR_ACTNO11 + 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_LEVY L ON (C.CRDN_ID = L.CRDN_ID AND L.DEL_YN = 'N') + 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') + + + + + + + + + + + @@ -645,7 +811,7 @@ #{sndngId} ) - + AND S.SNDNG_ID = #{sndngId} diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp index 2f23d605..92c651a1 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp @@ -166,10 +166,10 @@ * DatasetControl **************************************************************************/ var ${pageName}Control = new DatasetControl({ - prefix : "wrngSndngTrgtInfo" + prefix : "wrngSndngTrgt" , prefixName : "계고장 발송 대상" , keymapper : info => info ? info.CRDN_ID : "" - , dataGetter : obj => obj.wrngSndngTrgtInfoList + , dataGetter : obj => obj.wrngSndngTrgtsList , appendData : true , tableRenderComplete : false // dataTables 에 자료 추가 완료 여부 , urls : { @@ -341,7 +341,7 @@ if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; dialog.alert({ - content : "현재 " + ${pageName}Control.prefixName + " 정보를 저장하시겠습니까?" + content : ${pageName}Control.prefixName + " 정보를 저장하시겠습니까?" , onOK : () => { ${pageName}Control.save(${pageName}Fields.get()); } @@ -362,7 +362,7 @@ fn_securityModeToggle($("#securityMode--top").is(":checked")); // Dataset 셋팅 - 화면이 열리면서 조회하는 경우 addData 하여 자료를 추가 - ${pageName}Control.addData(${wrngSndngTrgtInfo}); + ${pageName}Control.addData(${wrngSndngTrgts}); $("#sndngSeCd--${pageName}").val("${sndngSeCd}"); // 발송 구분 코드 $("#sggCd--${pageName}").val(${pageName}Control.dataset.getValue("SGG_CD")); // 시군구 코드