From 470d282fc2bd0cf602228992c8fddedb4a9aeeb2 Mon Sep 17 00:00:00 2001 From: jjh Date: Wed, 8 May 2024 13:47:39 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EC=82=AC=EC=9A=A9=20=EC=97=AC=EB=B6=80=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.=20=20=20(useYN=20=20->=20=20useYn)=202.=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EC=97=AC=EB=B6=80=20=EC=88=98=EC=A0=95.?= =?UTF-8?q?=20=20=20(delYN=20=20->=20=20delYn)=203.=20=EC=B0=A8=EC=84=B8?= =?UTF-8?q?=EB=8C=80=20=EC=84=B8=EC=99=B8=EC=88=98=EC=9E=85=20=EC=97=B0?= =?UTF-8?q?=EA=B3=84=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/cmmn/CmmnQuery.java | 20 +- .../fims/cmmn/dao/CrdnSttsHstryMapper.java | 4 +- .../cmmn/service/bean/CrdnSttsHstryBean.java | 4 +- .../xit/fims/cmmn/service/bean/StngBean.java | 4 +- .../java/cokr/xit/fims/crdn/CrdnQuery.java | 10 - .../xit/fims/crdn/web/Crdn02Controller.java | 2 - .../xit/fims/crdn/web/Crdn03Controller.java | 2 - .../xit/fims/cvlc/web/Cvlc03Controller.java | 2 - .../xit/fims/epst/dao/EpostGdccMapper.java | 11 +- .../xit/fims/epst/dao/EpostRcptRegMapper.java | 7 +- .../fims/epst/service/bean/EpostGdccBean.java | 12 +- .../epst/service/bean/EpostRcptDtlBean.java | 8 +- .../epst/service/bean/EpostRcptRegBean.java | 16 +- .../epst/service/bean/EpostRcptRsltBean.java | 8 +- .../xit/fims/epst/web/Epst02Controller.java | 8 - .../java/cokr/xit/fims/excl/CrdnReReg.java | 2 +- .../java/cokr/xit/fims/excl/LevyExcl.java | 2 +- .../java/cokr/xit/fims/excl/OpnnSbmsn.java | 2 +- .../xit/fims/excl/dao/LevyExclMapper.java | 4 +- .../xit/fims/excl/dao/OpnnSbmsnMapper.java | 4 +- .../fims/excl/service/bean/CrdnReRegBean.java | 8 +- .../fims/excl/service/bean/LevyExclBean.java | 18 +- .../fims/excl/service/bean/OpnnSbmsnBean.java | 14 +- .../xit/fims/excl/web/Excl02Controller.java | 1 - .../xit/fims/excl/web/Excl03Controller.java | 1 - src/main/java/cokr/xit/fims/levy/Levy.java | 2 +- .../java/cokr/xit/fims/levy/LevyQuery.java | 17 - src/main/java/cokr/xit/fims/levy/Rduct.java | 2 +- .../cokr/xit/fims/levy/dao/LevyMapper.java | 3 - .../xit/fims/levy/service/bean/LevyBean.java | 12 +- .../xit/fims/levy/service/bean/RductBean.java | 6 +- .../xit/fims/levy/web/Levy01Controller.java | 2 - .../xit/fims/levy/web/Levy02Controller.java | 1 - src/main/java/cokr/xit/fims/mngt/Vltn.java | 2 +- .../cokr/xit/fims/mngt/dao/FactionMapper.java | 4 +- .../cokr/xit/fims/mngt/dao/TaskMapper.java | 4 +- .../cokr/xit/fims/nxrp/NisIndivQuery.java | 63 +- .../cokr/xit/fims/nxrp/NxrpMtchgQuery.java | 10 +- .../xit/fims/nxrp/dao/NxrpMtchgMapper.java | 4 +- .../fims/nxrp/service/NisIndivService.java | 18 - .../fims/nxrp/service/bean/NisIndivBean.java | 789 ++++++------------ .../service/bean/NisIndivServiceBean.java | 10 - .../fims/nxrp/service/bean/NxrpMtchgBean.java | 4 +- .../xit/fims/nxrp/web/Nxrp01Controller.java | 48 -- .../xit/fims/rcvm/service/bean/RcvmtBean.java | 10 +- .../rcvm/service/bean/RcvmtServiceBean.java | 4 +- .../xit/fims/rcvm/web/Rcvm01Controller.java | 1 - src/main/java/cokr/xit/fims/rdca/Rdcamt.java | 2 +- .../cokr/xit/fims/rdca/dao/RdcamtMapper.java | 4 +- .../fims/rdca/service/bean/RdcamtBean.java | 8 +- .../xit/fims/rdca/web/Rdca01Controller.java | 1 - .../java/cokr/xit/fims/sndb/SndbQuery.java | 10 +- src/main/java/cokr/xit/fims/sndb/Sndng.java | 4 +- .../java/cokr/xit/fims/sndb/SndngDtl.java | 2 +- src/main/java/cokr/xit/fims/sndb/Svbtc.java | 2 +- .../xit/fims/sndb/dao/SndngDtlMapper.java | 8 +- .../cokr/xit/fims/sndb/dao/SndngMapper.java | 8 +- .../cokr/xit/fims/sndb/dao/SvbtcMapper.java | 6 +- .../fims/sndb/service/SndngDtlService.java | 14 +- .../xit/fims/sndb/service/bean/SndngBean.java | 51 +- .../fims/sndb/service/bean/SndngDtlBean.java | 234 +++++- .../service/bean/SndngDtlServiceBean.java | 32 +- .../xit/fims/sndb/service/bean/SvbtcBean.java | 8 +- .../xit/fims/sndb/web/Sndb01Controller.java | 54 +- .../java/cokr/xit/fims/sprt/CvlcptDscsn.java | 2 +- .../cokr/xit/fims/sprt/CvlcptDscsnQuery.java | 30 - .../xit/fims/sprt/web/Sprt01Controller.java | 9 +- .../xit/fims/sprt/web/Sprt02Controller.java | 14 +- .../xit/fims/sprt/web/Sprt04Controller.java | 2 - .../stat/service/bean/StatServiceBean.java | 3 +- .../mapper/fims/cmmn/crdnSttsHstry-mapper.xml | 14 +- .../sql/mapper/fims/epst/epostGdcc-mapper.xml | 10 +- .../mapper/fims/epst/epostRcptDtl-mapper.xml | 10 +- .../mapper/fims/epst/epostRcptReg-mapper.xml | 10 +- .../sql/mapper/fims/excl/crdnReReg-mapper.xml | 10 +- .../sql/mapper/fims/excl/levyExcl-mapper.xml | 10 +- .../sql/mapper/fims/excl/opnnSbmsn-mapper.xml | 10 +- .../sql/mapper/fims/levy/levy-mapper.xml | 10 +- .../sql/mapper/fims/levy/rduct-mapper.xml | 10 +- .../sql/mapper/fims/mngt/faction-mapper.xml | 6 +- .../sql/mapper/fims/mngt/task-mapper.xml | 2 +- .../sql/mapper/fims/mngt/vltn-mapper.xml | 12 +- .../sql/mapper/fims/nxrp/nxrpMtchg-mapper.xml | 6 +- .../sql/mapper/fims/rcvm/rcvmt-mapper.xml | 10 +- .../sql/mapper/fims/rdca/rdcamt-mapper.xml | 2 +- .../sql/mapper/fims/sndb/sndng-mapper.xml | 18 +- .../sql/mapper/fims/sndb/sndngDtl-mapper.xml | 21 +- .../sql/mapper/fims/sndb/svbtc-mapper.xml | 14 +- .../mapper/fims/sprt/cvlcptDscsn-mapper.xml | 6 +- .../WEB-INF/jsp/fims/epst/epst02010-main.jsp | 2 +- .../WEB-INF/jsp/fims/epst/epst02030-main.jsp | 2 +- .../WEB-INF/jsp/fims/excl/excl01010-main.jsp | 4 +- .../WEB-INF/jsp/fims/excl/excl02010-main.jsp | 6 +- .../WEB-INF/jsp/fims/excl/excl03010-main.jsp | 2 +- .../WEB-INF/jsp/fims/levy/levy01010-main.jsp | 6 +- .../WEB-INF/jsp/fims/levy/levy01050-main.jsp | 2 +- .../WEB-INF/jsp/fims/levy/levy02010-main.jsp | 4 +- .../WEB-INF/jsp/fims/mngt/mngt03010-main.jsp | 168 ++-- .../WEB-INF/jsp/fims/rcvm/rcvm01010-main.jsp | 4 +- .../WEB-INF/jsp/fims/rdca/rdca01010-main.jsp | 2 +- .../WEB-INF/jsp/fims/sndb/sndb01010-main.jsp | 14 +- .../WEB-INF/jsp/fims/sndb/sndb01030-main.jsp | 2 +- .../WEB-INF/jsp/fims/sndb/sndb01050-main.jsp | 10 +- .../WEB-INF/jsp/fims/sndb/sndb01070-main.jsp | 2 +- .../WEB-INF/jsp/fims/sndb/sndb01080-info.jsp | 37 +- .../WEB-INF/jsp/fims/sndb/sndb01090-main.jsp | 2 +- .../WEB-INF/jsp/fims/sndb/sndb01220-main.jsp | 2 +- .../WEB-INF/jsp/fims/sndb/sndb01240-main.jsp | 8 +- .../WEB-INF/jsp/fims/sprt/sprt02010-main.jsp | 18 +- .../WEB-INF/jsp/fims/sprt/sprt02020-info.jsp | 6 +- .../WEB-INF/jsp/fims/sprt/sprt02030-info.jsp | 2 +- .../WEB-INF/jsp/fims/sprt/sprt02040-info.jsp | 6 +- .../WEB-INF/jsp/fims/sprt/sprt02050-info.jsp | 12 +- .../WEB-INF/jsp/fims/sprt/sprt02060-info.jsp | 4 +- .../WEB-INF/jsp/fims/sprt/sprt02070-info.jsp | 6 +- .../WEB-INF/jsp/fims/sprt/sprt02080-info.jsp | 4 +- .../WEB-INF/jsp/fims/sprt/sprt04010-main.jsp | 4 +- 117 files changed, 1028 insertions(+), 1202 deletions(-) diff --git a/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java b/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java index e9ab5c18..761721e4 100644 --- a/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java +++ b/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java @@ -18,8 +18,8 @@ public class CmmnQuery extends QueryRequest { private String sggCd; // 시군구 코드 private String deptCd; // 부서 코드 private String instCd; // 기관 코드 - private String useYN; // 사용 여부 - private String delYN; // 삭제 여부 + private String useYn; // 사용 여부 + private String delYn; // 삭제 여부 private String schDateOpt; // 검색 일자 구분 private String schDateFrom; // 검색 일자 시작 @@ -112,21 +112,21 @@ public class CmmnQuery extends QueryRequest { return self(); } - public String getUseYN() { - return ifEmpty(useYN, () -> null); + public String getUseYn() { + return ifEmpty(useYn, () -> null); } - public T setUseYN(String useYN) { - this.useYN = useYN; + public T setUseYn(String useYn) { + this.useYn = useYn; return self(); } - public String getDelYN() { - return ifEmpty(delYN, () -> null); + public String getDelYn() { + return ifEmpty(delYn, () -> null); } - public T setDelYN(String delYN) { - this.delYN = delYN; + public T setDelYn(String delYn) { + this.delYn = delYn; return self(); } diff --git a/src/main/java/cokr/xit/fims/cmmn/dao/CrdnSttsHstryMapper.java b/src/main/java/cokr/xit/fims/cmmn/dao/CrdnSttsHstryMapper.java index 6d7cb080..ec863e6a 100644 --- a/src/main/java/cokr/xit/fims/cmmn/dao/CrdnSttsHstryMapper.java +++ b/src/main/java/cokr/xit/fims/cmmn/dao/CrdnSttsHstryMapper.java @@ -38,12 +38,12 @@ public interface CrdnSttsHstryMapper extends AbstractMapper { * @param crdnId 단속 ID * @return 지정한 단속 ID의 단속 상태 이력 객체 */ - default DataObject selectCrdnSttsHstryInfo(String crdnId, String crdnSttsCd, String useYN) { + default DataObject selectCrdnSttsHstryInfo(String crdnId, String crdnSttsCd, String useYn) { CrdnSttsHstryQuery req = new CrdnSttsHstryQuery(); req.setCrdnId(crdnId); req.setCrdnSttsCd(crdnSttsCd); - req.setUseYN(useYN); + req.setUseYn(useYn); req.setOrderBy("STTS_HSTRY_ID DESC"); List crdnSttsHstrys = selectCrdnSttsHstrys(req); diff --git a/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnSttsHstryBean.java b/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnSttsHstryBean.java index 0c9c769a..0dac023a 100644 --- a/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnSttsHstryBean.java +++ b/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnSttsHstryBean.java @@ -51,8 +51,8 @@ public class CrdnSttsHstryBean extends AbstractComponent { * @param crdnId 단속 ID * @return 단속 상태 이력 객체 목록 */ - public DataObject getCrdnSttsHstryInfo(String crdnId, String crdnSttsCd, String useYN) { - return crdnSttsHstryMapper.selectCrdnSttsHstryInfo(crdnId, crdnSttsCd, useYN); + public DataObject getCrdnSttsHstryInfo(String crdnId, String crdnSttsCd, String useYn) { + return crdnSttsHstryMapper.selectCrdnSttsHstryInfo(crdnId, crdnSttsCd, useYn); } /**단속 상태 이력 정보를 등록한다. diff --git a/src/main/java/cokr/xit/fims/cmmn/service/bean/StngBean.java b/src/main/java/cokr/xit/fims/cmmn/service/bean/StngBean.java index 31d01407..96663446 100644 --- a/src/main/java/cokr/xit/fims/cmmn/service/bean/StngBean.java +++ b/src/main/java/cokr/xit/fims/cmmn/service/bean/StngBean.java @@ -102,7 +102,7 @@ public class StngBean extends AbstractComponent { factionBean.initUserInfo(userInfo); } - availableTaskList = taskBean.getTasks((new CmmnQuery()).setSggCd((String)userInfo.getInfo().get("sggCd")).setUseYN("Y")) + availableTaskList = taskBean.getTasks((new CmmnQuery()).setSggCd((String)userInfo.getInfo().get("sggCd")).setUseYn("Y")) .stream().map(item -> item.string("TASK_SE_CD")).toList(); } else { //일반사용자 @@ -185,7 +185,7 @@ public class StngBean extends AbstractComponent { factionBean.initUserInfo(userInfo); } - List taskSeCdListForSgg = taskBean.getTasks((new CmmnQuery()).setSggCd((String)userInfo.getInfo().get("sggCd")).setUseYN("Y")) + List taskSeCdListForSgg = taskBean.getTasks((new CmmnQuery()).setSggCd((String)userInfo.getInfo().get("sggCd")).setUseYn("Y")) .stream().map(item -> item.string("TASK_SE_CD")).toList(); taskListForSgg = taskSectionCodes.stream() diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index a81bf30c..e5cbd2ab 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -66,7 +66,6 @@ public class CrdnQuery extends CmmnQuery { //YN private String dstrbncYn; private String towngYn; - private String delYn; //기타 private String vhrno; @@ -154,15 +153,6 @@ public class CrdnQuery extends CmmnQuery { return self(); } - public String getDelYn() { - return ifEmpty(delYn, () -> null); - } - - public T setDelYn(String delYn) { - this.delYn = delYn; - return self(); - } - public String getVhrno() { return ifEmpty(vhrno, () -> null); } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java index 4106189e..166e3098 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java @@ -113,9 +113,7 @@ public class Crdn02Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); - CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); List list = crdnService.getCrackdownList(query.setFetchSize(0)); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java index 0e517772..356ca5a3 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java @@ -95,9 +95,7 @@ public class Crdn03Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); - CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); List list = crdnService.getCrackdownList(query.setFetchSize(0)); diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java index f7bacd32..38088e27 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java @@ -97,8 +97,6 @@ public class Cvlc03Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); - CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); diff --git a/src/main/java/cokr/xit/fims/epst/dao/EpostGdccMapper.java b/src/main/java/cokr/xit/fims/epst/dao/EpostGdccMapper.java index 18871094..4221a67f 100644 --- a/src/main/java/cokr/xit/fims/epst/dao/EpostGdccMapper.java +++ b/src/main/java/cokr/xit/fims/epst/dao/EpostGdccMapper.java @@ -37,14 +37,15 @@ public interface EpostGdccMapper extends AbstractMapper { List selectEpostGdccs(EpostQuery req); /**지정한 조건에 따라 부과제외 대장 객체의 마지막 1개를 반환한다. - * @param levyExclId 부과제외 ID - * @return 부과제외 대장 객체 + * @param req 전자우편 안내문 조회 조건 + * @return 전자우편 안내문 객체 */ default DataObject selectEpostGdccInfo(EpostQuery req) { - // 기본 정렬 - if (req.getUseYN() == null) { - req.setUseYN("Y"); + // 사용 여부 + if (req.getUseYn() == null) { + req.setUseYn("Y"); } + // 기본 정렬 if (req.getOrderBy() == null) { req.setOrderBy("EG.GDCC_ID DESC"); } diff --git a/src/main/java/cokr/xit/fims/epst/dao/EpostRcptRegMapper.java b/src/main/java/cokr/xit/fims/epst/dao/EpostRcptRegMapper.java index 93db74b7..ccf3f7a1 100644 --- a/src/main/java/cokr/xit/fims/epst/dao/EpostRcptRegMapper.java +++ b/src/main/java/cokr/xit/fims/epst/dao/EpostRcptRegMapper.java @@ -41,10 +41,11 @@ public interface EpostRcptRegMapper extends AbstractMapper { * @return 부과제외 대장 객체 */ default DataObject selectEpostRcptRegInfo(EpostQuery req) { - // 기본 정렬 - if (req.getUseYN() == null) { - req.setUseYN("Y"); + // 사용 여부 + if (req.getUseYn() == null) { + req.setUseYn("Y"); } + // 기본 정렬 if (req.getOrderBy() == null) { req.setOrderBy("ERR.CON_KEY DESC"); } diff --git a/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccBean.java b/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccBean.java index 6c4e5041..163465ff 100644 --- a/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccBean.java +++ b/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccBean.java @@ -36,12 +36,12 @@ public class EpostGdccBean extends AbstractComponent { */ public List getEpostGdccList(EpostQuery req) { // 사용 여부 확인 - if (req.getUseYN() == null) { - req.setUseYN("Y"); + if (req.getUseYn() == null) { + req.setUseYn("Y"); } // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { @@ -61,8 +61,8 @@ public class EpostGdccBean extends AbstractComponent { */ public List getEpostGdccs(EpostQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } if (req.getOrderBy() == null) { req.setOrderBy("EG.GDCC_ID DESC"); diff --git a/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptDtlBean.java b/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptDtlBean.java index 9c24aca6..8b3b78c4 100644 --- a/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptDtlBean.java +++ b/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptDtlBean.java @@ -36,12 +36,12 @@ public class EpostRcptDtlBean extends AbstractComponent { */ public List getEpostRcptDtlList(EpostQuery req) { // 사용 여부 확인 - if (req.getUseYN() == null) { - req.setUseYN("Y"); + if (req.getUseYn() == null) { + req.setUseYn("Y"); } // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { diff --git a/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRegBean.java b/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRegBean.java index 73edde5d..aac402b6 100644 --- a/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRegBean.java +++ b/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRegBean.java @@ -42,12 +42,12 @@ public class EpostRcptRegBean extends AbstractComponent { */ public List getEpostRcptRegList(EpostQuery req) { // 사용 여부 확인 - if (req.getUseYN() == null) { - req.setUseYN("Y"); + if (req.getUseYn() == null) { + req.setUseYn("Y"); } // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { @@ -67,8 +67,8 @@ public class EpostRcptRegBean extends AbstractComponent { */ public List getEpostRcptRegs(EpostQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } if (req.getOrderBy() == null) { req.setOrderBy("ERR.CON_KEY DESC"); @@ -99,8 +99,8 @@ public class EpostRcptRegBean extends AbstractComponent { */ List getEpostRcptRegDtlList(EpostQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { diff --git a/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRsltBean.java b/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRsltBean.java index 4855446e..a8ed4fc2 100644 --- a/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRsltBean.java +++ b/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRsltBean.java @@ -36,12 +36,12 @@ public class EpostRcptRsltBean extends AbstractComponent { */ public List getEpostRcptRsltList(EpostQuery req) { // 사용 여부 확인 - if (req.getUseYN() == null) { - req.setUseYN("Y"); + if (req.getUseYn() == null) { + req.setUseYn("Y"); } // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { diff --git a/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java b/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java index 0f4a1bfb..f329630c 100644 --- a/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java +++ b/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java @@ -139,9 +139,6 @@ public class Epst02Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); - CellStyle numeric = format.n_nn0(); - CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); List list = epostGdccService.getEpostGdccList(req.setFetchSize(0)); @@ -329,7 +326,6 @@ public class Epst02Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); @@ -410,9 +406,6 @@ public class Epst02Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); - CellStyle numeric = format.n_nn0(); - CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); List list = epostRcptRegService.getEpostRcptRegDtlList(req.setFetchSize(0)); @@ -557,7 +550,6 @@ public class Epst02Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); diff --git a/src/main/java/cokr/xit/fims/excl/CrdnReReg.java b/src/main/java/cokr/xit/fims/excl/CrdnReReg.java index 11863269..e9c86962 100644 --- a/src/main/java/cokr/xit/fims/excl/CrdnReReg.java +++ b/src/main/java/cokr/xit/fims/excl/CrdnReReg.java @@ -47,7 +47,7 @@ public class CrdnReReg extends AbstractEntity { /** * 삭제 여부 */ - private String delYN; + private String delYn; /** * 삭제 사유 diff --git a/src/main/java/cokr/xit/fims/excl/LevyExcl.java b/src/main/java/cokr/xit/fims/excl/LevyExcl.java index c3d45382..3f4789d2 100644 --- a/src/main/java/cokr/xit/fims/excl/LevyExcl.java +++ b/src/main/java/cokr/xit/fims/excl/LevyExcl.java @@ -45,7 +45,7 @@ public class LevyExcl extends AbstractEntity { /** * 삭제 여부 */ - private String delYN; + private String delYn; /** * 삭제 사유 diff --git a/src/main/java/cokr/xit/fims/excl/OpnnSbmsn.java b/src/main/java/cokr/xit/fims/excl/OpnnSbmsn.java index 19cf3fde..998a7c22 100644 --- a/src/main/java/cokr/xit/fims/excl/OpnnSbmsn.java +++ b/src/main/java/cokr/xit/fims/excl/OpnnSbmsn.java @@ -157,7 +157,7 @@ public class OpnnSbmsn extends AbstractEntity { /** * 삭제 여부 */ - private String delYN; + private String delYn; /** * 삭제 사유 diff --git a/src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java b/src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java index a2a113c1..9cacdb1a 100644 --- a/src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java +++ b/src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java @@ -44,8 +44,8 @@ public interface LevyExclMapper extends AbstractMapper { */ default DataObject selectLevyExclInfo(LevyExclQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 기본 정렬 if (req.getOrderBy() == null) { diff --git a/src/main/java/cokr/xit/fims/excl/dao/OpnnSbmsnMapper.java b/src/main/java/cokr/xit/fims/excl/dao/OpnnSbmsnMapper.java index a22aae1e..9f7f1d1e 100644 --- a/src/main/java/cokr/xit/fims/excl/dao/OpnnSbmsnMapper.java +++ b/src/main/java/cokr/xit/fims/excl/dao/OpnnSbmsnMapper.java @@ -42,8 +42,8 @@ public interface OpnnSbmsnMapper extends AbstractMapper { */ default DataObject selectOpnnSbmsnInfo(LevyExclQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 기본 정렬 if (req.getOrderBy() == null) { 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 e134fe92..cbb6ed76 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 @@ -53,8 +53,8 @@ public class CrdnReRegBean extends AbstractComponent { */ public List getCrdnReRegList(LevyExclQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { @@ -73,8 +73,8 @@ public class CrdnReRegBean extends AbstractComponent { * @return 단속 재등록 객체 목록 */ public List getCrdnReRegs(LevyExclQuery req) { - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } if (req.getOrderBy() == null) { req.setOrderBy("CRR.RE_REG_ID DESC"); 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 352f8603..94643106 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 @@ -53,13 +53,9 @@ public class LevyExclBean extends AbstractComponent { * @return 부과제외 대장 목록 */ public List getLevyExclList(LevyExclQuery req) { - // 사용 여부 확인 - if (req.getUseYN() == null) { - req.setUseYN("Y"); - } // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { @@ -78,13 +74,9 @@ public class LevyExclBean extends AbstractComponent { * @return 부과제외 객체 목록 */ public List getLevyExcls(LevyExclQuery req) { - // 사용 여부 확인 - if (req.getUseYN() == null) { - req.setUseYN("Y"); - } // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } if (req.getOrderBy() == null) { req.setOrderBy("LE.LEVY_EXCL_ID DESC"); @@ -249,7 +241,7 @@ public class LevyExclBean extends AbstractComponent { // 부과제외(TB_LEVY_EXCL) 정보를 조회한다. LevyExclQuery req = new LevyExclQuery(); req.setLevyExclId(levyExcl.getLevyExclId()); - req.setDelYN("N"); + req.setDelYn("N"); DataObject levyExclInfo = levyExclMapper.selectLevyExclInfo(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 46d358cf..07b8cad8 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 @@ -56,13 +56,9 @@ public class OpnnSbmsnBean extends AbstractComponent { * @return 의견제출 대장 목록 */ public List getOpnnSbmsnList(LevyExclQuery req) { - // 사용 여부 확인 - if (req.getUseYN() == null) { - req.setUseYN("Y"); - } // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { @@ -81,8 +77,8 @@ public class OpnnSbmsnBean extends AbstractComponent { * @return 의견제출 대장 객체 목록 */ public List getOpnnSbmsns(LevyExclQuery req) { - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } if (req.getOrderBy() == null) { req.setOrderBy("OS.OPNN_ID DESC"); @@ -365,7 +361,7 @@ public class OpnnSbmsnBean extends AbstractComponent { // 의견제출(TB_OPNN_SBMSN) 정보를 조회한다. LevyExclQuery req = new LevyExclQuery(); req.setOpnnId(opnnSbmsn.getOpnnId()); - req.setDelYN("N"); + req.setDelYn("N"); DataObject opnnSbmsnInfo = opnnSbmsnMapper.selectOpnnSbmsnInfo(req); 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 21322cc3..598cdb6c 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -139,7 +139,6 @@ public class Excl02Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java index f4f0e39b..23dee3c2 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java @@ -111,7 +111,6 @@ public class Excl03Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); diff --git a/src/main/java/cokr/xit/fims/levy/Levy.java b/src/main/java/cokr/xit/fims/levy/Levy.java index 8dddeb90..44050344 100644 --- a/src/main/java/cokr/xit/fims/levy/Levy.java +++ b/src/main/java/cokr/xit/fims/levy/Levy.java @@ -461,7 +461,7 @@ public class Levy extends AbstractEntity { /** * 삭제 여부 */ - private String delYN; + private String delYn; /** * 삭제 사유 diff --git a/src/main/java/cokr/xit/fims/levy/LevyQuery.java b/src/main/java/cokr/xit/fims/levy/LevyQuery.java index dc80e137..22a5336f 100644 --- a/src/main/java/cokr/xit/fims/levy/LevyQuery.java +++ b/src/main/java/cokr/xit/fims/levy/LevyQuery.java @@ -67,7 +67,6 @@ public class LevyQuery extends CmmnQuery { public T setCrdnIds(String... crdnIds) { this.crdnIds = crdnIds; - return self(); } @@ -77,7 +76,6 @@ public class LevyQuery extends CmmnQuery { public T setCrdnId(String crdnId) { this.crdnId = crdnId; - return self(); } @@ -87,7 +85,6 @@ public class LevyQuery extends CmmnQuery { public T setLevyIds(String... levyIds) { this.levyIds = levyIds; - return self(); } @@ -97,7 +94,6 @@ public class LevyQuery extends CmmnQuery { public T setLevyId(String levyId) { this.levyId = levyId; - return self(); } @@ -107,7 +103,6 @@ public class LevyQuery extends CmmnQuery { public T setRductIds(String... rductIds) { this.rductIds = rductIds; - return self(); } @@ -117,7 +112,6 @@ public class LevyQuery extends CmmnQuery { public T setRductId(String rductId) { this.rductId = rductId; - return self(); } @@ -314,7 +308,6 @@ public class LevyQuery extends CmmnQuery { public T setCallPurpose(String callPurpose) { this.callPurpose = callPurpose; - return self(); } @@ -324,7 +317,6 @@ public class LevyQuery extends CmmnQuery { public T setDelRsn(String delRsn) { this.delRsn = delRsn; - return self(); } // ETC ///////////////////////////////////////////////////////////////////// @@ -335,7 +327,6 @@ public class LevyQuery extends CmmnQuery { public T setTnocs(String tnocs) { this.tnocs = tnocs; - return self(); } @@ -345,7 +336,6 @@ public class LevyQuery extends CmmnQuery { public T setGramtFfnlgAmt(String gramtFfnlgAmt) { this.gramtFfnlgAmt = gramtFfnlgAmt; - return self(); } @@ -355,7 +345,6 @@ public class LevyQuery extends CmmnQuery { public T setGramtAdvntceAmt(String gramtAdvntceAmt) { this.gramtAdvntceAmt = gramtAdvntceAmt; - return self(); } // ETC //////////////////////////////////////////////////////////////////// @@ -367,7 +356,6 @@ public class LevyQuery extends CmmnQuery { public T setFyr(String fyr) { this.fyr = fyr; - return self(); } @@ -377,7 +365,6 @@ public class LevyQuery extends CmmnQuery { public T setAcntgSeCd(String acntgSeCd) { this.acntgSeCd = acntgSeCd; - return self(); } @@ -387,7 +374,6 @@ public class LevyQuery extends CmmnQuery { public T setTxitmCd(String txitmCd) { this.txitmCd = txitmCd; - return self(); } @@ -397,7 +383,6 @@ public class LevyQuery extends CmmnQuery { public T setLevyYmd(String levyYmd) { this.levyYmd = levyYmd; - return self(); } @@ -407,7 +392,6 @@ public class LevyQuery extends CmmnQuery { public T setDudtYmd(String dudtYmd) { this.dudtYmd = dudtYmd; - return self(); } @@ -417,7 +401,6 @@ public class LevyQuery extends CmmnQuery { public T setCrdnSttsCd(String crdnSttsCd) { this.crdnSttsCd = crdnSttsCd; - return self(); } // 부과 등록 ////////////////////////////////////////////////////////////////// diff --git a/src/main/java/cokr/xit/fims/levy/Rduct.java b/src/main/java/cokr/xit/fims/levy/Rduct.java index 98454c41..324747a7 100644 --- a/src/main/java/cokr/xit/fims/levy/Rduct.java +++ b/src/main/java/cokr/xit/fims/levy/Rduct.java @@ -50,7 +50,7 @@ public class Rduct extends AbstractEntity { /** * 삭제 여부 */ - private String delYN; + private String delYn; /** * 삭제 사유 diff --git a/src/main/java/cokr/xit/fims/levy/dao/LevyMapper.java b/src/main/java/cokr/xit/fims/levy/dao/LevyMapper.java index 8552da55..15832a98 100644 --- a/src/main/java/cokr/xit/fims/levy/dao/LevyMapper.java +++ b/src/main/java/cokr/xit/fims/levy/dao/LevyMapper.java @@ -53,9 +53,6 @@ public interface LevyMapper extends AbstractMapper { */ default DataObject selectLevyInfo(LevyQuery req) { // 기본 정렬 - if (req.getUseYN() == null) { - req.setUseYN("Y"); - } if (req.getOrderBy() == null) { req.setOrderBy("L.LEVY_ID DESC"); } 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 b5341b04..b5a873c2 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 @@ -44,8 +44,8 @@ public class LevyBean extends AbstractComponent { */ public List getRductLevyTrgtList(LevyQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { @@ -65,8 +65,8 @@ public class LevyBean extends AbstractComponent { */ public List getLevyList(LevyQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { @@ -86,8 +86,8 @@ public class LevyBean extends AbstractComponent { */ public List getLevys(LevyQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } if (req.getOrderBy() == null) { req.setOrderBy("L.LEVY_ID DESC"); 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 581ae717..c36e7168 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,8 +40,8 @@ public class RductBean extends AbstractComponent { * @return 과태료 감경 대장 목록 */ public List getRductList(LevyQuery req) { - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } if (req.getOrderBy() == null) { req.setOrderBy("REG_DT"); @@ -229,7 +229,7 @@ public class RductBean extends AbstractComponent { LevyQuery req = new LevyQuery(); req.setRductId(rduct.getRductId()); - req.setDelYN("N"); + req.setDelYn("N"); DataObject infoCrdnRduct = rductMapper.selectCrdn(req); diff --git a/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java b/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java index 0c256bde..a4aac13e 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java @@ -120,7 +120,6 @@ public class Levy01Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); @@ -272,7 +271,6 @@ public class Levy01Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); diff --git a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java index 47172cff..3356b19e 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java @@ -117,7 +117,6 @@ public class Levy02Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); diff --git a/src/main/java/cokr/xit/fims/mngt/Vltn.java b/src/main/java/cokr/xit/fims/mngt/Vltn.java index 43da1944..93a7064f 100644 --- a/src/main/java/cokr/xit/fims/mngt/Vltn.java +++ b/src/main/java/cokr/xit/fims/mngt/Vltn.java @@ -95,6 +95,6 @@ public class Vltn extends AbstractEntity { /** * 사용 여부 */ - private String useYN; + private String useYn; } diff --git a/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java b/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java index 4afadf69..547cac0c 100644 --- a/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java +++ b/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java @@ -93,8 +93,8 @@ public interface FactionMapper extends AbstractMapper { */ default DataObject selectSggInfo(CmmnQuery req) { // 사용 여부 확인 - if (req.getUseYN() == null) { - req.setUseYN("Y"); + if (req.getUseYn() == null) { + req.setUseYn("Y"); } // 기본 정렬 if (req.getOrderBy() == null) { diff --git a/src/main/java/cokr/xit/fims/mngt/dao/TaskMapper.java b/src/main/java/cokr/xit/fims/mngt/dao/TaskMapper.java index 8354af6d..85f33cff 100644 --- a/src/main/java/cokr/xit/fims/mngt/dao/TaskMapper.java +++ b/src/main/java/cokr/xit/fims/mngt/dao/TaskMapper.java @@ -41,8 +41,8 @@ public interface TaskMapper extends AbstractMapper { */ default DataObject selectTaskInfo(CmmnQuery req) { // 사용 여부 확인 - if (req.getUseYN() == null) { - req.setUseYN("Y"); + if (req.getUseYn() == null) { + req.setUseYn("Y"); } List tasks = selectTasks(req); diff --git a/src/main/java/cokr/xit/fims/nxrp/NisIndivQuery.java b/src/main/java/cokr/xit/fims/nxrp/NisIndivQuery.java index 4cb175fd..2b78eb90 100644 --- a/src/main/java/cokr/xit/fims/nxrp/NisIndivQuery.java +++ b/src/main/java/cokr/xit/fims/nxrp/NisIndivQuery.java @@ -1,5 +1,6 @@ package cokr.xit.fims.nxrp; +import cokr.xit.fims.levy.LevyQuery; import cokr.xit.foundation.component.QueryRequest; /**과태료 대장 단속 정보 등록 정보 조회 요청 @@ -19,12 +20,10 @@ public class NisIndivQuery extends QueryRequest { // ID private String[] crdnIds; // 단속 IDs private String crdnId; // 단속 ID - private String[] levyIds; // 부과 IDs - private String levyId; // 부과 ID - private String[] sndngIds; // 발송 IDs - private String sndngId; // 발송 ID - private String[] sndngDtlIds; // 발송 상세 IDs private String sndngDtlId; // 발송 상세 ID + // 연계 Key + private String linkTrgtCd; + private String linkMngKey; // private String sndngYmd; // 발송(TB_SNDNG)_발송 일자 @@ -32,7 +31,7 @@ public class NisIndivQuery extends QueryRequest { return ifEmpty(crdnIds, () -> null); } - public T setCrdnIds(String... crdnIds) { + public T setCrdnIds(String... crdnIds) { this.crdnIds = crdnIds; return self(); } @@ -46,61 +45,33 @@ public class NisIndivQuery extends QueryRequest { return self(); } - public String[] getLevyIds() { - return ifEmpty(levyIds, () -> null); - } - - public T setLevyIds(String... levyIds) { - this.levyIds = levyIds; - return self(); - } - - public String getLevyId() { - return ifEmpty(levyId, () -> null); - } - - public T setLevyId(String levyId) { - this.levyId = levyId; - return self(); - } - - public String[] getSndngIds() { - return ifEmpty(sndngIds, () -> null); - } - - public T setSndngIds(String... sndngIds) { - this.sndngIds = sndngIds; - return self(); - } - - public String getSndngId() { - return ifEmpty(sndngId, () -> null); + public String getSndngDtlId() { + return ifEmpty(sndngDtlId, () -> null); } - public T setSndngId(String sndngId) { - this.sndngId = sndngId; + public T setSndngDtlId(String sndngDtlId) { + this.sndngDtlId = sndngDtlId; return self(); } - public String[] getSndngDtlIds() { - return ifEmpty(sndngDtlIds, () -> null); + public String getLinkTrgtCd() { + return ifEmpty(linkTrgtCd, () -> null); } - public T setSndngDtlIds(String... sndngDtlIds) { - this.sndngDtlIds = sndngDtlIds; + public T setLinkTrgtCd(String linkTrgtCd) { + this.linkTrgtCd = linkTrgtCd; return self(); } - public String getSndngDtlId() { - return ifEmpty(sndngDtlId, () -> null); + public String getLinkMngKey() { + return ifEmpty(linkMngKey, () -> null); } - public T setSndngDtlId(String sndngDtlId) { - this.sndngDtlId = sndngDtlId; + public T setLinkMngKey(String linkMngKey) { + this.linkMngKey = linkMngKey; return self(); } - // public String getSndngYmd() { return ifEmpty(sndngYmd, () -> null); } diff --git a/src/main/java/cokr/xit/fims/nxrp/NxrpMtchgQuery.java b/src/main/java/cokr/xit/fims/nxrp/NxrpMtchgQuery.java index 44348af9..981c0fca 100644 --- a/src/main/java/cokr/xit/fims/nxrp/NxrpMtchgQuery.java +++ b/src/main/java/cokr/xit/fims/nxrp/NxrpMtchgQuery.java @@ -27,7 +27,7 @@ public class NxrpMtchgQuery extends QueryRequest { private String sndngDtlId; // 발송 상세 ID // ETC private String callPurpose; // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정, refresh 재조회). - private String delYN; // 삭제 여부 + private String delYn; // 삭제 여부 private String delRsn; // 삭제 사유 private String crdnDelYn; // 단속 삭제 여부 @@ -113,12 +113,12 @@ public class NxrpMtchgQuery extends QueryRequest { return self(); } - public String getDelYN() { - return ifEmpty(delYN, () -> null); + public String getDelYn() { + return ifEmpty(delYn, () -> null); } - public T setDelYN(String delYN) { - this.delYN = delYN; + public T setDelYn(String delYn) { + this.delYn = delYn; return self(); } diff --git a/src/main/java/cokr/xit/fims/nxrp/dao/NxrpMtchgMapper.java b/src/main/java/cokr/xit/fims/nxrp/dao/NxrpMtchgMapper.java index 835cc7a0..5b9c551d 100644 --- a/src/main/java/cokr/xit/fims/nxrp/dao/NxrpMtchgMapper.java +++ b/src/main/java/cokr/xit/fims/nxrp/dao/NxrpMtchgMapper.java @@ -41,8 +41,8 @@ public interface NxrpMtchgMapper extends AbstractMapper { */ default DataObject selectNxrpMtchgInfo(NxrpMtchgQuery req) { // 기본 정렬 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } if (req.getOrderBy() == null) { req.setOrderBy("NM.MTCHG_ID DESC"); diff --git a/src/main/java/cokr/xit/fims/nxrp/service/NisIndivService.java b/src/main/java/cokr/xit/fims/nxrp/service/NisIndivService.java index 9a1ffa3f..0a2f4ede 100644 --- a/src/main/java/cokr/xit/fims/nxrp/service/NisIndivService.java +++ b/src/main/java/cokr/xit/fims/nxrp/service/NisIndivService.java @@ -50,15 +50,6 @@ public interface NisIndivService { */ List getNisIndivA02s(NisIndivQuery req); - /**과태료 대장 등록 자료 일괄 조회 정보에서 업무 적용 정보를 수정한다. - * @param nisIndivA02 과태료 대장 등록 자료 일괄 조회 - * @return 저장 여부 - *
  • 저장됐으면 true
    • - *
  • 그렇지 않으면 false
    • - *
- */ - String updateNisIndivA02(NisIndivQuery req); - /**지정한 조건에 따라 과태료 대장 등록 자료 상세 조회 목록을 조회하여 반환한다. * @param req 과태료 대장 등록 자료 상세 조회 조회 조건 * @return 과태료 대장 등록 자료 상세 조회 목록 @@ -71,15 +62,6 @@ public interface NisIndivService { */ List getNisIndivA03s(NisIndivQuery req); - /**과태료 대장 등록 자료 상세 조회 정보에서 업무 적용 정보를 수정한다. - * @param nisIndivA03 과태료 대장 등록 자료 상세 조회 - * @return 저장 여부 - *
  • 저장됐으면 true
    • - *
  • 그렇지 않으면 false
    • - *
- */ - String updateNisIndivA03(NisIndivQuery req); - /**주정차 과태료 대장 단속 정보 등록 정보를 등록한다. * @param req 주정차 과태료 대장 단속 정보 등록 * @return 저장 여부 diff --git a/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java b/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java index 40af4fd8..b82269dc 100644 --- a/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java +++ b/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java @@ -27,7 +27,6 @@ import javax.net.ssl.X509TrustManager; import org.springframework.stereotype.Component; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import cokr.xit.base.code.CommonCode; @@ -45,7 +44,6 @@ import cokr.xit.fims.crdn.dao.CrdnUpdtMapper; import cokr.xit.fims.mngt.dao.TaskMapper; import cokr.xit.fims.mngt.service.bean.FactionBean; import cokr.xit.fims.nxrp.A01; -import cokr.xit.fims.nxrp.A02; import cokr.xit.fims.nxrp.A03Rqst; import cokr.xit.fims.nxrp.NisIndivQuery; import cokr.xit.fims.nxrp.dao.NisA01Mapper; @@ -54,9 +52,6 @@ import cokr.xit.fims.nxrp.dao.NisA03Mapper; import cokr.xit.fims.nxrp.support.AttachedTxtMaker; import cokr.xit.fims.nxrp.support.LinkFileMaker; import cokr.xit.fims.nxrp.support.OnlyImageMaker; -import cokr.xit.fims.sndb.SndbQuery; -import cokr.xit.fims.sndb.SndngDtl; -import cokr.xit.fims.sndb.dao.SndngDtlMapper; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.data.DataObject; import cokr.xit.interfaces.filejob.JobConf; @@ -86,10 +81,6 @@ public class NisIndivBean extends AbstractComponent { @Resource(name = "nisA03Mapper") private NisA03Mapper nisA03Mapper; - /** 발송 대장 정보 DAO */ - @Resource(name = "sndngDtlMapper") - private SndngDtlMapper sndngDtlMapper; - /** 단속 대장 수정 정보 DAO */ @Resource(name = "crdnUpdtMapper") private CrdnUpdtMapper crdnUpdtMapper; @@ -147,214 +138,163 @@ public class NisIndivBean extends AbstractComponent { */ public String createNisIndivA01(NisIndivQuery req) { // 변수 선언 - boolean rtnScs = false; // DB 처리 결과 String rtnMsg = "[F] "; // 처리 결과 메시지 - // 1. 검색 조건을 확인하여 발송상세 대상를 조회 - SndbQuery sndbQuery = new SndbQuery(); - - if (req.getSndngDtlIds() != null) { - sndbQuery.setSndngDtlIds(req.getSndngDtlIds()); - } else if (req.getSndngId() != null) { - sndbQuery.setSndngId(req.getSndngId()); - } else { - rtnMsg = "[F] 작업 중 세외수입에 등록 할 대상 자료의 조회조건이 없습니다."; - return rtnMsg; - } - sndbQuery.setDelYN("N"); - - List sndngDtlIds = sndngDtlMapper.selectSndngTrgtDtlIds(sndbQuery); - - // 2. 사용자 정보 + // 1. 사용자 정보 DataObject userInfo = userBean.getUserInfo(currentUser().getId()); - // 3. 부서 정보 + // 2. 부서 정보 DataObject deptInfo = factionBean.getDeptInfo(new CmmnQuery().setDeptCd(userInfo.string("DEPT_CD"))); - // 4. 단속 자료를 조회하여 세외수입 단속 연계 여부를 확인하여 "N"인 자료는 세외수입 연계 테이블에 등록한다. - for (int iLoop = 0; iLoop < sndngDtlIds.size(); iLoop++) { - // 발송 상세 상태 코드(SNDNG_DTL_STTS_CD) 가 처리전(00)이 아니라면 다음 자료로.. - if (!sndngDtlIds.get(iLoop).string("SNDNG_DTL_STTS_CD").equals("00")) { - continue; - } - - // 세외수입 과태료대장에 연계할 단속 정보를 조회 - DataObject selectCrdnInfo = nisA01Mapper.selectCrdnInfo(sndngDtlIds.get(iLoop).string("CRDN_ID")); -/* - // 변경이 필요할까? - String linkMngKey = selectCrdnInfo.string("SGG_CD") + selectCrdnInfo.string("CRDN_ID"); -*/ - LocalDateTime now = LocalDateTime.now(); // 현재 날짜/시간 - String linkMngKey = selectCrdnInfo.string("SGG_CD") + selectCrdnInfo.string("CRDN_ID") + '_' + now.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")); - - A01 a01 = new A01(); - - a01.setTaskSeCd(selectCrdnInfo.string("TASK_SE_CD")); // 업무 구분 코드 - a01.setSgbCd(userInfo.string("NSTT_CD")); // 자치단체코드 - a01.setLinkTrgtCd(userInfo.string("NSTT_CD") + selectCrdnInfo.string("TASK_SE_CD") + "01001"); // 연계대상코드 - a01.setLinkMngKey(linkMngKey); // 연계관리키 시군구코드 + 단속 ID + 년월일시분초 - a01.setDptCd(userInfo.string("DEPT_CD")); // 부서코드 - a01.setRcptYr(req.getSndngYmd().substring(0, 4)); // 접수연도 - a01.setSpacBizCd(selectCrdnInfo.string("SPCL_BIZ_CD")); // 특별회계사업코드 (밤샘주차 0159:주차장특별회계) - a01.setActSeCd(selectCrdnInfo.string("ACNTG_SE_CD")); // 회계구분코드 - a01.setRprsTxmCd(selectCrdnInfo.string("TXITM_CD")); // 대표세입과목코드 - a01.setOperItemCd(selectCrdnInfo.string("OPER_ITEM_CD")); // 운영항목코드 - // 과태료과징금구분코드 01:과태료 02:과징금 - if (selectCrdnInfo.string("TASK_SE_CD").equals("PES")) { // 밤샘주차는 과징금(02) - a01.setFinScrgSeCd("02"); - } else { - a01.setFinScrgSeCd("01"); - } - // 납부자구분코드(FIM011) 01:주민 02:외국인 03:법인 04:사업자 05:기타 -> 01:개인 02:법인 03:단체 05:외국인 - if (selectCrdnInfo.string("RTPYR_SE_CD").equals("01")) { // 주민(01) -> 개인(01) - a01.setPyrSeCd("01"); - } else if (selectCrdnInfo.string("RTPYR_SE_CD").equals("02")) { // 외국인(02) -> 외국인(05) - a01.setPyrSeCd("05"); - } else if (selectCrdnInfo.string("RTPYR_SE_CD").equals("03")) { // 법인(03) -> 법인(02) - a01.setPyrSeCd("02"); - } else if (selectCrdnInfo.string("RTPYR_SE_CD").equals("04")) { // 사업자(04) -> 사업자(04) - a01.setPyrSeCd("04"); - } else { // 기타(05) -> 단체(03) - a01.setPyrSeCd("03"); - } - a01.setPyrNo(selectCrdnInfo.string("RTPYR_NO")); // 납부자번호 - a01.setPyrNm(selectCrdnInfo.string("RTPYR_NM")); // 납부자명 - a01.setRprsPyrNo(selectCrdnInfo.string("RTPYR_NO")); // 대표납부자번호 / 법인의 경우 대표 납부자번호 필수 - a01.setRprsPyrNm(selectCrdnInfo.string("RTPYR_NM")); // 대표납부자명 / 법인의 경우 대표 납부자명 필수 - a01.setPyrTelno(selectCrdnInfo.string("RTPYR_TELNO")); // 납부자전화번호 - a01.setPyrMblTelno(selectCrdnInfo.string("RTPYR_MBL_TELNO")); // 납부자휴대전화번호 - a01.setPyrEmlAddr(selectCrdnInfo.string("RTPYR_EML")); // 납부자이메일주소 - a01.setPyrSttCd("10"); // 납부자상태코드('10') - a01.setPyrLotnoRoadAddrSeCd(selectCrdnInfo.string("ADDR_SE_CD")); // 납부자지번도로주소구분코드 01:지번주소, 02:도로명주소 - a01.setPyrZip(selectCrdnInfo.string("ZIP")); // 납부자우편번호 - a01.setPyrRoadNmCd(selectCrdnInfo.string("ROAD_NM_CD")); // 납부자도로명코드 - // 납부자주소지하여부(FIM036) 0:지상 1: 지하 -> Y:지하, N:지상 - if (selectCrdnInfo.string("ROAD_NM_CD").equals("1")) { // 지하(1) -> 지하(Y) - a01.setPyrAddrUdgdYn("Y"); - } else { // 기본값('N') - a01.setPyrAddrUdgdYn("N"); - } - a01.setPyrBmno(selectCrdnInfo.string("BMNO")); // 납부자건물본번 - a01.setPyrBsno(selectCrdnInfo.string("BSNO")); // 납부자건물부번 - a01.setPyrStdgCd(selectCrdnInfo.string("STDG_CD")); // 납부자법정동코드 - a01.setPyrDongCd(selectCrdnInfo.string("DONG_CD")); // 납부자행정동코드 - // 산 구분 코드(FIM037) 0: 1:산 -> 납부자산구분코드 01:일반번지, 02:산번지 - if (selectCrdnInfo.string("MTN_SE_CD").equals("1")) { // 산(1) -> 산번지(02) - a01.setPyrMtnSeCd("02"); - } else { // 01:일반번지 - a01.setPyrMtnSeCd("01"); - } - a01.setPyrBldgMngNo(selectCrdnInfo.string("BLDG_MNG_NO")); // 납부자건물관리번호 - a01.setPyrBldgNm(""); // 납부자건물명 - a01.setPyrMno(selectCrdnInfo.string("MNO")); // 납부자본번 / 번지. 지번주소인 경우 필수 - a01.setPyrSno(selectCrdnInfo.string("SNO")); // 납부자부번 / 호 - a01.setPyrSpclDg(selectCrdnInfo.string("SPCL_DONG")); // 납부자특수동 / 상세주소 동 - a01.setPyrSpclHo(selectCrdnInfo.string("SPCL_HO")); // 납부자특수호 / 상세주소 호 - a01.setPyrTong(""); // 납부자통 - a01.setPyrBan(""); // 납부자반 - a01.setPyrSpclAddr(selectCrdnInfo.string("SPCL_ADDR")); // 납부자특수주소 - a01.setPyrRoadNmAddr(selectCrdnInfo.string("ADDR")); // 납부자도로명주소 - a01.setPyrRoadNmDaddr(selectCrdnInfo.string("DTL_ADDR")); // 납부자도로명상세주소 - a01.setPyrRoadNmAlAddr(selectCrdnInfo.string("WHOL_ADDR")); // 납부자도로명전체주소 - a01.setGlNm(selectCrdnInfo.string("VHRNO")); // 물건지명 - a01.setLvyTrgtSeCd("01"); // 부과대상구분코드 01:차량 - a01.setRegYmd(selectCrdnInfo.string("CRDN_YMD")); // 등록일자 / 위반일자 - a01.setFinScrgAmt(selectCrdnInfo.string("FFNLG_AMT")); // 과태료과징금금액 - a01.setFcltSeCd(""); // 시설구분코드 / 금연구역흡연위반 과태료인 경우 활용 - a01.setRegSeCd(""); // 등록구분코드 / 폐기물관리법위반 과태료인 경우 01투기, 02소각, 99기타 - // 감경 사유 코드(FIM019) -> 감경사유구분코드 - if (selectCrdnInfo.string("RDUCT_RSN_CD").equals("01")) { // 국민기초생활수급자 - a01.setRdtRsnSeCd("0101"); - } else if (selectCrdnInfo.string("RDUCT_RSN_CD").equals("02")) { // 한부모가족보호대상자 - a01.setRdtRsnSeCd("0102"); - } else if (selectCrdnInfo.string("RDUCT_RSN_CD").equals("03")) { // 장애인(장애의 정도가 심한 장애인) - a01.setRdtRsnSeCd("0103"); - } else if (selectCrdnInfo.string("RDUCT_RSN_CD").equals("04")) { // 국가유공자(상이등급3급이상) - a01.setRdtRsnSeCd("0104"); - } else if (selectCrdnInfo.string("RDUCT_RSN_CD").equals("05")) { // 미성년자 - a01.setRdtRsnSeCd("0105"); - } else if (selectCrdnInfo.string("RDUCT_RSN_CD").equals("08")) { // 의견진술감액 - a01.setRdtRsnSeCd(""); - } else if (selectCrdnInfo.string("RDUCT_RSN_CD").equals("09")) { // 기타 - a01.setRdtRsnSeCd(""); - } else if (selectCrdnInfo.string("RDUCT_RSN_CD").equals("99")) { // 타법령에의한감경 - a01.setRdtRsnSeCd("0199"); - } else { // 해당없음 - a01.setRdtRsnSeCd("0100"); - } - a01.setVhrno(selectCrdnInfo.string("VHRNO")); // 자동차등록번호 - - if (selectCrdnInfo.string("TASK_SE_CD").equals("PES")) { // 밤샘주차 - a01.setMngItemCn1("차고지 외 밤샘주차"); // 관리항목1 - a01.setMngItemCn2("위반일시 : " + selectCrdnInfo.string("CRDN_YMD_TM_MASK")); // 관리항목2 - a01.setMngItemCn3("위반장소 : " + selectCrdnInfo.string("CRDN_PLC")); // 관리항목3 - a01.setMngItemCn4("화물자동차운수사업법"); // 관리항목4 - // 관리항목5 - if (selectCrdnInfo.string("CRDN_INPT_SE_CD").equals("06")) { - a01.setMngItemCn5("관내단속"); - } else if(selectCrdnInfo.string("CRDN_INPT_SE_CD").equals("08")) { - a01.setMngItemCn5(selectCrdnInfo.string("ETC_CN")); - } else { - a01.setMngItemCn5(""); - } - } else if ("DPV,ECA".contains(selectCrdnInfo.string("TASK_SE_CD"))) { // 장애인, 전기차 - a01.setMngItemCn1("위반일시 : " + selectCrdnInfo.string("CRDN_YMD_TM_MASK")); // 관리항목1 - a01.setMngItemCn2(""); // 관리항목2 - a01.setMngItemCn3("위반장소 : " + selectCrdnInfo.string("CRDN_PLC")); // 관리항목3 - a01.setMngItemCn4(""); // 관리항목4 - a01.setMngItemCn5("위반항목 : " + selectCrdnInfo.string("VLTN_ARTCL")); // 관리항목5 + // 3. 세외수입 과태료대장에 연계할 단속 정보를 조회 + DataObject selectCrdnInfo = nisA01Mapper.selectCrdnInfo(req.getCrdnId()); + + LocalDateTime now = LocalDateTime.now(); // 현재 날짜/시간 + String linkMngKey = selectCrdnInfo.string("SGG_CD") + selectCrdnInfo.string("CRDN_ID") + '_' + now.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")); +// String linkMngKey = selectCrdnInfo.string("SGG_CD") + selectCrdnInfo.string("CRDN_ID"); + + A01 a01 = new A01(); + + a01.setTaskSeCd(selectCrdnInfo.string("TASK_SE_CD")); // 업무 구분 코드 + a01.setSgbCd(userInfo.string("NSTT_CD")); // 자치단체코드 + a01.setLinkTrgtCd(userInfo.string("NSTT_CD") + selectCrdnInfo.string("TASK_SE_CD") + "01001"); // 연계대상코드 + a01.setLinkMngKey(linkMngKey); // 연계관리키 시군구코드 + 단속 ID + 년월일시분초 + a01.setDptCd(userInfo.string("DEPT_CD")); // 부서코드 + a01.setRcptYr(req.getSndngYmd().substring(0, 4)); // 접수연도 + a01.setSpacBizCd(selectCrdnInfo.string("SPCL_BIZ_CD")); // 특별회계사업코드 (밤샘주차 0159:주차장특별회계) + a01.setActSeCd(selectCrdnInfo.string("ACNTG_SE_CD")); // 회계구분코드 + a01.setRprsTxmCd(selectCrdnInfo.string("TXITM_CD")); // 대표세입과목코드 + a01.setOperItemCd(selectCrdnInfo.string("OPER_ITEM_CD")); // 운영항목코드 + // 과태료과징금구분코드 01:과태료 02:과징금 + if (selectCrdnInfo.string("TASK_SE_CD").equals("PES")) { // 밤샘주차는 과징금(02) + a01.setFinScrgSeCd("02"); + } else { + a01.setFinScrgSeCd("01"); + } + // 납부자구분코드(FIM011) 01:주민 02:외국인 03:법인 04:사업자 05:기타 -> 01:개인 02:법인 03:단체 05:외국인 + if (selectCrdnInfo.string("RTPYR_SE_CD").equals("01")) { // 주민(01) -> 개인(01) + a01.setPyrSeCd("01"); + } else if (selectCrdnInfo.string("RTPYR_SE_CD").equals("02")) { // 외국인(02) -> 외국인(05) + a01.setPyrSeCd("05"); + } else if (selectCrdnInfo.string("RTPYR_SE_CD").equals("03")) { // 법인(03) -> 법인(02) + a01.setPyrSeCd("02"); + } else if (selectCrdnInfo.string("RTPYR_SE_CD").equals("04")) { // 사업자(04) -> 사업자(04) + a01.setPyrSeCd("04"); + } else { // 기타(05) -> 단체(03) + a01.setPyrSeCd("03"); + } + a01.setPyrNo(selectCrdnInfo.string("RTPYR_NO")); // 납부자번호 + a01.setPyrNm(selectCrdnInfo.string("RTPYR_NM")); // 납부자명 + a01.setRprsPyrNo(selectCrdnInfo.string("RTPYR_NO")); // 대표납부자번호 / 법인의 경우 대표 납부자번호 필수 + a01.setRprsPyrNm(selectCrdnInfo.string("RTPYR_NM")); // 대표납부자명 / 법인의 경우 대표 납부자명 필수 + a01.setPyrTelno(selectCrdnInfo.string("RTPYR_TELNO")); // 납부자전화번호 + a01.setPyrMblTelno(selectCrdnInfo.string("RTPYR_MBL_TELNO")); // 납부자휴대전화번호 + a01.setPyrEmlAddr(selectCrdnInfo.string("RTPYR_EML")); // 납부자이메일주소 + a01.setPyrSttCd("10"); // 납부자상태코드('10') + a01.setPyrLotnoRoadAddrSeCd(selectCrdnInfo.string("ADDR_SE_CD")); // 납부자지번도로주소구분코드 01:지번주소, 02:도로명주소 + a01.setPyrZip(selectCrdnInfo.string("ZIP")); // 납부자우편번호 + a01.setPyrRoadNmCd(selectCrdnInfo.string("ROAD_NM_CD")); // 납부자도로명코드 + // 납부자주소지하여부(FIM036) 0:지상 1: 지하 -> Y:지하, N:지상 + if (selectCrdnInfo.string("ROAD_NM_CD").equals("1")) { // 지하(1) -> 지하(Y) + a01.setPyrAddrUdgdYn("Y"); + } else { // 기본값('N') + a01.setPyrAddrUdgdYn("N"); + } + a01.setPyrBmno(selectCrdnInfo.string("BMNO")); // 납부자건물본번 + a01.setPyrBsno(selectCrdnInfo.string("BSNO")); // 납부자건물부번 + a01.setPyrStdgCd(selectCrdnInfo.string("STDG_CD")); // 납부자법정동코드 + a01.setPyrDongCd(selectCrdnInfo.string("DONG_CD")); // 납부자행정동코드 + // 산 구분 코드(FIM037) 0: 1:산 -> 납부자산구분코드 01:일반번지, 02:산번지 + if (selectCrdnInfo.string("MTN_SE_CD").equals("1")) { // 산(1) -> 산번지(02) + a01.setPyrMtnSeCd("02"); + } else { // 01:일반번지 + a01.setPyrMtnSeCd("01"); + } + a01.setPyrBldgMngNo(selectCrdnInfo.string("BLDG_MNG_NO")); // 납부자건물관리번호 + a01.setPyrBldgNm(""); // 납부자건물명 + a01.setPyrMno(selectCrdnInfo.string("MNO")); // 납부자본번 / 번지. 지번주소인 경우 필수 + a01.setPyrSno(selectCrdnInfo.string("SNO")); // 납부자부번 / 호 + a01.setPyrSpclDg(selectCrdnInfo.string("SPCL_DONG")); // 납부자특수동 / 상세주소 동 + a01.setPyrSpclHo(selectCrdnInfo.string("SPCL_HO")); // 납부자특수호 / 상세주소 호 + a01.setPyrTong(""); // 납부자통 + a01.setPyrBan(""); // 납부자반 + a01.setPyrSpclAddr(selectCrdnInfo.string("SPCL_ADDR")); // 납부자특수주소 + a01.setPyrRoadNmAddr(selectCrdnInfo.string("ADDR")); // 납부자도로명주소 + a01.setPyrRoadNmDaddr(selectCrdnInfo.string("DTL_ADDR")); // 납부자도로명상세주소 + a01.setPyrRoadNmAlAddr(selectCrdnInfo.string("WHOL_ADDR")); // 납부자도로명전체주소 + a01.setGlNm(selectCrdnInfo.string("VHRNO")); // 물건지명 + a01.setLvyTrgtSeCd("01"); // 부과대상구분코드 01:차량 + a01.setRegYmd(selectCrdnInfo.string("CRDN_YMD")); // 등록일자 / 위반일자 + a01.setFinScrgAmt(selectCrdnInfo.string("FFNLG_AMT")); // 과태료과징금금액 + a01.setFcltSeCd(""); // 시설구분코드 / 금연구역흡연위반 과태료인 경우 활용 + a01.setRegSeCd(""); // 등록구분코드 / 폐기물관리법위반 과태료인 경우 01투기, 02소각, 99기타 + // 감경 사유 코드(FIM019) -> 감경사유구분코드 + if (selectCrdnInfo.string("RDUCT_RSN_CD").equals("01")) { // 국민기초생활수급자 + a01.setRdtRsnSeCd("0101"); + } else if (selectCrdnInfo.string("RDUCT_RSN_CD").equals("02")) { // 한부모가족보호대상자 + a01.setRdtRsnSeCd("0102"); + } else if (selectCrdnInfo.string("RDUCT_RSN_CD").equals("03")) { // 장애인(장애의 정도가 심한 장애인) + a01.setRdtRsnSeCd("0103"); + } else if (selectCrdnInfo.string("RDUCT_RSN_CD").equals("04")) { // 국가유공자(상이등급3급이상) + a01.setRdtRsnSeCd("0104"); + } else if (selectCrdnInfo.string("RDUCT_RSN_CD").equals("05")) { // 미성년자 + a01.setRdtRsnSeCd("0105"); + } else if (selectCrdnInfo.string("RDUCT_RSN_CD").equals("08")) { // 의견진술감액 + a01.setRdtRsnSeCd(""); + } else if (selectCrdnInfo.string("RDUCT_RSN_CD").equals("09")) { // 기타 + a01.setRdtRsnSeCd(""); + } else if (selectCrdnInfo.string("RDUCT_RSN_CD").equals("99")) { // 타법령에의한감경 + a01.setRdtRsnSeCd("0199"); + } else { // 해당없음 + a01.setRdtRsnSeCd("0100"); + } + a01.setVhrno(selectCrdnInfo.string("VHRNO")); // 자동차등록번호 + + if (selectCrdnInfo.string("TASK_SE_CD").equals("PES")) { // 밤샘주차 + a01.setMngItemCn1("차고지 외 밤샘주차"); // 관리항목1 + a01.setMngItemCn2("위반일시 : " + selectCrdnInfo.string("CRDN_YMD_TM_MASK")); // 관리항목2 + a01.setMngItemCn3("위반장소 : " + selectCrdnInfo.string("CRDN_PLC")); // 관리항목3 + a01.setMngItemCn4("화물자동차운수사업법"); // 관리항목4 + // 관리항목5 + if (selectCrdnInfo.string("CRDN_INPT_SE_CD").equals("06")) { + a01.setMngItemCn5("관내단속"); + } else if(selectCrdnInfo.string("CRDN_INPT_SE_CD").equals("08")) { + a01.setMngItemCn5(selectCrdnInfo.string("ETC_CN")); } else { - throw new RuntimeException("지정되지 않은 업무 구분코드가 입력되었습니다."); // 예외를 발생시켜서 DB Rollback + a01.setMngItemCn5(""); } + } else if ("DPV,ECA".contains(selectCrdnInfo.string("TASK_SE_CD"))) { // 장애인, 전기차 + a01.setMngItemCn1("위반일시 : " + selectCrdnInfo.string("CRDN_YMD_TM_MASK")); // 관리항목1 + a01.setMngItemCn2(""); // 관리항목2 + a01.setMngItemCn3("위반장소 : " + selectCrdnInfo.string("CRDN_PLC")); // 관리항목3 + a01.setMngItemCn4(""); // 관리항목4 + a01.setMngItemCn5("위반항목 : " + selectCrdnInfo.string("VLTN_ARTCL")); // 관리항목5 + } else { + throw new RuntimeException("지정되지 않은 업무 구분코드가 입력되었습니다."); // 예외를 발생시켜서 DB Rollback + } - a01.setMngItemCn6(selectCrdnInfo.string("SGG_CD") + selectCrdnInfo.string("CRDN_ID")); // 관리6항목 - a01.setRmCn(selectCrdnInfo.string("ETC_CN")); // 비고내용 - a01.setCreatedBy(userInfo.string("USER_ID")); - a01.setModifiedBy(userInfo.string("USER_ID")); + a01.setMngItemCn6(selectCrdnInfo.string("SGG_CD") + selectCrdnInfo.string("CRDN_ID")); // 관리6항목 + a01.setRmCn(selectCrdnInfo.string("ETC_CN")); // 비고내용 + a01.setCreatedBy(userInfo.string("USER_ID")); + a01.setModifiedBy(userInfo.string("USER_ID")); - // 차세대 세외수입 연계 서비스 호출 - A01 과태료 대장 단속 정보 등록 - ObjectMapper mapper = new ObjectMapper(); - String sUrl = deptInfo.string("NXRP_LINK_SRVC_URL") + "/intf/lntris/a01/register"; // create - String sJsonData = ""; + // 차세대 세외수입 연계 서비스 호출 - A01 과태료 대장 단속 정보 등록 + ObjectMapper mapper = new ObjectMapper(); + String sUrl = deptInfo.string("NXRP_LINK_SRVC_URL") + "/intf/lntris/a01/register"; // create + String sJsonData = ""; - // Json 파라미터 설정 - try { - sJsonData = "{ \"taskSeCd\":" + "\"" + a01.getTaskSeCd() + "\"" + // Json 파라미터 설정 + try { + sJsonData = "{ " + + " \"taskSeCd\":" + "\"" + a01.getTaskSeCd() + "\"" + ", \"msg\":" + mapper.writeValueAsString(a01) + " }"; - } catch (IOException e) { - throw new RuntimeException("세외수입 과태료대장에 전송할 자료 생성중 오류가 발생하였습니다."); // 예외를 발생시켜서 DB Rollback - } - - // 연계 서비스 호출 - String resultMsg = callHttpsJson(sUrl, "POST", sJsonData); - - try { - JsonNode linkRst = mapper.readTree(resultMsg); - - // 개별시스템 연계결과코드(linkRstCd) - 000:정상, 100:검증오류(연계관리키 중복), 101:검증오류(등록 시 자료 null, 길이체크), 900:필수값누락 - if (linkRst.get("linkRstCd").asText().equals("000")) { - // resVo1 - JsonNode resVo1 = linkRst.findValue("resVo1"); - - // 발송 대장(TB_SNDNG) - 발송 상태 코드(SNDNG_DTL_STTS_CD) 수정 - SndngDtl sndngDtl = new SndngDtl(); - sndngDtl.setSndngDtlSttsCd("01"); // 발송 상태 코드(FIM050) 01:세외수입부과 - sndngDtl.setSndngDtlId(sndngDtlIds.get(iLoop).string("SNDNG_DTL_ID")); // 발송 상세 ID - sndngDtl.setLinkTrgtCd(resVo1.get("linkTrgtCd").asText()); // 연계 대상 코드 - sndngDtl.setLinkMngKey(resVo1.get("linkMngKey").asText()); // 연계 관리 키 - - rtnScs = sndngDtlMapper.updateSndngDtlSttsCd(sndngDtl); - if (!rtnScs) { - throw new RuntimeException("세외수입 과태료대장 연계 정보를 단속 대장에 수정하지 못했습니다."); // 예외를 발생시켜서 DB Rollback - } - } - } catch (IOException e) { - throw new RuntimeException("오류."); // 예외를 발생시켜서 DB Rollback - } + } catch (IOException e) { + throw new RuntimeException("세외수입 과태료대장에 전송할 자료 생성중 오류가 발생하였습니다."); // 예외를 발생시켜서 DB Rollback } - rtnMsg = "[S] 작업이 정상 처리 되었습니다."; + // 연계 서비스 호출 후 메세지 return + rtnMsg = callHttpsJson(sUrl, "POST", sJsonData); return rtnMsg; } @@ -375,25 +315,6 @@ public class NisIndivBean extends AbstractComponent { return nisA02Mapper.selectNisIndivA02s(req); } - /**과태료 대장 등록 자료 일괄 조회 정보에서 업무 적용 정보를 수정한다. - * @param nisIndivA02 과태료 대장 등록 자료 일괄 조회 - * @return 저장 여부 - *
  • 저장됐으면 true
    • - *
  • 그렇지 않으면 false
    • - *
- */ - public String updateNisIndivA02(NisIndivQuery req) { - // 변수 선언 - boolean rtnScs = false; // DB 처리 결과 - String rtnMsg = "[F] "; // 처리 결과 메시지 - - A02 nisIndivA02 = new A02(); - - rtnScs = nisA02Mapper.update(nisIndivA02); - - return rtnMsg; - } - /**지정한 조건에 따라 과태료 대장 등록 자료 상세 조회 목록을 조회하여 반환한다. * @param req 과태료 대장 등록 자료 상세 조회 조회 조건 * @return 과태료 대장 등록 자료 상세 조회 목록 @@ -417,307 +338,153 @@ public class NisIndivBean extends AbstractComponent { *
  • 그렇지 않으면 false
    • * */ - public String updateNisIndivA03(NisIndivQuery req) { + public String createNisIndivA03(NisIndivQuery req) { // 변수 선언 - boolean rtnScs = false; // DB 처리 결과 String rtnMsg = "[F] "; // 처리 결과 메시지 - // 1. 검색 조건을 확인하여 발송상세 대상를 조회 - SndbQuery sndbQuery = new SndbQuery(); - - if (req.getSndngDtlIds() != null) { - sndbQuery.setSndngDtlIds(req.getSndngDtlIds()); - } else if (req.getSndngId() != null) { - sndbQuery.setSndngId(req.getSndngId()); - } else { - rtnMsg = "[F] 작업 중 세외수입 대장 조회할 자료의 조회조건이 없습니다."; - return rtnMsg; - } - sndbQuery.setDelYN("N"); - - List sndngDtlIds = sndngDtlMapper.selectSndngTrgtDtlIds(sndbQuery); - - // 2. 사용자 정보 + // 1. 사용자 정보 DataObject userInfo = userBean.getUserInfo(currentUser().getId()); - // 3. 부서 정보 + // 2. 부서 정보 DataObject deptInfo = factionBean.getDeptInfo(new CmmnQuery().setDeptCd(userInfo.string("DEPT_CD"))); - // 4. 단속 자료를 조회하여 세외수입 단속 연계 여부를 확인하여 "N"인 자료는 세외수입 연계 테이블에 등록한다. - for (int iLoop = 0; iLoop < sndngDtlIds.size(); iLoop++) { - // 발송 상세 상태 코드(SNDNG_DTL_STTS_CD) 가 세외수입부과(01)가 아니라면 다음 자료로.. - if (!sndngDtlIds.get(iLoop).string("SNDNG_DTL_STTS_CD").equals("01")) { - continue; - } - - // 세외수입 과태료대장에 연계할 단속 정보를 조회 - DataObject selectCrdnInfo = nisA01Mapper.selectCrdnInfo(sndngDtlIds.get(iLoop).string("CRDN_ID")); + // 3. 세외수입 과태료대장에 연계할 단속 정보를 조회 + DataObject selectCrdnInfo = nisA01Mapper.selectCrdnInfo(req.getCrdnId()); - A03Rqst a03Rqst = new A03Rqst(); + A03Rqst a03Rqst = new A03Rqst(); - a03Rqst.setTaskSeCd(selectCrdnInfo.string("TASK_SE_CD")); // 업무 구분 코드 - a03Rqst.setSgbCd(userInfo.string("NSTT_CD")); // 자치단체코드 - a03Rqst.setLinkTrgtCd(userInfo.string("NSTT_CD") + selectCrdnInfo.string("TASK_SE_CD") + "01001"); // 연계대상코드 - a03Rqst.setLinkMngKey(sndngDtlIds.get(iLoop).string("LINK_MNG_KEY")); // 연계관리키 시군구코드 + 단속 ID + 년월일시분초 + a03Rqst.setTaskSeCd(selectCrdnInfo.string("TASK_SE_CD")); // 업무 구분 코드 + a03Rqst.setSgbCd(userInfo.string("NSTT_CD")); // 자치단체코드 + a03Rqst.setLinkTrgtCd(req.getLinkTrgtCd()); // 연계대상코드 + a03Rqst.setLinkMngKey(req.getLinkMngKey()); // 연계관리키 시군구코드 + 단속 ID + 년월일시분초 - // 차세대 세외수입 연계 서비스 호출 - A01 과태료 대장 단속 정보 등록 - ObjectMapper mapper = new ObjectMapper(); - String sUrl = deptInfo.string("NXRP_LINK_SRVC_URL") + "/intf/lntris/a03/info"; // create - String sJsonData = ""; + // 차세대 세외수입 연계 서비스 호출 - A01 과태료 대장 단속 정보 등록 + ObjectMapper mapper = new ObjectMapper(); + String sUrl = deptInfo.string("NXRP_LINK_SRVC_URL") + "/intf/lntris/a03/info"; // create + String sJsonData = ""; - // Json 파라미터 설정 - try { - sJsonData = "{ " - + " \"taskSeCd\":" + "\"" + a03Rqst.getTaskSeCd() + "\"" - + ", \"msg\":" + mapper.writeValueAsString(a03Rqst) - + " }"; - } catch (IOException e) { - throw new RuntimeException("세외수입 과태료대장에 전송할 자료 생성중 오류가 발생하였습니다."); // 예외를 발생시켜서 DB Rollback - } - - // 연계 서비스 호출 - String resultMsg = callHttpsJson(sUrl, "POST", sJsonData); -/* - String resultMsg = "{ " - + " \"linkRstCd\":" + "\"000" + "\"" - + ", \"linkRstMsg\":" + "\"정상 조회되었습니다." + "\"" - + ", \"resVo1\":" + "{ " - + " \"sgbCd\":" + "\"5530000" + "\"" - + ", \"linkTrgtCd\":" + "\"5530000DPV01001" + "\"" - + ", \"linkMngKey\":" + "\"415902024000236920240412153509" + "\"" - + ", \"finScrgAcbKey\":" + "\"20240009451" + "\"" - + ", \"dptCd\":" + "\"5530497" + "\"" - + ", \"dptNm\":" + "\"장애인복지과" + "\"" - + ", \"rcptYr\":" + "\"2024" + "\"" - + ", \"spacBizCd\":" + "\"0000" + "\"" - + ", \"spacBizNm\":" + "null" - + ", \"actSeCd\":" + "\"41" + "\"" - + ", \"actSeNm\":" + "\"일반회계(시군구세외)" + "\"" - + ", \"rprsTxmCd\":" + "\"234179" + "\"" - + ", \"rprsTxmNm\":" + "\"장애인등편의법위반과태료" + "\"" - + ", \"operItemCd\":" + "\"002" + "\"" - + ", \"operItemNm\":" + "\"장애인전용주차구역주차방해행위과태료" + "\"" - + ", \"regYmd\":" + "\"20240412" + "\"" - + ", \"pyrSeCd\":" + "\"02" + "\"" - + ", \"pyrSeNm\":" + "\"법인" + "\"" - + ", \"pyrNo\":" + "\"1101113634428" + "\"" - + ", \"pyrNm\":" + "\"엔에이치농협캐피탈(주)" + "\"" - + ", \"pyrSttCd\":" + "\"99" + "\"" - + ", \"pyrSttNm\":" + "\"기타" + "\"" - + ", \"pyrZip\":" + "\"42089" + "\"" - + ", \"pyrAddr\":" + "\"대구광역시 수성구 달구벌대로 2532 4층(범어동, 대아빌딩)" + "\"" - + ", \"telno\":" + "null" - + ", \"mblTelno\":" + "null" - + ", \"pyrEmlAddr\":" + "null" - + ", \"vhrno\":" + "null" - + ", \"mngItemCn1\":" + "\"위반일시 : 2024-04-05 17:40" + "\"" - + ", \"mngItemCn2\":" + "null" - + ", \"mngItemCn3\":" + "\"위반장소 : 경기도 화성시 남양읍 활초리 산 62-3 " + "\"" - + ", \"mngItemCn4\":" + "null" - + ", \"mngItemCn5\":" + "\"주차방해" + "\"" - + ", \"mngItemCn6\":" + "\"4159020240002369" + "\"" - + ", \"fcltSeCd\":" + "null" - + ", \"fcltSeNm\":" + "null" - + ", \"regSeCd\":" + "null" - + ", \"regSeNm\":" + "null" - + ", \"bfAvtsmtYmd\":" + "\"20240412" + "\"" - + ", \"opnSbmsnTermBgngYmd\":" + "\"20240412" + "\"" - + ", \"opnSbmsnTermEndYmd\":" + "\"20240508" + "\"" - + ", \"frstFinScrgAmt\":" + "\"500000" + "\"" - + ", \"rdtRsnSeCd\":" + "null" - + ", \"rdtRsnSeNm\":" + "null" - + ", \"agvtRsnCd\":" + "null" - + ", \"agvtRsnNm\":" + "null" - + ", \"finScrgAmt\":" + "\"500000" + "\"" - + ", \"bfRdtRt\":" + "\"20" + "\"" - + ", \"bfRdtAmt\":" + "\"100000" + "\"" - + ", \"rmCn\":" + "null" - + ", \"rdtRmCn\":" + "null" - + ", \"nhtFrwarSeCd\":" + "null" - + ", \"nhtFrwarSeNm\":" + "null" - + ", \"endYmd\":" + "null" - + ", \"endRsnCn\":" + "null" - + ", \"rcvmtSeNm\":" + "\"수납" + "\"" - + ", \"epayNo\":" + "\"4159022441440452990" + "\"" - + ", \"vtlacBankNm1\":" + "\"농협" + "\"" - + ", \"vrActno1\":" + "\"790253-90-024117" + "\"" - + ", \"vtlacBankNm2\":" + "null" - + ", \"vrActno2\":" + "null" - + ", \"vtlacBankNm3\":" + "null" - + ", \"vrActno3\":" + "null" - + ", \"vtlacBankNm4\":" + "null" - + ", \"vrActno4\":" + "null" - + ", \"vtlacBankNm5\":" + "null" - + ", \"vrActno5\":" + "null" - + ", \"vtlacBankNm6\":" + "null" - + ", \"vrActno6\":" + "null" - + ", \"vtlacBankNm7\":" + "null" - + ", \"vrActno7\":" + "null" - + ", \"vtlacBankNm8\":" + "null" - + ", \"vrActno8\":" + "null" - + ", \"vtlacBankNm9\":" + "null" - + ", \"vrActno9\":" + "null" - + ", \"vtlacBankNm10\":" + "null" - + ", \"vrActno10\":" + "null" - + ", \"vtlacBankNm11\":" + "null" - + ", \"vrActno11\":" + "null" - + ", \"vtlacBankNm12\":" + "null" - + ", \"vrActno12\":" + "null" - + ", \"vtlacBankNm13\":" + "null" - + ", \"vrActno13\":" + "null" - + ", \"vtlacBankNm14\":" + "null" - + ", \"vrActno14\":" + "null" - + ", \"vtlacBankNm15\":" + "null" - + ", \"vrActno15\":" + "null" - + ", \"vtlacBankNm16\":" + "null" - + ", \"vrActno16\":" + "null" - + ", \"vtlacBankNm17\":" + "null" - + ", \"vrActno17\":" + "null" - + ", \"vtlacBankNm18\":" + "null" - + ", \"vrActno18\":" + "null" - + ", \"vtlacBankNm19\":" + "null" - + ", \"vrActno19\":" + "null" - + ", \"vtlacBankNm20\":" + "null" - + ", \"vrActno20\":" + "null" - + ", \"rsveItem1\":" + "\"5530497000020244123417900178200" + "\"" - + ", \"rsveItem2\":" + "null" - + ", \"rsveItem3\":" + "null" - + ", \"rsveItem4\":" + "null" - + ", \"rsveItem5\":" + "null" - + " }" + // Json 파라미터 설정 + try { + sJsonData = "{ " + + " \"taskSeCd\":" + "\"" + a03Rqst.getTaskSeCd() + "\"" + + ", \"msg\":" + mapper.writeValueAsString(a03Rqst) + " }"; -*/ - - try { - JsonNode linkRst = mapper.readTree(resultMsg); - - // 개별시스템 연계결과코드(linkRstCd) - 000:정상, 100:검증오류(연계관리키 중복), 101:검증오류(등록 시 자료 null, 길이체크), 900:필수값누락 - if (linkRst.get("linkRstCd").asText().equals("000")) { - // resVo1 - JsonNode resVo1 = linkRst.findValue("resVo1"); -/* - // 이 설정을 통해 JSON의 모든 데이터를 파싱하는 것이 아닌 내가 필요로 하는 데이터, 즉 내가 필드로 선언한 데이터들만 파싱할 수 있다. - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - A03 a03 = mapper.readValue(resVo1.toString(), A03.class); -*/ - // 발송 대장(TB_SNDNG) - 발송 상세 수정 - SndngDtl sndngDtl = new SndngDtl(); - - sndngDtl.setSndngDtlId(sndngDtlIds.get(iLoop).string("SNDNG_DTL_ID")); // 발송 상세 ID - if (sndngDtlIds.get(iLoop).number("SNDNG_DTL_STTS_CD").intValue() > 3) { - sndngDtl.setSndngDtlSttsCd(sndngDtlIds.get(iLoop).string("SNDNG_DTL_STTS_CD")); // 발송 상태 코드 - } else { - sndngDtl.setSndngDtlSttsCd("02"); // 발송 상태 코드(FIM050) 02:가상계좌취득 - } - sndngDtl.setFyr(resVo1.get("rsveItem1").asText().substring(11, 15)); // 회계연도 - sndngDtl.setLevyNo(resVo1.get("rsveItem1").asText().substring(23, 29)); // 부과 번호 - sndngDtl.setFfnlgAmt(resVo1.get("finScrgAmt").asInt()); // 과태료 금액 - sndngDtl.setPcptax(resVo1.get("finScrgAmt").asInt() - resVo1.get("bfRdtAmt").asInt()); // 본세 - sndngDtl.setAdamt(0); // 가산금 - sndngDtl.setSumAmt(resVo1.get("finScrgAmt").asInt() - resVo1.get("bfRdtAmt").asInt()); // 합계 금액 - sndngDtl.setDudtAftrAmt(0); // 납기 후 금액 - sndngDtl.setTaxNo(resVo1.get("rsveItem1").asText()); // 납세 번호 - sndngDtl.setEpayno(resVo1.get("epayNo").asText()); // 전자납부번호 - sndngDtl.setBankNm(resVo1.get("vtlacBankNm1").asText()); // 은행 명 - sndngDtl.setVrActno(resVo1.get("vrActno1").asText()); // 가상 계좌번호 - sndngDtl.setBankNm2(resVo1.get("vtlacBankNm2").asText()); // 은행 명2 - sndngDtl.setVrActno2(resVo1.get("vrActno2").asText()); // 가상 계좌번호2 - sndngDtl.setBankNm3(resVo1.get("vtlacBankNm3").asText()); // 은행 명3 - sndngDtl.setVrActno3(resVo1.get("vrActno3").asText()); // 가상 계좌번호3 - sndngDtl.setBankNm4(resVo1.get("vtlacBankNm4").asText()); // 은행 명4 - sndngDtl.setVrActno4(resVo1.get("vrActno4").asText()); // 가상 계좌번호4 - sndngDtl.setBankNm5(resVo1.get("vtlacBankNm5").asText()); // 은행 명5 - sndngDtl.setVrActno5(resVo1.get("vrActno5").asText()); // 가상 계좌번호5 - sndngDtl.setBankNm6(resVo1.get("vtlacBankNm6").asText()); // 은행 명6 - sndngDtl.setVrActno6(resVo1.get("vrActno6").asText()); // 가상 계좌번호6 - sndngDtl.setBankNm7(resVo1.get("vtlacBankNm7").asText()); // 은행 명7 - sndngDtl.setVrActno7(resVo1.get("vrActno7").asText()); // 가상 계좌번호7 - sndngDtl.setBankNm8(resVo1.get("vtlacBankNm8").asText()); // 은행 명8 - sndngDtl.setVrActno8(resVo1.get("vrActno8").asText()); // 가상 계좌번호8 - sndngDtl.setBankNm9(resVo1.get("vtlacBankNm9").asText()); // 은행 명9 - sndngDtl.setVrActno9(resVo1.get("vrActno9").asText()); // 가상 계좌번호9 - sndngDtl.setBankNm10(resVo1.get("vtlacBankNm10").asText()); // 은행 명10 - sndngDtl.setVrActno10(resVo1.get("vrActno10").asText()); // 가상 계좌번호10 - sndngDtl.setBankNm(resVo1.get("vtlacBankNm11").asText()); // 은행 명11 - sndngDtl.setVrActno(resVo1.get("vrActno11").asText()); // 가상 계좌번호11 - sndngDtl.setBankNm2(resVo1.get("vtlacBankNm12").asText()); // 은행 명12 - sndngDtl.setVrActno2(resVo1.get("vrActno12").asText()); // 가상 계좌번호12 - sndngDtl.setBankNm3(resVo1.get("vtlacBankNm13").asText()); // 은행 명13 - sndngDtl.setVrActno3(resVo1.get("vrActno13").asText()); // 가상 계좌번호13 - sndngDtl.setBankNm4(resVo1.get("vtlacBankNm14").asText()); // 은행 명14 - sndngDtl.setVrActno4(resVo1.get("vrActno14").asText()); // 가상 계좌번호14 - sndngDtl.setBankNm5(resVo1.get("vtlacBankNm15").asText()); // 은행 명15 - sndngDtl.setVrActno5(resVo1.get("vrActno15").asText()); // 가상 계좌번호15 - sndngDtl.setBankNm6(resVo1.get("vtlacBankNm16").asText()); // 은행 명16 - sndngDtl.setVrActno6(resVo1.get("vrActno16").asText()); // 가상 계좌번호16 - sndngDtl.setBankNm7(resVo1.get("vtlacBankNm17").asText()); // 은행 명17 - sndngDtl.setVrActno7(resVo1.get("vrActno17").asText()); // 가상 계좌번호17 - sndngDtl.setBankNm8(resVo1.get("vtlacBankNm18").asText()); // 은행 명18 - sndngDtl.setVrActno8(resVo1.get("vrActno18").asText()); // 가상 계좌번호18 - sndngDtl.setBankNm9(resVo1.get("vtlacBankNm19").asText()); // 은행 명19 - sndngDtl.setVrActno9(resVo1.get("vrActno19").asText()); // 가상 계좌번호19 - sndngDtl.setBankNm10(resVo1.get("vtlacBankNm20").asText()); // 은행 명20 - sndngDtl.setVrActno10(resVo1.get("vrActno20").asText()); // 가상 계좌번호20 - - rtnScs = sndngDtlMapper.updateSndngDtlNxrpA03(sndngDtl); - if (!rtnScs) { - throw new RuntimeException("세외수입 연계 정보를 발송 상세에 수정하지 못했습니다."); // 예외를 발생시켜서 DB Rollback - } - - // 수납 확인 - if (resVo1.get("rcvmtSeNm").asText().equals("수납")) { - sndngDtl.setSndngDtlSttsCd("09"); // 발송 상세 상태 코드(FIM050) 09:수납 - sndngDtl.setSndngRcvmtCd("1"); // 발송 수납 코드(FIM051) 1:수납 - rtnScs = sndngDtlMapper.updateSndngDtlNxrpA03(sndngDtl); - if (!rtnScs) { - throw new RuntimeException("세외수입 연계 정보를 발송 상세에 수정하지 못했습니다.");// 예외를 발생시켜서 DB Rollback - } - } - - // 부과테이블에 등록 -/* - fData.qryMatch_SetAll.ParamByName('MC_LVY_KEY' ).AsString := TaxElse_Parsing_A03.finScrgAcbKey; //과태료과징금대장키 - fData.qryMatch_SetAll.ParamByName('MC_ACC_YEAR' ).AsString := TaxElse_Parsing_A03.rcptYr; //접수연도 - fData.qryMatch_SetAll.ParamByName('MC_LVY_NO' ).AsString := copy(TaxElse_Parsing_A03.rsveItem1,24,6); //고지번호-예비항목1에서 추출 - - fData.qryMatch_SetAll.ParamByName('MC_ACCOUNT_NO' ).AsString := TaxElse_Parsing_A03.vrActno1; - fData.qryMatch_SetAll.ParamByName('MC_ACCOUNT_NO2' ).AsString := TaxElse_Parsing_A03.vrActno2; - fData.qryMatch_SetAll.ParamByName('MC_ACCOUNT_NO3' ).AsString := TaxElse_Parsing_A03.vrActno3; - fData.qryMatch_SetAll.ParamByName('MC_ACCOUNT_NO4' ).AsString := TaxElse_Parsing_A03.vrActno4; - fData.qryMatch_SetAll.ParamByName('MC_ACCOUNT_NO5' ).AsString := TaxElse_Parsing_A03.vrActno5; - fData.qryMatch_SetAll.ParamByName('MC_ACCOUNT_NO6' ).AsString := TaxElse_Parsing_A03.vrActno6; - fData.qryMatch_SetAll.ParamByName('MC_ACCOUNT_NO7' ).AsString := TaxElse_Parsing_A03.vrActno7; - fData.qryMatch_SetAll.ParamByName('MC_ACCOUNT_NO8' ).AsString := TaxElse_Parsing_A03.vrActno8; - - fData.qryMatch_SetAll.ParamByName('MC_BANK_NM' ).AsString := TaxElse_Parsing_A03.vtlacBankNm1; - fData.qryMatch_SetAll.ParamByName('MC_BANK_NM2' ).AsString := TaxElse_Parsing_A03.vtlacBankNm2; - fData.qryMatch_SetAll.ParamByName('MC_BANK_NM3' ).AsString := TaxElse_Parsing_A03.vtlacBankNm3; - fData.qryMatch_SetAll.ParamByName('MC_BANK_NM4' ).AsString := TaxElse_Parsing_A03.vtlacBankNm4; - fData.qryMatch_SetAll.ParamByName('MC_BANK_NM5' ).AsString := TaxElse_Parsing_A03.vtlacBankNm5; - fData.qryMatch_SetAll.ParamByName('MC_BANK_NM6' ).AsString := TaxElse_Parsing_A03.vtlacBankNm6; - fData.qryMatch_SetAll.ParamByName('MC_BANK_NM7' ).AsString := TaxElse_Parsing_A03.vtlacBankNm7; - fData.qryMatch_SetAll.ParamByName('MC_BANK_NM8' ).AsString := TaxElse_Parsing_A03.vtlacBankNm8; - - fData.qryMatch_SetAll.ParamByName('MC_ERC_NO').AsString := TaxElse_Parsing_A03.epayNo; //전자납부번호 - - fData.qryMatch_SetAll.ParamByName('MC_KEUM_T').AsString := IntToStr(StrToInt(TaxElse_Parsing_A03.finScrgAmt) - StrToInt(TaxElse_Parsing_A03.bfRdtAmt)); - fData.qryMatch_SetAll.ParamByName('MC_KEUM_A').AsString := '0'; - fData.qryMatch_SetAll.ParamByName('MC_KEUM_B').AsString := IntToStr(StrToInt(TaxElse_Parsing_A03.finScrgAmt) - StrToInt(TaxElse_Parsing_A03.bfRdtAmt)); - - fData.qryMatch_SetAll.ParamByName('MC_EDITDT').AsString := FormatDateTime('yyyymmddhhnnss', now); - fData.qryMatch_SetAll.ParamByName('MC_STATE' ).AsString := '2'; //정보등록 완료 - fData.qryMatch_SetAll.ParamByName('MC_MMCODE').AsString := FieldByName('MM_CODE').AsString; - fData.qryMatch_SetAll.ExecSQL; -*/ - - - } - } catch (IOException e) { - throw new RuntimeException("오류."); // 예외를 발생시켜서 DB Rollback - } + } catch (IOException e) { + throw new RuntimeException("세외수입 과태료대장에 전송할 자료 생성중 오류가 발생하였습니다."); // 예외를 발생시켜서 DB Rollback } - rtnMsg = "[S] 작업이 정상 처리 되었습니다."; + // 연계 서비스 호출 후 메세지 return + rtnMsg = callHttpsJson(sUrl, "POST", sJsonData); +/* 테스트 샘플 + rtnMsg = "{ " + + " \"linkRstCd\":" + "\"000" + "\"" + + ", \"linkRstMsg\":" + "\"정상 조회되었습니다." + "\"" + + ", \"resVo1\":" + "{ " + + " \"sgbCd\":" + "\"5530000" + "\"" + + ", \"linkTrgtCd\":" + "\"5530000DPV01001" + "\"" + + ", \"linkMngKey\":" + "\"415902024000236920240412153509" + "\"" + + ", \"finScrgAcbKey\":" + "\"20240009451" + "\"" + + ", \"dptCd\":" + "\"5530497" + "\"" + + ", \"dptNm\":" + "\"장애인복지과" + "\"" + + ", \"rcptYr\":" + "\"2024" + "\"" + + ", \"spacBizCd\":" + "\"0000" + "\"" + + ", \"spacBizNm\":" + "null" + + ", \"actSeCd\":" + "\"41" + "\"" + + ", \"actSeNm\":" + "\"일반회계(시군구세외)" + "\"" + + ", \"rprsTxmCd\":" + "\"234179" + "\"" + + ", \"rprsTxmNm\":" + "\"장애인등편의법위반과태료" + "\"" + + ", \"operItemCd\":" + "\"002" + "\"" + + ", \"operItemNm\":" + "\"장애인전용주차구역주차방해행위과태료" + "\"" + + ", \"regYmd\":" + "\"20240412" + "\"" + + ", \"pyrSeCd\":" + "\"02" + "\"" + + ", \"pyrSeNm\":" + "\"법인" + "\"" + + ", \"pyrNo\":" + "\"1101113634428" + "\"" + + ", \"pyrNm\":" + "\"엔에이치농협캐피탈(주)" + "\"" + + ", \"pyrSttCd\":" + "\"99" + "\"" + + ", \"pyrSttNm\":" + "\"기타" + "\"" + + ", \"pyrZip\":" + "\"42089" + "\"" + + ", \"pyrAddr\":" + "\"대구광역시 수성구 달구벌대로 2532 4층(범어동, 대아빌딩)" + "\"" + + ", \"telno\":" + "null" + + ", \"mblTelno\":" + "null" + + ", \"pyrEmlAddr\":" + "null" + + ", \"vhrno\":" + "null" + + ", \"mngItemCn1\":" + "\"위반일시 : 2024-04-05 17:40" + "\"" + + ", \"mngItemCn2\":" + "null" + + ", \"mngItemCn3\":" + "\"위반장소 : 경기도 화성시 남양읍 활초리 산 62-3 " + "\"" + + ", \"mngItemCn4\":" + "null" + + ", \"mngItemCn5\":" + "\"주차방해" + "\"" + + ", \"mngItemCn6\":" + "\"4159020240002369" + "\"" + + ", \"fcltSeCd\":" + "null" + + ", \"fcltSeNm\":" + "null" + + ", \"regSeCd\":" + "null" + + ", \"regSeNm\":" + "null" + + ", \"bfAvtsmtYmd\":" + "\"20240412" + "\"" + + ", \"opnSbmsnTermBgngYmd\":" + "\"20240412" + "\"" + + ", \"opnSbmsnTermEndYmd\":" + "\"20240508" + "\"" + + ", \"frstFinScrgAmt\":" + "\"500000" + "\"" + + ", \"rdtRsnSeCd\":" + "null" + + ", \"rdtRsnSeNm\":" + "null" + + ", \"agvtRsnCd\":" + "null" + + ", \"agvtRsnNm\":" + "null" + + ", \"finScrgAmt\":" + "\"500000" + "\"" + + ", \"bfRdtRt\":" + "\"20" + "\"" + + ", \"bfRdtAmt\":" + "\"100000" + "\"" + + ", \"rmCn\":" + "null" + + ", \"rdtRmCn\":" + "null" + + ", \"nhtFrwarSeCd\":" + "null" + + ", \"nhtFrwarSeNm\":" + "null" + + ", \"endYmd\":" + "null" + + ", \"endRsnCn\":" + "null" + + ", \"rcvmtSeNm\":" + "\"수납" + "\"" + + ", \"epayNo\":" + "\"4159022441440452990" + "\"" + + ", \"vtlacBankNm1\":" + "\"농협" + "\"" + + ", \"vrActno1\":" + "\"790253-90-024117" + "\"" + + ", \"vtlacBankNm2\":" + "null" + + ", \"vrActno2\":" + "null" + + ", \"vtlacBankNm3\":" + "null" + + ", \"vrActno3\":" + "null" + + ", \"vtlacBankNm4\":" + "null" + + ", \"vrActno4\":" + "null" + + ", \"vtlacBankNm5\":" + "null" + + ", \"vrActno5\":" + "null" + + ", \"vtlacBankNm6\":" + "null" + + ", \"vrActno6\":" + "null" + + ", \"vtlacBankNm7\":" + "null" + + ", \"vrActno7\":" + "null" + + ", \"vtlacBankNm8\":" + "null" + + ", \"vrActno8\":" + "null" + + ", \"vtlacBankNm9\":" + "null" + + ", \"vrActno9\":" + "null" + + ", \"vtlacBankNm10\":" + "null" + + ", \"vrActno10\":" + "null" + + ", \"vtlacBankNm11\":" + "null" + + ", \"vrActno11\":" + "null" + + ", \"vtlacBankNm12\":" + "null" + + ", \"vrActno12\":" + "null" + + ", \"vtlacBankNm13\":" + "null" + + ", \"vrActno13\":" + "null" + + ", \"vtlacBankNm14\":" + "null" + + ", \"vrActno14\":" + "null" + + ", \"vtlacBankNm15\":" + "null" + + ", \"vrActno15\":" + "null" + + ", \"vtlacBankNm16\":" + "null" + + ", \"vrActno16\":" + "null" + + ", \"vtlacBankNm17\":" + "null" + + ", \"vrActno17\":" + "null" + + ", \"vtlacBankNm18\":" + "null" + + ", \"vrActno18\":" + "null" + + ", \"vtlacBankNm19\":" + "null" + + ", \"vrActno19\":" + "null" + + ", \"vtlacBankNm20\":" + "null" + + ", \"vrActno20\":" + "null" + + ", \"rsveItem1\":" + "\"5530497000020244123417900178200" + "\"" + + ", \"rsveItem2\":" + "null" + + ", \"rsveItem3\":" + "null" + + ", \"rsveItem4\":" + "null" + + ", \"rsveItem5\":" + "null" + + " }" + + " }"; +*/ return rtnMsg; } @@ -794,9 +561,9 @@ public class NisIndivBean extends AbstractComponent { returnMsg = response.toString(); } catch (IOException e) { - System.out.println("IOException :" + e); + returnMsg = "IOException :" + e; } catch (Exception e) { - System.out.println("error : " + e); + returnMsg = "Exception :" + e; } finally { if (httpsConn != null) { httpsConn.disconnect(); @@ -896,7 +663,7 @@ public class NisIndivBean extends AbstractComponent { } CmmnQuery cmmnQuery = new CmmnQuery(); - cmmnQuery.setUseYN("Y"); + cmmnQuery.setUseYn("Y"); cmmnQuery.setSggCd(crdnInfo.string("SGG_CD")); cmmnQuery.setTaskSeCd(taskSeCd); DataObject nxrpLinkInfo = taskMapper.selectTaskInfo(cmmnQuery); diff --git a/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivServiceBean.java b/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivServiceBean.java index fa863bd3..e3605bb9 100644 --- a/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivServiceBean.java +++ b/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivServiceBean.java @@ -53,11 +53,6 @@ public class NisIndivServiceBean extends AbstractServiceBean implements NisIndiv return nisIndivBean.getNisIndivA02s(req); } - @Override - public String updateNisIndivA02(NisIndivQuery req) { - return nisIndivBean.updateNisIndivA02(req); - } - @Override public List getNisIndivA03List(NisIndivQuery req) { return nisIndivBean.getNisIndivA03List(req); @@ -68,11 +63,6 @@ public class NisIndivServiceBean extends AbstractServiceBean implements NisIndiv return nisIndivBean.getNisIndivA03s(req); } - @Override - public String updateNisIndivA03(NisIndivQuery req) { - return nisIndivBean.updateNisIndivA03(req); - } - @Override public String createNisIndivB01(NisIndivQuery req) { return nisIndivBean.createNisIndivB01C01(req); diff --git a/src/main/java/cokr/xit/fims/nxrp/service/bean/NxrpMtchgBean.java b/src/main/java/cokr/xit/fims/nxrp/service/bean/NxrpMtchgBean.java index f3fbb0ce..6559dbd9 100644 --- a/src/main/java/cokr/xit/fims/nxrp/service/bean/NxrpMtchgBean.java +++ b/src/main/java/cokr/xit/fims/nxrp/service/bean/NxrpMtchgBean.java @@ -92,7 +92,7 @@ public class NxrpMtchgBean extends AbstractComponent { // 발송상세 대상를 조회 SndbQuery sndbQuery = new SndbQuery(); sndbQuery.setSndngId(req.getSndngId()); - sndbQuery.setDelYN("N"); + sndbQuery.setDelYn("N"); List sndngDtlIds = sndngDtlMapper.selectSndngTrgtDtlIds(sndbQuery); @@ -171,7 +171,7 @@ public class NxrpMtchgBean extends AbstractComponent { for (int iLoop = 0; iLoop < req.getSndngDtlIds().length; iLoop++) { // 세외수입 매칭 내역 정보 조회 DataObject nxrpMtchgInfo = nxrpMtchgMapper.selectNxrpMtchgInfo(new NxrpMtchgQuery().setCrdnId(req.getCrdnIDs()[iLoop]) - .setDelYN("N")); + .setDelYn("N")); // 세외수입 조회 연계 호출 ////////////////////////////////////////////////// diff --git a/src/main/java/cokr/xit/fims/nxrp/web/Nxrp01Controller.java b/src/main/java/cokr/xit/fims/nxrp/web/Nxrp01Controller.java index d01e706d..6e0151c7 100644 --- a/src/main/java/cokr/xit/fims/nxrp/web/Nxrp01Controller.java +++ b/src/main/java/cokr/xit/fims/nxrp/web/Nxrp01Controller.java @@ -65,54 +65,6 @@ public class Nxrp01Controller extends AbstractController { .addObject("rtnMsg", rtnMsg); } - /**과태료 대장 등록 자료 일괄 조회 정보에서 업무 적용 정보를 수정한다. - * @param nisIndivA02 과태료 대장 등록 자료 일괄 조회 정보 - * @return jsonView - * 
     {
-	 *     "saved": 수정되었으면 true, 그렇지 않으면 false
-	 * }
    - */ - @Task - @RequestMapping(name="차세대 세외수입 과태료 대장 등록 자료 일괄 조회", value=METHOD_URL.updateIndividualA02) - public ModelAndView updateIndividualA02(NisIndivQuery req) { - boolean saved = false; - String rtnMsg = nisIndivService.updateNisIndivA02(req); - - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); - } - - /**과태료 대장 등록 자료 상세 조회 정보에서 업무 적용 정보를 수정한다. - * @param req 세외수입 매칭 내역 정보 - * @return jsonView - * 
     {
-	 *     "saved": 등록되었으면 true, 그렇지 않으면 false
-	 * }
    - */ - @Task - @RequestMapping(name="차세대 세외수입 과태료 대장 등록 자료 상세 조회", value=METHOD_URL.updateIndividualA03) - public ModelAndView updateIndividualA03(NisIndivQuery req) { - boolean saved = false; - String rtnMsg = nisIndivService.updateNisIndivA03(req); - - if (rtnMsg.contains("[S]")) { - saved = true; - } else { - saved = false; - } - - return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); - } - /**주정차 과태료 대장 단속 정보 등록를 등록한다. * @param nisIndivB01 주정차 과태료 대장 단속 정보 등록 정보 * @return jsonView 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 a665bc00..9ede85e3 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 @@ -48,8 +48,8 @@ public class RcvmtBean extends AbstractComponent { * @return 수납 대장 목록 */ public List getRcvmtList(RcvmtQuery req) { - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { @@ -68,8 +68,8 @@ public class RcvmtBean extends AbstractComponent { * @return 수납 대장 객체 목록 */ public List getRcvmts(RcvmtQuery req) { - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } if (req.getOrderBy() == null) { req.setOrderBy("R.RCVMT_ID DESC"); @@ -275,7 +275,7 @@ public class RcvmtBean extends AbstractComponent { String rtnMsg = "[F] "; // 처리 결과 메시지 // 수납 ID로 수납 정보 조회 - DataObject rcvmtInfo = rcvmtMapper.selectRcvmtInfo(new RcvmtQuery().setRcvmtId(rcvmt.getRcvmtId()).setDelYN("N")); + DataObject rcvmtInfo = rcvmtMapper.selectRcvmtInfo(new RcvmtQuery().setRcvmtId(rcvmt.getRcvmtId()).setDelYn("N")); rtnScs = rcvmtMapper.updateRcvmtRtrcn(rcvmt); if (!rtnScs) { diff --git a/src/main/java/cokr/xit/fims/rcvm/service/bean/RcvmtServiceBean.java b/src/main/java/cokr/xit/fims/rcvm/service/bean/RcvmtServiceBean.java index d7bf8ebb..ced6dbe6 100644 --- a/src/main/java/cokr/xit/fims/rcvm/service/bean/RcvmtServiceBean.java +++ b/src/main/java/cokr/xit/fims/rcvm/service/bean/RcvmtServiceBean.java @@ -44,8 +44,8 @@ public class RcvmtServiceBean extends AbstractServiceBean implements RcvmtServic if (req.getCallPurpose() == null) { req.setCallPurpose("view"); } - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } if (req.getCallPurpose().equals("create")) { diff --git a/src/main/java/cokr/xit/fims/rcvm/web/Rcvm01Controller.java b/src/main/java/cokr/xit/fims/rcvm/web/Rcvm01Controller.java index 4583146e..885a67f5 100644 --- a/src/main/java/cokr/xit/fims/rcvm/web/Rcvm01Controller.java +++ b/src/main/java/cokr/xit/fims/rcvm/web/Rcvm01Controller.java @@ -115,7 +115,6 @@ public class Rcvm01Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); diff --git a/src/main/java/cokr/xit/fims/rdca/Rdcamt.java b/src/main/java/cokr/xit/fims/rdca/Rdcamt.java index 8b985cda..2808d153 100644 --- a/src/main/java/cokr/xit/fims/rdca/Rdcamt.java +++ b/src/main/java/cokr/xit/fims/rdca/Rdcamt.java @@ -74,7 +74,7 @@ public class Rdcamt extends AbstractEntity { /** * 삭제 여부 */ - private String delYN; + private String delYn; /** * 삭제 사유 diff --git a/src/main/java/cokr/xit/fims/rdca/dao/RdcamtMapper.java b/src/main/java/cokr/xit/fims/rdca/dao/RdcamtMapper.java index 6bf03ae2..c42126d4 100644 --- a/src/main/java/cokr/xit/fims/rdca/dao/RdcamtMapper.java +++ b/src/main/java/cokr/xit/fims/rdca/dao/RdcamtMapper.java @@ -41,8 +41,8 @@ public interface RdcamtMapper extends AbstractMapper { */ default DataObject selectRdcamtInfo(RdcamtQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 기본 정렬 if (req.getOrderBy() == null) { diff --git a/src/main/java/cokr/xit/fims/rdca/service/bean/RdcamtBean.java b/src/main/java/cokr/xit/fims/rdca/service/bean/RdcamtBean.java index ff4654ca..a9d51715 100644 --- a/src/main/java/cokr/xit/fims/rdca/service/bean/RdcamtBean.java +++ b/src/main/java/cokr/xit/fims/rdca/service/bean/RdcamtBean.java @@ -43,8 +43,8 @@ public class RdcamtBean extends AbstractComponent { */ public List getRdcamtList(RdcamtQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { @@ -64,8 +64,8 @@ public class RdcamtBean extends AbstractComponent { */ public List getRdcamts(RdcamtQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } if (req.getOrderBy() == null) { req.setOrderBy("R.RDCAMT_ID DESC"); diff --git a/src/main/java/cokr/xit/fims/rdca/web/Rdca01Controller.java b/src/main/java/cokr/xit/fims/rdca/web/Rdca01Controller.java index 46cde62a..45290821 100644 --- a/src/main/java/cokr/xit/fims/rdca/web/Rdca01Controller.java +++ b/src/main/java/cokr/xit/fims/rdca/web/Rdca01Controller.java @@ -110,7 +110,6 @@ public class Rdca01Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); diff --git a/src/main/java/cokr/xit/fims/sndb/SndbQuery.java b/src/main/java/cokr/xit/fims/sndb/SndbQuery.java index 23cf6d9f..f5985c15 100644 --- a/src/main/java/cokr/xit/fims/sndb/SndbQuery.java +++ b/src/main/java/cokr/xit/fims/sndb/SndbQuery.java @@ -69,7 +69,7 @@ public class SndbQuery extends CmmnQuery { // ETC private String callPurpose; // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정, refresh 재조회). private String delRsn; // 삭제 사유 - private String crdnDelYN; // 단속 삭제 여부 + private String crdnDelYn; // 단속 삭제 여부 public String[] getCrdnIDs() { return ifEmpty(crdnIDs, () -> null); @@ -506,12 +506,12 @@ public class SndbQuery extends CmmnQuery { return self(); } - public String getCrdnDelYN() { - return ifEmpty(crdnDelYN, () -> null); + public String getCrdnDelYn() { + return ifEmpty(crdnDelYn, () -> null); } - public T setCrdnDelYN(String crdnDelYN) { - this.crdnDelYN = crdnDelYN; + public T setCrdnDelYn(String crdnDelYn) { + this.crdnDelYn = crdnDelYn; return self(); } // ETC ///////////////////////////////////////////////////////////////////// diff --git a/src/main/java/cokr/xit/fims/sndb/Sndng.java b/src/main/java/cokr/xit/fims/sndb/Sndng.java index d09c0aa7..0124de00 100644 --- a/src/main/java/cokr/xit/fims/sndb/Sndng.java +++ b/src/main/java/cokr/xit/fims/sndb/Sndng.java @@ -120,12 +120,12 @@ public class Sndng extends AbstractEntity { /** * 재발송 여부 */ - private String resndYN; + private String resndYn; /** * 삭제 여부 */ - private String delYN; + private String delYn; /** * 삭제 사유 diff --git a/src/main/java/cokr/xit/fims/sndb/SndngDtl.java b/src/main/java/cokr/xit/fims/sndb/SndngDtl.java index f6029291..ac4918f5 100644 --- a/src/main/java/cokr/xit/fims/sndb/SndngDtl.java +++ b/src/main/java/cokr/xit/fims/sndb/SndngDtl.java @@ -435,7 +435,7 @@ public class SndngDtl extends AbstractEntity { /** * 삭제 여부 */ - private String delYN; + private String delYn; /** * 삭제 사유 diff --git a/src/main/java/cokr/xit/fims/sndb/Svbtc.java b/src/main/java/cokr/xit/fims/sndb/Svbtc.java index 368f4dca..89f24dff 100644 --- a/src/main/java/cokr/xit/fims/sndb/Svbtc.java +++ b/src/main/java/cokr/xit/fims/sndb/Svbtc.java @@ -65,7 +65,7 @@ public class Svbtc extends AbstractEntity { /** * 삭제 여부 */ - private String delYN; + private String delYn; /** * 삭제 사유 diff --git a/src/main/java/cokr/xit/fims/sndb/dao/SndngDtlMapper.java b/src/main/java/cokr/xit/fims/sndb/dao/SndngDtlMapper.java index 84510e0a..5709bfd1 100644 --- a/src/main/java/cokr/xit/fims/sndb/dao/SndngDtlMapper.java +++ b/src/main/java/cokr/xit/fims/sndb/dao/SndngDtlMapper.java @@ -37,8 +37,8 @@ public interface SndngDtlMapper extends AbstractMapper { default DataObject selectSndngDtlInfo(SndbQuery req) { // 삭제여부 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 기본 정렬 if (req.getOrderBy() == null) { @@ -198,8 +198,8 @@ public interface SndngDtlMapper extends AbstractMapper { */ default DataObject selectSndbkInfo(SndbQuery req) { // 삭제여부 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 기본 정렬 if (req.getOrderBy() == null) { 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 70d4e46e..69b294fd 100644 --- a/src/main/java/cokr/xit/fims/sndb/dao/SndngMapper.java +++ b/src/main/java/cokr/xit/fims/sndb/dao/SndngMapper.java @@ -37,8 +37,8 @@ public interface SndngMapper extends AbstractMapper { default DataObject selectSndngInfo(SndbQuery req) { // 삭제여부 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 기본 정렬 if (req.getOrderBy() == null) { @@ -64,7 +64,7 @@ public interface SndngMapper extends AbstractMapper { default DataObject selectWrngTrgtInfo(String crdnId) { List wrngTrgtInfo = selectWrngTrgts(new SndbQuery().setCrdnId(crdnId) - .setDelYN("N")); + .setDelYn("N")); return !wrngTrgtInfo.isEmpty() ? wrngTrgtInfo.get(0) : null; } @@ -89,7 +89,7 @@ public interface SndngMapper extends AbstractMapper { default DataObject selectAdvntceTrgtInfo(String crdnId) { List InfoSndngTrgt = selectAdvntceTrgts(new SndbQuery().setCrdnId(crdnId) - .setDelYN("N")); + .setDelYn("N")); return !InfoSndngTrgt.isEmpty() ? InfoSndngTrgt.get(0) : null; } diff --git a/src/main/java/cokr/xit/fims/sndb/dao/SvbtcMapper.java b/src/main/java/cokr/xit/fims/sndb/dao/SvbtcMapper.java index dfc1b784..f3c3b266 100644 --- a/src/main/java/cokr/xit/fims/sndb/dao/SvbtcMapper.java +++ b/src/main/java/cokr/xit/fims/sndb/dao/SvbtcMapper.java @@ -40,9 +40,9 @@ public interface SvbtcMapper extends AbstractMapper { * @return 부과제외 대장 객체 */ default DataObject selectSvbtcInfo(SndbQuery req) { - // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + // 삭제 여부 + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 기본 정렬 if (req.getOrderBy() == null) { diff --git a/src/main/java/cokr/xit/fims/sndb/service/SndngDtlService.java b/src/main/java/cokr/xit/fims/sndb/service/SndngDtlService.java index c8ca68ab..7ef7b2bd 100644 --- a/src/main/java/cokr/xit/fims/sndb/service/SndngDtlService.java +++ b/src/main/java/cokr/xit/fims/sndb/service/SndngDtlService.java @@ -65,11 +65,17 @@ public interface SndngDtlService { */ boolean remove(SndngDtl sndngDtl); + /**과태료 대장 단속 정보 등록 정보를 등록한다. + * @param req 발송 상세 조회 조건 + * @return 저장 여부 + */ + String setNxrpIndivA01List(SndngDtl sndngDtl); - - - - + /**지정한 조건에 따라 과태료 대장 등록 자료 상세 조회 목록을 조회하여 반환한다. + * @param req 발송 상세 조회 조건 + * @return 저장 여부 + */ + String getNxrpIndivA03List(SndngDtl sndngDtl); /**지정한 발송상세 ID의 미배달 정보를 반환한다.
    * @param sndngDtlId 발송 상세 ID 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 f4486e62..98ab2825 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 @@ -93,8 +93,8 @@ public class SndngBean extends AbstractComponent { */ public List getSndngList(SndbQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { @@ -114,8 +114,8 @@ public class SndngBean extends AbstractComponent { */ public List getSndngs(SndbQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { @@ -135,8 +135,8 @@ public class SndngBean extends AbstractComponent { */ public List getWrngTrgtList(SndbQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { @@ -156,8 +156,8 @@ public class SndngBean extends AbstractComponent { */ public List getWrngTrgts(SndbQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } if (req.getOrderBy() == null) { req.setOrderBy("CRDN_YMD_TM"); @@ -206,12 +206,12 @@ public class SndngBean extends AbstractComponent { sndng.setSndngRegSeCd("01"); // 발송 등록 구분 코드 - 일괄 } - if (sndng.getResndYN() == null) { - sndng.setResndYN("N"); // 재발송 여부 + if (sndng.getResndYn() == null) { + sndng.setResndYn("N"); // 재발송 여부 } - if (sndng.getDelYN() == null) { - sndng.setDelYN("N"); // 삭제 여부 + if (sndng.getDelYn() == null) { + sndng.setDelYn("N"); // 삭제 여부 } sndng.setSndngSttsCd("00"); // 발송 상태 코드(FIM049) - 00 발송 준비 @@ -290,7 +290,7 @@ public class SndngBean extends AbstractComponent { sndngDtl.setAdamt(0); // 가산금 sndngDtl.setSumAmt(0); // 합계 금액 sndngDtl.setDudtAftrAmt(0); // 납기 후 금액 - sndngDtl.setDelYN("N"); // 삭제 여부 + sndngDtl.setDelYn("N"); // 삭제 여부 rtnScs = sndngDtlMapper.insert(sndngDtl); // 발송 상세 등록 if (!rtnScs) { @@ -325,8 +325,8 @@ public class SndngBean extends AbstractComponent { */ public List getAdvntceTrgtList(SndbQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { @@ -346,8 +346,8 @@ public class SndngBean extends AbstractComponent { */ public List getAdvntceTrgts(SndbQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } if (req.getOrderBy() == null) { req.setOrderBy("CRDN_YMD_TM"); @@ -395,12 +395,12 @@ public class SndngBean extends AbstractComponent { sndng.setSndngRegSeCd("01"); // 발송 등록 구분 코드 - 일괄 } - if (sndng.getResndYN() == null) { - sndng.setResndYN("N"); // 재발송 여부 + if (sndng.getResndYn() == null) { + sndng.setResndYn("N"); // 재발송 여부 } - if (sndng.getDelYN() == null) { - sndng.setDelYN("N"); // 삭제 여부 + if (sndng.getDelYn() == null) { + sndng.setDelYn("N"); // 삭제 여부 } sndng.setSndngSttsCd("00"); // 발송 상태 코드(FIM049) - 00 발송 준비 @@ -561,7 +561,7 @@ public class SndngBean extends AbstractComponent { sndngDtl.setVrActno10(crdnPayerInfo.string("VR_ACTNO10")); // 가상 계좌번호10 sndngDtl.setBankNm11(crdnPayerInfo.string("BANK_NM11")); // 은행 명11 sndngDtl.setVrActno11(crdnPayerInfo.string("VR_ACTNO11")); // 가상 계좌번호11 - sndngDtl.setDelYN("N"); // 삭제 여부 + sndngDtl.setDelYn("N"); // 삭제 여부 rtnScs = sndngDtlMapper.insert(sndngDtl); // 발송 상세 등록 if (!rtnScs) { @@ -645,11 +645,6 @@ public class SndngBean extends AbstractComponent { - - - - - /**전자우편 발송 대장 정보를 등록한다. * @param sndng 발송 대장 * @return 저장 여부 @@ -1045,7 +1040,7 @@ public class SndngBean extends AbstractComponent { // 9. 전자우편 접수 상세 조회 SndbQuery sndbQuery = new SndbQuery(); sndbQuery.setSndngId(sndng.getSndngId()); - sndbQuery.setDelYN("N"); + sndbQuery.setDelYn("N"); List sndngTrgts = sndngDtlMapper.selectSndngTrgtDtlIds(sndbQuery); diff --git a/src/main/java/cokr/xit/fims/sndb/service/bean/SndngDtlBean.java b/src/main/java/cokr/xit/fims/sndb/service/bean/SndngDtlBean.java index 75a06749..bc340a09 100644 --- a/src/main/java/cokr/xit/fims/sndb/service/bean/SndngDtlBean.java +++ b/src/main/java/cokr/xit/fims/sndb/service/bean/SndngDtlBean.java @@ -1,11 +1,15 @@ package cokr.xit.fims.sndb.service.bean; +import java.io.IOException; import java.util.List; import javax.annotation.Resource; import org.springframework.stereotype.Component; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.data.DataObject; @@ -13,6 +17,8 @@ import cokr.xit.fims.sndb.SndngDtl; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.epst.EpostQuery; import cokr.xit.fims.epst.dao.EpostDlvrRsltMapper; +import cokr.xit.fims.nxrp.NisIndivQuery; +import cokr.xit.fims.nxrp.service.bean.NisIndivBean; import cokr.xit.fims.sndb.SndbQuery; import cokr.xit.fims.sndb.dao.SndngDtlMapper; import cokr.xit.fims.sndb.dao.SvbtcMapper; @@ -34,22 +40,26 @@ public class SndngDtlBean extends AbstractComponent { @Resource(name = "sndngDtlMapper") private SndngDtlMapper sndngDtlMapper; - /** 전자우편 배달 결과 정보 DAO */ - @Resource(name = "epostDlvrRsltMapper") - private EpostDlvrRsltMapper epostDlvrRsltMapper; - /** 공시송달 대장 정보 DAO */ @Resource(name = "svbtcMapper") private SvbtcMapper svbtcMapper; + /** 과태료 대장 단속 정보 등록 정보 Bean */ + @Resource(name = "nisIndivBean") + private NisIndivBean nisIndivBean; + + /** 전자우편 배달 결과 정보 DAO */ + @Resource(name = "epostDlvrRsltMapper") + private EpostDlvrRsltMapper epostDlvrRsltMapper; + /**지정한 조건에 따라 발송 상세 목록을 조회하여 반환한다. * @param req 발송 상세 조회 조건 * @return 발송 상세 목록 */ public List getSndngDtlList(SndbQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { @@ -69,8 +79,8 @@ public class SndngDtlBean extends AbstractComponent { */ public List getSndngDtls(SndbQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } if (req.getOrderBy() == null) { req.setOrderBy("SNDNG_DTL_ID"); @@ -120,8 +130,214 @@ public class SndngDtlBean extends AbstractComponent { return sndngDtlMapper.delete(sndngDtl); } + /**발송 상세 정보를 세외수입 과태료대장 단속 정보를 등록한다. + * @param sndngDtl 발송 상세 + * @return 저장 여부 + *
    • 저장됐으면 true
      • + *
    • 그렇지 않으면 false
      • + *
    + */ + public String setNxrpIndivA01List(SndngDtl sndngDtl) { + // 변수 선언 + boolean rtnScs = false; // DB 처리 결과 + String rtnMsg = "[F] "; // 처리 결과 메시지 + + // 발송 상세 상태 코드(SNDNG_DTL_STTS_CD) 가 처리전(00)인 자료만 처리 + if (sndngDtl.getSndngDtlSttsCd().equals("00")) { + NisIndivQuery nisIndivQuery = new NisIndivQuery(); + + nisIndivQuery.setCrdnId(sndngDtl.getCrdnId()); + nisIndivQuery.setSndngDtlId(sndngDtl.getSndngDtlId()); + + String a01Msg = nisIndivBean.createNisIndivA01(nisIndivQuery); + + try { + ObjectMapper mapper = new ObjectMapper(); + JsonNode linkRst = mapper.readTree(a01Msg); + + // 개별시스템 연계결과코드(linkRstCd) - 000:정상, 100:검증오류(연계관리키 중복), 101:검증오류(등록 시 자료 null, 길이체크), 900:필수값누락 + if (linkRst.get("linkRstCd").asText().equals("000")) { + // resVo1 + JsonNode resVo1 = linkRst.findValue("resVo1"); + + // 발송 대장(TB_SNDNG) - 발송 상태 코드(SNDNG_DTL_STTS_CD) 수정 + SndngDtl uptSndngDtl = new SndngDtl(); + uptSndngDtl.setSndngDtlSttsCd("01"); // 발송 상태 코드(FIM050) 01:세외수입부과 + uptSndngDtl.setSndngDtlId(sndngDtl.getSndngDtlId()); // 발송 상세 ID + uptSndngDtl.setLinkTrgtCd(resVo1.get("linkTrgtCd").asText()); // 연계 대상 코드 + uptSndngDtl.setLinkMngKey(resVo1.get("linkMngKey").asText()); // 연계 관리 키 + + rtnScs = sndngDtlMapper.updateSndngDtlSttsCd(uptSndngDtl); + if (!rtnScs) { + throw new RuntimeException("세외수입 과태료대장 연계 정보를 단속 대장에 수정하지 못했습니다."); // 예외를 발생시켜서 DB Rollback + } + } + } catch (IOException e) { + throw new RuntimeException("오류."); // 예외를 발생시켜서 DB Rollback + } + } + rtnMsg = "[S] 작업이 정상 처리 되었습니다."; + + return rtnMsg; + } + + /**발송 상세 정보를 세외수입 과태료대장 상세 조회 정보를 조회하여 발송 상세 정보를 수정한다. + * @param sndngDtl 발송 상세 + * @return 저장 여부 + *
    • 저장됐으면 true
      • + *
    • 그렇지 않으면 false
      • + *
    + */ + public String getNxrpIndivA03List(SndngDtl sndngDtl) { + // 변수 선언 + boolean rtnScs = false; // DB 처리 결과 + String rtnMsg = "[F] "; // 처리 결과 메시지 + + // 발송 상세 상태 코드(SNDNG_DTL_STTS_CD) 가 처리전(00)인 자료만 처리 + if (sndngDtl.getSndngDtlSttsCd().equals("00")) { + NisIndivQuery nisIndivQuery = new NisIndivQuery(); + + nisIndivQuery.setCrdnId(sndngDtl.getCrdnId()); + nisIndivQuery.setSndngDtlId(sndngDtl.getSndngDtlId()); + + String a03Msg = nisIndivBean.createNisIndivA03(nisIndivQuery); + + try { + ObjectMapper mapper = new ObjectMapper(); + JsonNode linkRst = mapper.readTree(a03Msg); + + // 개별시스템 연계결과코드(linkRstCd) - 000:정상, 100:검증오류(연계관리키 중복), 101:검증오류(등록 시 자료 null, 길이체크), 900:필수값누락 + if (linkRst.get("linkRstCd").asText().equals("000")) { + // resVo1 + JsonNode resVo1 = linkRst.findValue("resVo1"); +/* + // 이 설정을 통해 JSON의 모든 데이터를 파싱하는 것이 아닌 내가 필요로 하는 데이터, 즉 내가 필드로 선언한 데이터들만 파싱할 수 있다. + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + A03 a03 = mapper.readValue(resVo1.toString(), A03.class); +*/ + // 발송 대장(TB_SNDNG) - 발송 상세 수정 + SndngDtl uptSndngDtl = new SndngDtl(); + + uptSndngDtl.setSndngDtlId(sndngDtl.getSndngDtlId()); // 발송 상세 ID + if (Integer.valueOf(sndngDtl.getSndngDtlSttsCd()) >= 3) { + uptSndngDtl.setSndngDtlSttsCd(sndngDtl.getSndngDtlSttsCd()); // 발송 상태 코드 + } else { + uptSndngDtl.setSndngDtlSttsCd("02"); // 발송 상태 코드(FIM050) 02:가상계좌취득 + } + uptSndngDtl.setFyr(resVo1.get("rsveItem1").asText().substring(11, 15)); // 회계연도 + uptSndngDtl.setLevyNo(resVo1.get("rsveItem1").asText().substring(23, 29)); // 부과 번호 + uptSndngDtl.setFfnlgAmt(resVo1.get("finScrgAmt").asInt()); // 과태료 금액 + uptSndngDtl.setPcptax(resVo1.get("finScrgAmt").asInt() - resVo1.get("bfRdtAmt").asInt()); // 본세 + uptSndngDtl.setAdamt(0); // 가산금 + uptSndngDtl.setSumAmt(resVo1.get("finScrgAmt").asInt() - resVo1.get("bfRdtAmt").asInt()); // 합계 금액 + uptSndngDtl.setDudtAftrAmt(0); // 납기 후 금액 + uptSndngDtl.setTaxNo(resVo1.get("rsveItem1").asText()); // 납세 번호 + uptSndngDtl.setEpayno(resVo1.get("epayNo").asText()); // 전자납부번호 + uptSndngDtl.setBankNm(resVo1.get("vtlacBankNm1").asText()); // 은행 명 + uptSndngDtl.setVrActno(resVo1.get("vrActno1").asText()); // 가상 계좌번호 + uptSndngDtl.setBankNm2(resVo1.get("vtlacBankNm2").asText()); // 은행 명2 + uptSndngDtl.setVrActno2(resVo1.get("vrActno2").asText()); // 가상 계좌번호2 + uptSndngDtl.setBankNm3(resVo1.get("vtlacBankNm3").asText()); // 은행 명3 + uptSndngDtl.setVrActno3(resVo1.get("vrActno3").asText()); // 가상 계좌번호3 + uptSndngDtl.setBankNm4(resVo1.get("vtlacBankNm4").asText()); // 은행 명4 + uptSndngDtl.setVrActno4(resVo1.get("vrActno4").asText()); // 가상 계좌번호4 + uptSndngDtl.setBankNm5(resVo1.get("vtlacBankNm5").asText()); // 은행 명5 + uptSndngDtl.setVrActno5(resVo1.get("vrActno5").asText()); // 가상 계좌번호5 + uptSndngDtl.setBankNm6(resVo1.get("vtlacBankNm6").asText()); // 은행 명6 + uptSndngDtl.setVrActno6(resVo1.get("vrActno6").asText()); // 가상 계좌번호6 + uptSndngDtl.setBankNm7(resVo1.get("vtlacBankNm7").asText()); // 은행 명7 + uptSndngDtl.setVrActno7(resVo1.get("vrActno7").asText()); // 가상 계좌번호7 + uptSndngDtl.setBankNm8(resVo1.get("vtlacBankNm8").asText()); // 은행 명8 + uptSndngDtl.setVrActno8(resVo1.get("vrActno8").asText()); // 가상 계좌번호8 + uptSndngDtl.setBankNm9(resVo1.get("vtlacBankNm9").asText()); // 은행 명9 + uptSndngDtl.setVrActno9(resVo1.get("vrActno9").asText()); // 가상 계좌번호9 + uptSndngDtl.setBankNm10(resVo1.get("vtlacBankNm10").asText()); // 은행 명10 + uptSndngDtl.setVrActno10(resVo1.get("vrActno10").asText()); // 가상 계좌번호10 + uptSndngDtl.setBankNm(resVo1.get("vtlacBankNm11").asText()); // 은행 명11 + uptSndngDtl.setVrActno(resVo1.get("vrActno11").asText()); // 가상 계좌번호11 + uptSndngDtl.setBankNm2(resVo1.get("vtlacBankNm12").asText()); // 은행 명12 + uptSndngDtl.setVrActno2(resVo1.get("vrActno12").asText()); // 가상 계좌번호12 + uptSndngDtl.setBankNm3(resVo1.get("vtlacBankNm13").asText()); // 은행 명13 + uptSndngDtl.setVrActno3(resVo1.get("vrActno13").asText()); // 가상 계좌번호13 + uptSndngDtl.setBankNm4(resVo1.get("vtlacBankNm14").asText()); // 은행 명14 + uptSndngDtl.setVrActno4(resVo1.get("vrActno14").asText()); // 가상 계좌번호14 + uptSndngDtl.setBankNm5(resVo1.get("vtlacBankNm15").asText()); // 은행 명15 + uptSndngDtl.setVrActno5(resVo1.get("vrActno15").asText()); // 가상 계좌번호15 + uptSndngDtl.setBankNm6(resVo1.get("vtlacBankNm16").asText()); // 은행 명16 + uptSndngDtl.setVrActno6(resVo1.get("vrActno16").asText()); // 가상 계좌번호16 + uptSndngDtl.setBankNm7(resVo1.get("vtlacBankNm17").asText()); // 은행 명17 + uptSndngDtl.setVrActno7(resVo1.get("vrActno17").asText()); // 가상 계좌번호17 + uptSndngDtl.setBankNm8(resVo1.get("vtlacBankNm18").asText()); // 은행 명18 + uptSndngDtl.setVrActno8(resVo1.get("vrActno18").asText()); // 가상 계좌번호18 + uptSndngDtl.setBankNm9(resVo1.get("vtlacBankNm19").asText()); // 은행 명19 + uptSndngDtl.setVrActno9(resVo1.get("vrActno19").asText()); // 가상 계좌번호19 + uptSndngDtl.setBankNm10(resVo1.get("vtlacBankNm20").asText()); // 은행 명20 + uptSndngDtl.setVrActno10(resVo1.get("vrActno20").asText()); // 가상 계좌번호20 + + rtnScs = sndngDtlMapper.updateSndngDtlNxrpA03(uptSndngDtl); + if (!rtnScs) { + throw new RuntimeException("세외수입 연계 정보를 발송 상세에 수정하지 못했습니다."); // 예외를 발생시켜서 DB Rollback + } + + // 수납 정보 확인하여 발송 대장(TB_SNDNG) - 발송 상태 코드(SNDNG_DTL_STTS_CD) 수정 + if (resVo1.get("rcvmtSeNm").asText().equals("수납")) { + uptSndngDtl.setSndngDtlSttsCd("09"); // 발송 상세 상태 코드(FIM050) 09:수납 + uptSndngDtl.setSndngRcvmtCd("1"); // 발송 수납 코드(FIM051) 1:수납 + + rtnScs = sndngDtlMapper.updateSndngDtlSttsCd(uptSndngDtl); + if (!rtnScs) { + throw new RuntimeException("세외수입 연계 정보를 발송 상세에 수정하지 못했습니다.");// 예외를 발생시켜서 DB Rollback + } + } + + // 부과테이블에 등록 +/* + fData.qryMatch_SetAll.ParamByName('MC_LVY_KEY' ).AsString := TaxElse_Parsing_A03.finScrgAcbKey; //과태료과징금대장키 + fData.qryMatch_SetAll.ParamByName('MC_ACC_YEAR' ).AsString := TaxElse_Parsing_A03.rcptYr; //접수연도 + fData.qryMatch_SetAll.ParamByName('MC_LVY_NO' ).AsString := copy(TaxElse_Parsing_A03.rsveItem1,24,6); //고지번호-예비항목1에서 추출 + + fData.qryMatch_SetAll.ParamByName('MC_ACCOUNT_NO' ).AsString := TaxElse_Parsing_A03.vrActno1; + fData.qryMatch_SetAll.ParamByName('MC_ACCOUNT_NO2' ).AsString := TaxElse_Parsing_A03.vrActno2; + fData.qryMatch_SetAll.ParamByName('MC_ACCOUNT_NO3' ).AsString := TaxElse_Parsing_A03.vrActno3; + fData.qryMatch_SetAll.ParamByName('MC_ACCOUNT_NO4' ).AsString := TaxElse_Parsing_A03.vrActno4; + fData.qryMatch_SetAll.ParamByName('MC_ACCOUNT_NO5' ).AsString := TaxElse_Parsing_A03.vrActno5; + fData.qryMatch_SetAll.ParamByName('MC_ACCOUNT_NO6' ).AsString := TaxElse_Parsing_A03.vrActno6; + fData.qryMatch_SetAll.ParamByName('MC_ACCOUNT_NO7' ).AsString := TaxElse_Parsing_A03.vrActno7; + fData.qryMatch_SetAll.ParamByName('MC_ACCOUNT_NO8' ).AsString := TaxElse_Parsing_A03.vrActno8; + + fData.qryMatch_SetAll.ParamByName('MC_BANK_NM' ).AsString := TaxElse_Parsing_A03.vtlacBankNm1; + fData.qryMatch_SetAll.ParamByName('MC_BANK_NM2' ).AsString := TaxElse_Parsing_A03.vtlacBankNm2; + fData.qryMatch_SetAll.ParamByName('MC_BANK_NM3' ).AsString := TaxElse_Parsing_A03.vtlacBankNm3; + fData.qryMatch_SetAll.ParamByName('MC_BANK_NM4' ).AsString := TaxElse_Parsing_A03.vtlacBankNm4; + fData.qryMatch_SetAll.ParamByName('MC_BANK_NM5' ).AsString := TaxElse_Parsing_A03.vtlacBankNm5; + fData.qryMatch_SetAll.ParamByName('MC_BANK_NM6' ).AsString := TaxElse_Parsing_A03.vtlacBankNm6; + fData.qryMatch_SetAll.ParamByName('MC_BANK_NM7' ).AsString := TaxElse_Parsing_A03.vtlacBankNm7; + fData.qryMatch_SetAll.ParamByName('MC_BANK_NM8' ).AsString := TaxElse_Parsing_A03.vtlacBankNm8; + + fData.qryMatch_SetAll.ParamByName('MC_ERC_NO').AsString := TaxElse_Parsing_A03.epayNo; //전자납부번호 + + fData.qryMatch_SetAll.ParamByName('MC_KEUM_T').AsString := IntToStr(StrToInt(TaxElse_Parsing_A03.finScrgAmt) - StrToInt(TaxElse_Parsing_A03.bfRdtAmt)); + fData.qryMatch_SetAll.ParamByName('MC_KEUM_A').AsString := '0'; + fData.qryMatch_SetAll.ParamByName('MC_KEUM_B').AsString := IntToStr(StrToInt(TaxElse_Parsing_A03.finScrgAmt) - StrToInt(TaxElse_Parsing_A03.bfRdtAmt)); + + fData.qryMatch_SetAll.ParamByName('MC_EDITDT').AsString := FormatDateTime('yyyymmddhhnnss', now); + fData.qryMatch_SetAll.ParamByName('MC_STATE' ).AsString := '2'; //정보등록 완료 + fData.qryMatch_SetAll.ParamByName('MC_MMCODE').AsString := FieldByName('MM_CODE').AsString; + fData.qryMatch_SetAll.ExecSQL; +*/ + + + } + } catch (IOException e) { + throw new RuntimeException("오류."); // 예외를 발생시켜서 DB Rollback + } + } + rtnMsg = "[S] 작업이 정상 처리 되었습니다."; + + return rtnMsg; + } @@ -301,7 +517,7 @@ public class SndngDtlBean extends AbstractComponent { // 반송 내역 조회 SndbQuery req = new SndbQuery(); req.setSndngDtlId(sndngDtl.getSndngDtlId()); - req.setDelYN("N"); + req.setDelYn("N"); DataObject sndbkInfo = sndngDtlMapper.selectSndbkInfo(req); diff --git a/src/main/java/cokr/xit/fims/sndb/service/bean/SndngDtlServiceBean.java b/src/main/java/cokr/xit/fims/sndb/service/bean/SndngDtlServiceBean.java index cf7b30f5..2328e2ad 100644 --- a/src/main/java/cokr/xit/fims/sndb/service/bean/SndngDtlServiceBean.java +++ b/src/main/java/cokr/xit/fims/sndb/service/bean/SndngDtlServiceBean.java @@ -65,6 +65,16 @@ public class SndngDtlServiceBean extends AbstractServiceBean implements SndngDtl return sndngDtlBean.remove(sndngDtl); } + @Override + public String setNxrpIndivA01List(SndngDtl sndngDtl) { + return sndngDtlBean.setNxrpIndivA01List(sndngDtl); + } + + @Override + public String getNxrpIndivA03List(SndngDtl sndngDtl) { + return sndngDtlBean.getNxrpIndivA03List(sndngDtl); + } + @@ -111,12 +121,12 @@ public class SndngDtlServiceBean extends AbstractServiceBean implements SndngDtl @Override public String removeSvbtcEach(Svbtc svbtc) { // 변수 선언 - String retMessage = ""; // 처리 결과 메시지 + String rtnMsg = ""; // 처리 결과 메시지 // 공시송달 IDs 건수를 확인하여 1건이하면.. 종료 if (svbtc.getSndngDtlIds().length < 1) { - retMessage = "작업 중 선택 자료가 존재하지 않습니다."; - return retMessage; + rtnMsg = "작업 중 선택 자료가 존재하지 않습니다."; + return rtnMsg; } // 공시송달 IDs 만큼 반복.. @@ -128,8 +138,8 @@ public class SndngDtlServiceBean extends AbstractServiceBean implements SndngDtl sndngDtl.setSvbtcId(svbtc.getSvbtcId()); sndngDtl.setSndngDtlSttsCd("05"); - retMessage = sndngDtlBean.removeSndngDtlSvbtc(sndngDtl); - if (retMessage.contains("[F]")) { + rtnMsg = sndngDtlBean.removeSndngDtlSvbtc(sndngDtl); + if (rtnMsg.contains("[F]")) { throw new RuntimeException("발송상세 대장에 공시송달 정보 수정에 실패하였습니다."); // 예외를 발생시켜서 DB Rollback } } @@ -138,7 +148,7 @@ public class SndngDtlServiceBean extends AbstractServiceBean implements SndngDtl int svbtcTnocs = sndngDtlBean.selectTnocsSndngDtlSvbtc(svbtc.getSvbtcId()); if (svbtcTnocs == 0) { // 총건수가 0건이라면 공시송달 대장에서 삭제 - retMessage = svbtcBean.removeSvbtc(svbtc); + rtnMsg = svbtcBean.removeSvbtc(svbtc); } else { // 총건수를 확인하여 공시송달 대장에서 수정 // 공시송달 정보 호출 DataObject svbtcInfo = svbtcBean.getSvbtcInfo(new SndbQuery().setSvbtcId(svbtc.getSvbtcId())); @@ -152,17 +162,17 @@ public class SndngDtlServiceBean extends AbstractServiceBean implements SndngDtl mdfSvbtc.setTnocs(svbtcTnocs); mdfSvbtc.setSvbtcId(svbtc.getSvbtcId()); - retMessage = svbtcBean.update(mdfSvbtc); + rtnMsg = svbtcBean.update(mdfSvbtc); } // 오류가 발생하였으면 종료.. - if (retMessage.contains("[F]")) { - return retMessage; + if (rtnMsg.contains("[F]")) { + return rtnMsg; } - retMessage = "[S] 작업이 정상 처리 되었습니다."; + rtnMsg = "[S] 작업이 정상 처리 되었습니다."; - return retMessage; + return rtnMsg; } } diff --git a/src/main/java/cokr/xit/fims/sndb/service/bean/SvbtcBean.java b/src/main/java/cokr/xit/fims/sndb/service/bean/SvbtcBean.java index a65ee5d2..0bd142f8 100644 --- a/src/main/java/cokr/xit/fims/sndb/service/bean/SvbtcBean.java +++ b/src/main/java/cokr/xit/fims/sndb/service/bean/SvbtcBean.java @@ -44,8 +44,8 @@ public class SvbtcBean extends AbstractComponent { */ public List getSvbtcList(SndbQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } // 정렬 확인 if (req.getOrderBy() == null) { @@ -65,8 +65,8 @@ public class SvbtcBean extends AbstractComponent { */ public List getSvbtcs(SndbQuery req) { // 삭제 여부 확인 - if (req.getDelYN() == null) { - req.setDelYN("N"); + if (req.getDelYn() == null) { + req.setDelYn("N"); } if (req.getOrderBy() == null) { req.setOrderBy("SV.SVBTC_ID"); 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 ec554cc2..752e3fc4 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -89,6 +89,8 @@ public class Sndb01Controller extends ApplicationController { , getAdvanceNoticeSendingList = "/070/list.do" // 사전통지발송 대상 목록 조회 , getAdvanceNoticeSendingDetailInfo = "/080/info.do" // 사전통지발송 현황 상세 화면 , getAdvanceNoticeSendingDetailList = "/080/list.do" // 사전통지발송 현황 상세 목록 조회 + , setNonTaxReceiptIndividualA01List = "/080/nxrpA01List.do" // 과태료 대장 단속 정보 등록(실시간) A01 + , getNonTaxReceiptIndividualA03List = "/080/nxrpA03List.do" // 과태료 대장 등록 자료 상세 조회(실시간) A03 , createSendingLink = "/080/createSndngLink.do" // 사전통지발송 현황 상세 목록의 우편통합 발송 연계 등록 , makeAdvntcePdf = "/080/makeAdvntcePdf.do" // 사전통지발송 현황 사전통지서 출력(PDF) , makeAdvntceOutsourcing = "/080/makeAdvntceOutsourcing.do" // 사전통지발송 현황 사전통지서 출력(외주파일) @@ -223,7 +225,6 @@ public class Sndb01Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); @@ -377,7 +378,6 @@ public class Sndb01Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); @@ -464,7 +464,6 @@ public class Sndb01Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); @@ -565,7 +564,6 @@ public class Sndb01Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); @@ -720,7 +718,6 @@ public class Sndb01Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); @@ -807,7 +804,6 @@ public class Sndb01Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); @@ -859,6 +855,47 @@ public class Sndb01Controller extends ApplicationController { } } + /**과태료 대장 단속 정보 등록를 등록한다. + * @param nisIndivA01 과태료 대장 단속 정보 등록 정보 + * @return jsonView + * 
     {
+	 *     "saved": 등록되었으면 true, 그렇지 않으면 false
+	 * }
    + */ + @Task({"ECA","DPV","PES","DVS"}) + @RequestMapping(name="차세대 세외수입 과태료 대장 단속 정보 등록", value=METHOD_URL.setNonTaxReceiptIndividualA01List) + public ModelAndView setNonTaxReceiptIndividualA01List(SndbQuery req) { + boolean saved = false; + String rtnMsg = "[F]"; + + List dtlList = sndngDtlService.getSndngTrgtDtlIds(req); + + // 발송상세 Ids 만큼 반복.. + for (int iLoop = 0; iLoop < dtlList.size(); iLoop++) { + SndngDtl sndngDtl = new SndngDtl(); + + sndngDtl.setSndngDtlId(dtlList.get(iLoop).string("SNDNG_DTL_ID")); + sndngDtl.setCrdnId(dtlList.get(iLoop).string("CRDN_ID")); + sndngDtl.setLinkTrgtCd(dtlList.get(iLoop).string("LINK_TRGT_CD")); + sndngDtl.setLinkMngKey(dtlList.get(iLoop).string("LINK_MNG_KEY")); + sndngDtl.setSndngDtlSttsCd(dtlList.get(iLoop).string("SNDNG_DTL_STTS_CD")); + sndngDtl.setDelYn("N"); + + rtnMsg = sndngDtlService.setNxrpIndivA01List(sndngDtl); + if (rtnMsg.contains("[S]")) { + saved = true; + } else { + saved = false; + } + } + + return new ModelAndView("jsonView") + .addObject("saved", saved) + .addObject("rtnMsg", rtnMsg); + } + + + /**고지서 발송 현황 메인화면(sndb/sndb01/090-main)을 연다. * * @return /sndb/sndb01/090-main @@ -908,7 +945,6 @@ public class Sndb01Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); @@ -995,7 +1031,6 @@ public class Sndb01Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); @@ -1157,7 +1192,6 @@ public class Sndb01Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); @@ -1389,7 +1423,6 @@ public class Sndb01Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); @@ -1474,7 +1507,6 @@ public class Sndb01Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); diff --git a/src/main/java/cokr/xit/fims/sprt/CvlcptDscsn.java b/src/main/java/cokr/xit/fims/sprt/CvlcptDscsn.java index 89c16cad..9d53a346 100644 --- a/src/main/java/cokr/xit/fims/sprt/CvlcptDscsn.java +++ b/src/main/java/cokr/xit/fims/sprt/CvlcptDscsn.java @@ -75,7 +75,7 @@ public class CvlcptDscsn extends AbstractEntity { /** * 삭제 여부 */ - private String delYN; + private String delYn; /** * 삭제 사유 diff --git a/src/main/java/cokr/xit/fims/sprt/CvlcptDscsnQuery.java b/src/main/java/cokr/xit/fims/sprt/CvlcptDscsnQuery.java index 80208b3b..88ff8145 100644 --- a/src/main/java/cokr/xit/fims/sprt/CvlcptDscsnQuery.java +++ b/src/main/java/cokr/xit/fims/sprt/CvlcptDscsnQuery.java @@ -42,7 +42,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { // ETC private String callPurpose; // 자료 조회시 호출용도. (view 조회, create 등록, update 수정, refresh 재조회) - private String delYn; // 삭제 여부 private String delRsn; // 삭제 사유 public String getCvlcptDscsnId() { @@ -51,7 +50,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setCvlcptDscsnId(String cvlcptDscsnId) { this.cvlcptDscsnId = cvlcptDscsnId; - return self(); } @@ -61,7 +59,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setCvlcptDscsnIDs(String... cvlcptDscsnIDs) { this.cvlcptDscsnIDs = cvlcptDscsnIDs; - return self(); } @@ -71,7 +68,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setCrdnId(String crdnId) { this.crdnId = crdnId; - return self(); } @@ -81,7 +77,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setSchDscsnYmdFrom(String schDscsnYmdFrom) { this.schDscsnYmdFrom = schDscsnYmdFrom; - return self(); } @@ -91,7 +86,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setSchDscsnYmdTo(String schDscsnYmdTo) { this.schDscsnYmdTo = schDscsnYmdTo; - return self(); } @@ -101,7 +95,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setSchVhrno(String schVhrno) { this.schVhrno = schVhrno; - return self(); } @@ -111,7 +104,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setSchCvlprNm(String schCvlprNm) { this.schCvlprNm = schCvlprNm; - return self(); } @@ -121,7 +113,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setSchRtpyrNo(String schRtpyrNo) { this.schRtpyrNo = schRtpyrNo; - return self(); } @@ -136,7 +127,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setInquiryCondition(String inquiryCondition) { this.inquiryCondition = inquiryCondition; - return self(); } @@ -146,7 +136,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setCvlcptRcptSeCd(String cvlcptRcptSeCd) { this.cvlcptRcptSeCd = cvlcptRcptSeCd; - return self(); } @@ -156,7 +145,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setVhrno(String vhrno) { this.vhrno = vhrno; - return self(); } @@ -166,7 +154,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setRtpyrNo(String rtpyrNo) { this.rtpyrNo = rtpyrNo; - return self(); } @@ -176,7 +163,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setDscsnYmd(String dscsnYmd) { this.dscsnYmd = dscsnYmd; - return self(); } @@ -186,7 +172,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setWeekNm(String weekNm) { this.weekNm = weekNm; - return self(); } @@ -196,7 +181,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setCvlprNm(String cvlprNm) { this.cvlprNm = cvlprNm; - return self(); } @@ -206,7 +190,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setCvlprCttpc(String cvlprCttpc) { this.cvlprCttpc = cvlprCttpc; - return self(); } @@ -216,7 +199,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setDscsnCn(String dscsnCn) { this.dscsnCn = dscsnCn; - return self(); } // 동적 검색 조건 /////////////////////////////////////////////////////////////// @@ -228,17 +210,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setCallPurpose(String callPurpose) { this.callPurpose = callPurpose; - - return self(); - } - - public String getDelYn() { - return ifEmpty(delYn, () -> null); - } - - public T setDelYn(String delYn) { - this.delYn = delYn; - return self(); } @@ -248,7 +219,6 @@ public class CvlcptDscsnQuery extends CmmnQuery { public T setDelRsn(String delRsn) { this.delRsn = delRsn; - return self(); } // ETC ///////////////////////////////////////////////////////////////////// diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java index 51935eae..4037466c 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -228,7 +228,6 @@ public class Sprt01Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); @@ -699,7 +698,7 @@ public class Sprt01Controller extends ApplicationController { DataObject first = dataObjectList0.get(0); sndng.setTtlNm(first.string("TASK_SE_NM")+" "+first.string("VLTN_ARTCL")+" "+"사전통지서"); - sndng.setResndYN("N"); + sndng.setResndYn("N"); String insertSndngResult = sndngBean.createAdvntceSndngList(sndbQuery, sndng); if(insertSndngResult.contains("[F]")) { throw new RuntimeException(insertSndngResult); @@ -811,7 +810,7 @@ public class Sprt01Controller extends ApplicationController { DataObject first = dataObjectList0.get(0); sndng.setTtlNm(first.string("TASK_SE_NM")+" "+first.string("VLTN_ARTCL")+" "+"사전통지서"); - sndng.setResndYN("N"); + sndng.setResndYn("N"); String insertSndngResult = sndngBean.createAdvntceSndngList(sndbQuery, sndng); if(insertSndngResult.contains("[F]")) { throw new RuntimeException(insertSndngResult); @@ -930,7 +929,7 @@ public class Sprt01Controller extends ApplicationController { DataObject first = dataObjectList0.get(0); sndng.setTtlNm(first.string("TASK_SE_NM")+" "+first.string("VLTN_ARTCL")+" "+"고지서"); - sndng.setResndYN("N"); + sndng.setResndYn("N"); String insertSndngResult = sndngBean.createAdvntceSndngList(sndbQuery, sndng); if(insertSndngResult.contains("[F]")) { throw new RuntimeException(insertSndngResult); @@ -1042,7 +1041,7 @@ public class Sprt01Controller extends ApplicationController { DataObject first = dataObjectList0.get(0); sndng.setTtlNm(first.string("TASK_SE_NM")+" "+first.string("VLTN_ARTCL")+" "+"고지서"); - sndng.setResndYN("N"); + sndng.setResndYn("N"); String insertSndngResult = sndngBean.createAdvntceSndngList(sndbQuery, sndng); if(insertSndngResult.contains("[F]")) { throw new RuntimeException(insertSndngResult); 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 a6777971..4bd63d83 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java @@ -182,7 +182,7 @@ public class Sprt02Controller extends ApplicationController { exclQuery.setCallPurpose(req.getCallPurpose()); } exclQuery.setCrdnId(req.getCrdnId()); - exclQuery.setDelYN(req.getDelYN()); + exclQuery.setDelYn(req.getDelYn()); // 의견 제출(TB_OPNN_SBMSN) 대장 조회 DataObject opnnSbmsn = opnnSbmsnService.getOpnnSbmsnInfo(exclQuery); @@ -224,14 +224,14 @@ public class Sprt02Controller extends ApplicationController { sndbQuery.setCallPurpose(req.getCallPurpose()); } sndbQuery.setCrdnId(req.getCrdnId()); - sndbQuery.setDelYN(req.getDelYN()); + sndbQuery.setDelYn(req.getDelYn()); sndbQuery.setOrderBy("SD.REG_DT, SD.SNDNG_DTL_ID DESC"); List sndngDtl = sndngDtlService.getSndngDtls(sndbQuery); // 공시송달 정보 sndbQuery.setCrdnId(req.getCrdnId()); - sndbQuery.setDelYN(req.getDelYN()); + sndbQuery.setDelYn(req.getDelYn()); sndbQuery.setOrderBy("SV.REG_DT DESC, SV.SVBTC_ID DESC"); List svbtc = svbtcService.getSvbtcDtls(sndbQuery); @@ -274,7 +274,7 @@ public class Sprt02Controller extends ApplicationController { levyQuery.setCallPurpose(req.getCallPurpose()); } levyQuery.setCrdnId(req.getCrdnId()); - levyQuery.setDelYN(req.getDelYN()); + levyQuery.setDelYn(req.getDelYn()); levyQuery.setOrderBy("RDUCT_ID DESC"); // 정렬 DataObject rduct = rductService.getRductInfo(levyQuery); @@ -288,7 +288,7 @@ public class Sprt02Controller extends ApplicationController { exclQuery.setCallPurpose(req.getCallPurpose()); } exclQuery.setCrdnId(req.getCrdnId()); - exclQuery.setDelYN(req.getDelYN()); + exclQuery.setDelYn(req.getDelYn()); exclQuery.setOrderBy("LEVY_EXCL_ID DESC"); // 정렬 DataObject levyExcl = levyExclService.getLevyExclInfo(exclQuery); @@ -347,7 +347,7 @@ public class Sprt02Controller extends ApplicationController { levyQuery.setCallPurpose(req.getCallPurpose()); } levyQuery.setCrdnId(req.getCrdnId()); - levyQuery.setDelYN(req.getDelYN()); + levyQuery.setDelYn(req.getDelYn()); levyQuery.setOrderBy("LEVY_ID DESC"); // 정렬 DataObject levy = levyService.getLevyInfo(levyQuery); @@ -389,7 +389,7 @@ public class Sprt02Controller extends ApplicationController { rcvmtQuery.setCallPurpose(req.getCallPurpose()); } rcvmtQuery.setCrdnId(req.getCrdnId()); - rcvmtQuery.setDelYN(req.getDelYN()); + rcvmtQuery.setDelYn(req.getDelYn()); rcvmtQuery.setOrderBy("R.RCVMT_ID DESC"); List rcvmt = rcvmtService.getRcvmts(rcvmtQuery); diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java index 6da4efbd..f594669c 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java @@ -115,8 +115,6 @@ public class Sprt04Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(new Style().alignment(HorizontalAlignment.CENTER)); - CellStyle left = format.cellStyle(new Style().alignment(HorizontalAlignment.LEFT)); - CellStyle numeric = format.n_nn0(); CellStyle dateYMD = format.yyyy_mm_dd(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); diff --git a/src/main/java/cokr/xit/fims/stat/service/bean/StatServiceBean.java b/src/main/java/cokr/xit/fims/stat/service/bean/StatServiceBean.java index fb1d3092..07e69503 100644 --- a/src/main/java/cokr/xit/fims/stat/service/bean/StatServiceBean.java +++ b/src/main/java/cokr/xit/fims/stat/service/bean/StatServiceBean.java @@ -167,8 +167,7 @@ public class StatServiceBean extends AbstractServiceBean implements StatService CrdnSttsHstryQuery crdnSttsHstryQuery = new CrdnSttsHstryQuery(); crdnSttsHstryQuery.setSggCd(statQuery.getSggCd()); crdnSttsHstryQuery.setTaskSeCd(statQuery.getTaskSeCd()); - - crdnSttsHstryQuery.setUseYN("Y"); + crdnSttsHstryQuery.setUseYn("Y"); if(daySetting) { statBean.daySetting(crdnSttsHstryQuery, crdnSttsHstryQuery.getClass().getSimpleName(), dayColumn, firstDay, lastDay); diff --git a/src/main/resources/sql/mapper/fims/cmmn/crdnSttsHstry-mapper.xml b/src/main/resources/sql/mapper/fims/cmmn/crdnSttsHstry-mapper.xml index 5faa6783..c4ec5c79 100644 --- a/src/main/resources/sql/mapper/fims/cmmn/crdnSttsHstry-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cmmn/crdnSttsHstry-mapper.xml @@ -14,7 +14,7 @@ - + @@ -57,8 +57,8 @@ AND CSH.CRDN_ID = #{crdnId} - - AND CSH.USE_YN = #{useYN} + + AND CSH.USE_YN = #{useYn} AND SUBSTR(CSH.REG_DT,1,8) = ]]> #{schDateFrom} @@ -81,8 +81,8 @@ AND CSH.CRDN_STTS_CD = #{crdnSttsCd} - - AND CSH.USE_YN = #{useYN} + + AND CSH.USE_YN = #{useYn} @@ -117,7 +117,7 @@ , #{crdnSttsHstry.crdnSttsCd} /* 단속 상태 코드 */ , #{crdnSttsHstry.taskDtlId} /* 업무 상세 ID */ , #{crdnSttsHstry.etcCn} /* 기타 내용 */ - , #{crdnSttsHstry.useYN} /* 사용 여부 */ + , #{crdnSttsHstry.useYn} /* 사용 여부 */ , /* 등록 일시 */ , #{crdnSttsHstry.createdBy} /* 등록자 */ , /* 수정 일시 */ @@ -127,7 +127,7 @@ /* 단속 상태 이력 수정(crdnSttsHstryMapper.updateCrdnSttsHstry) */ UPDATE TB_CRDN_STTS_HSTRY - SET USE_YN = #{crdnSttsHstry.useYN} /* 사용 여부 */ + SET USE_YN = #{crdnSttsHstry.useYn} /* 사용 여부 */ , MDFCN_DT = /* 수정 일시 */ , MDFR = #{crdnSttsHstry.modifiedBy} /* 수정자 */ WHERE STTS_HSTRY_ID = #{crdnSttsHstry.sttsHstryId} /* 상태 이력 ID */ 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 1e8177de..f24ed5b5 100644 --- a/src/main/resources/sql/mapper/fims/epst/epostGdcc-mapper.xml +++ b/src/main/resources/sql/mapper/fims/epst/epostGdcc-mapper.xml @@ -15,7 +15,7 @@ - + @@ -53,8 +53,8 @@ AND EG.SNDNG_SE_CD = #{schSndngSeCd} /* 발송 구분 코드 */ - - AND EG.USE_YN = #{useYN} /* 사용 여부 */ + + AND EG.USE_YN = #{useYn} /* 사용 여부 */ @@ -121,8 +121,8 @@ AND EG.GDCC_ID = #{gdccId} /* 안내문 ID */ - - AND EG.USE_YN = #{useYN} /* 사용 여부 */ + + AND EG.USE_YN = #{useYn} /* 사용 여부 */ 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 f48ea825..bfa3f777 100644 --- a/src/main/resources/sql/mapper/fims/epst/epostRcptDtl-mapper.xml +++ b/src/main/resources/sql/mapper/fims/epst/epostRcptDtl-mapper.xml @@ -74,7 +74,7 @@ - + @@ -164,8 +164,8 @@ - - AND ERD.DEL_YN = #{delYN} /* 삭제 여부 */ + + AND ERD.DEL_YN = #{delYn} /* 삭제 여부 */ @@ -209,8 +209,8 @@ @@ -104,7 +104,7 @@ SELECT LPAD(CAST(IFNULL(MAX(VLTN_ID) + 1, 1) AS INT), 10, '0') - AS NEW_ID + AS NEW_ID FROM TB_VLTN INSERT diff --git a/src/main/resources/sql/mapper/fims/nxrp/nxrpMtchg-mapper.xml b/src/main/resources/sql/mapper/fims/nxrp/nxrpMtchg-mapper.xml index 5c89493b..cf161338 100644 --- a/src/main/resources/sql/mapper/fims/nxrp/nxrpMtchg-mapper.xml +++ b/src/main/resources/sql/mapper/fims/nxrp/nxrpMtchg-mapper.xml @@ -43,7 +43,7 @@ - + @@ -117,8 +117,8 @@ AND NM.LVY_KEY = #{lvyKey} - - AND NM.DEL_YN = #{delYN} + + AND NM.DEL_YN = #{delYn} 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 339edadb..cd6c6cee 100644 --- a/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml @@ -40,7 +40,7 @@ - + @@ -167,8 +167,8 @@ AND P.RTPYR_NM = #{schRtpyrNm} - - AND R.DEL_YN = #{delYN} + + AND R.DEL_YN = #{delYn} @@ -322,8 +322,8 @@ AND C.CRDN_ID = #{crdnId} - - AND R.DEL_YN = #{delYN} + + AND R.DEL_YN = #{delYn} diff --git a/src/main/resources/sql/mapper/fims/rdca/rdcamt-mapper.xml b/src/main/resources/sql/mapper/fims/rdca/rdcamt-mapper.xml index 22a2a680..ec07b1ae 100644 --- a/src/main/resources/sql/mapper/fims/rdca/rdcamt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rdca/rdcamt-mapper.xml @@ -20,7 +20,7 @@ - + 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 2a7ebda2..5c1ac8dc 100644 --- a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml @@ -28,8 +28,8 @@ - - + + @@ -135,8 +135,8 @@ - - AND S.DEL_YN = #{delYN} + + AND S.DEL_YN = #{delYn} AND S.DEL_YN = 'N' @@ -183,8 +183,8 @@ AND S.SNDNG_ID = #{sndngId} - - AND S.DEL_YN = #{delYN} + + AND S.DEL_YN = #{delYn} AND S.DEL_YN = 'N' @@ -831,8 +831,8 @@ , #{sndng.divKb} , #{sndng.epostNoticeId} , #{sndng.sndngSttsCd} - , #{sndng.resndYN} - , #{sndng.delYN} + , #{sndng.resndYn} + , #{sndng.delYn} , , #{sndng.createdBy} , @@ -857,7 +857,7 @@ , DIV_KB = #{sndng.divKb} , EPOST_NOTICE_ID = #{sndng.epostNoticeId} , SNDNG_STTS_CD = #{sndng.sndngSttsCd} - , RESND_YN = #{sndng.resndYN} + , RESND_YN = #{sndng.resndYn} , MDFCN_DT = , MDFR = #{sndng.modifiedBy} WHERE SNDNG_ID = #{sndng.sndngId} diff --git a/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml index 4da0232c..e80f3d64 100644 --- a/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml @@ -92,7 +92,7 @@ - + @@ -232,6 +232,9 @@ + + AND SD.SNDNG_ID = #{sndngId} + AND SD.SNDNG_DTL_ID IN ( #{sndngDtlId} @@ -239,15 +242,12 @@ AND SD.SNDNG_DTL_ID = #{sndngDtlId} - - - AND SD.SNDNG_ID = #{sndngId} AND SD.CRDN_ID = #{crdnId} - - AND SD.DEL_YN = #{delYN} + + AND SD.DEL_YN = #{delYn} @@ -271,8 +271,8 @@ AND SD.CRDN_ID = #{crdnId} - - AND SD.DEL_YN = #{delYN} + + AND SD.DEL_YN = #{delYn} @@ -281,6 +281,7 @@