From d06e851f7729f0edfa6c8dc9d0b2a3c71ef1010e Mon Sep 17 00:00:00 2001 From: jjh Date: Fri, 25 Aug 2023 11:19:18 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EA=B0=9C=EB=B3=84=EC=B4=9D=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=88=98=EC=A0=95=202.=20=EC=86=8C=EC=8A=A4=20?= =?UTF-8?q?=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/excl/ExclQuery.java | 21 +- ...Excl03Mapper.java => CrdnReRegMapper.java} | 4 +- ...{Excl01Mapper.java => LevyExclMapper.java} | 4 +- ...Excl02Mapper.java => OpnnSbmsnMapper.java} | 4 +- .../fims/excl/service/bean/Excl01Bean.java | 34 +- .../fims/excl/service/bean/Excl02Bean.java | 26 +- .../fims/excl/service/bean/Excl03Bean.java | 16 +- .../xit/fims/excl/web/Excl03Controller.java | 1 - .../xit/fims/sprt/service/Sprt02Service.java | 12 +- .../sprt/service/bean/Sprt02ServiceBean.java | 10 +- .../xit/fims/sprt/web/Sprt02Controller.java | 25 +- ...excl03-mapper.xml => crdnReReg-mapper.xml} | 4 +- ...{excl01-mapper.xml => levyExcl-mapper.xml} | 4 +- ...excl02-mapper.xml => opnnSbmsn-mapper.xml} | 4 +- .../WEB-INF/jsp/fims/excl/excl01010-main.jsp | 11 +- .../WEB-INF/jsp/fims/sprt/sprt02010-main.jsp | 40 +- .../WEB-INF/jsp/fims/sprt/sprt02020-info.jsp | 2 +- .../WEB-INF/jsp/fims/sprt/sprt02030-info.jsp | 9 +- .../WEB-INF/jsp/fims/sprt/sprt02040-info.jsp | 194 ++++++++ .../WEB-INF/jsp/fims/sprt/sprt02050-info.jsp | 432 ++++++++++++++++++ 20 files changed, 764 insertions(+), 93 deletions(-) rename src/main/java/cokr/xit/fims/excl/dao/{Excl03Mapper.java => CrdnReRegMapper.java} (96%) rename src/main/java/cokr/xit/fims/excl/dao/{Excl01Mapper.java => LevyExclMapper.java} (98%) rename src/main/java/cokr/xit/fims/excl/dao/{Excl02Mapper.java => OpnnSbmsnMapper.java} (98%) rename src/main/resources/sql/mapper/fims/excl/{excl03-mapper.xml => crdnReReg-mapper.xml} (99%) rename src/main/resources/sql/mapper/fims/excl/{excl01-mapper.xml => levyExcl-mapper.xml} (99%) rename src/main/resources/sql/mapper/fims/excl/{excl02-mapper.xml => opnnSbmsn-mapper.xml} (99%) create mode 100644 src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02040-info.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp diff --git a/src/main/java/cokr/xit/fims/excl/ExclQuery.java b/src/main/java/cokr/xit/fims/excl/ExclQuery.java index 6b148e2e..c766cad5 100644 --- a/src/main/java/cokr/xit/fims/excl/ExclQuery.java +++ b/src/main/java/cokr/xit/fims/excl/ExclQuery.java @@ -28,7 +28,6 @@ public class ExclQuery extends QueryRequest { private String opnnId; // 의견제출 ID private String[] reRegIDs; // 재등록 IDs private String reRegId; // 재등록 ID - // 공통 조건 private String schDateOpt; // 검색 일자 구분 private String schDateFrom; // 검색 일자 시작 @@ -102,6 +101,16 @@ public class ExclQuery extends QueryRequest { return self(); } + public String getCrdnId() { + return ifEmpty(crdnId, () -> null); + } + + public T setCrdnId(String crdnId) { + this.crdnId = crdnId; + + return self(); + } + public String[] getLevyExclIDs() { return ifEmpty(levyExclIDs, () -> null); } @@ -162,16 +171,6 @@ public class ExclQuery extends QueryRequest { return self(); } - public String getCrdnId() { - return ifEmpty(crdnId, () -> null); - } - - public T setCrdnId(String crdnId) { - this.crdnId = crdnId; - - return self(); - } - public String getSchDateOpt() { return ifEmpty(schDateOpt, () -> null); } diff --git a/src/main/java/cokr/xit/fims/excl/dao/Excl03Mapper.java b/src/main/java/cokr/xit/fims/excl/dao/CrdnReRegMapper.java similarity index 96% rename from src/main/java/cokr/xit/fims/excl/dao/Excl03Mapper.java rename to src/main/java/cokr/xit/fims/excl/dao/CrdnReRegMapper.java index 7d23c4df..452b2e06 100644 --- a/src/main/java/cokr/xit/fims/excl/dao/Excl03Mapper.java +++ b/src/main/java/cokr/xit/fims/excl/dao/CrdnReRegMapper.java @@ -20,8 +20,8 @@ import cokr.xit.foundation.data.DataObject; * ================================ * */ -@Mapper("excl03Mapper") -public interface Excl03Mapper extends AbstractMapper { +@Mapper("crdnReRegMapper") +public interface CrdnReRegMapper extends AbstractMapper { /**지정한 조건에 따라 단속 재등록 목록을 조회하여 반환한다.
* @param req 단속 재등록 조회 조건 diff --git a/src/main/java/cokr/xit/fims/excl/dao/Excl01Mapper.java b/src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java similarity index 98% rename from src/main/java/cokr/xit/fims/excl/dao/Excl01Mapper.java rename to src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java index 237479f5..43a62bcd 100644 --- a/src/main/java/cokr/xit/fims/excl/dao/Excl01Mapper.java +++ b/src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java @@ -20,8 +20,8 @@ import cokr.xit.foundation.data.DataObject; * ================================ * */ -@Mapper("excl01Mapper") -public interface Excl01Mapper extends AbstractMapper { +@Mapper("levyExclMapper") +public interface LevyExclMapper extends AbstractMapper { /**지정한 조건에 따라 부과제외 대장 목록을 조회하여 반환한다.
* @param req 부과제외 대장 조회 조건 diff --git a/src/main/java/cokr/xit/fims/excl/dao/Excl02Mapper.java b/src/main/java/cokr/xit/fims/excl/dao/OpnnSbmsnMapper.java similarity index 98% rename from src/main/java/cokr/xit/fims/excl/dao/Excl02Mapper.java rename to src/main/java/cokr/xit/fims/excl/dao/OpnnSbmsnMapper.java index 2949afc4..c98adc3d 100644 --- a/src/main/java/cokr/xit/fims/excl/dao/Excl02Mapper.java +++ b/src/main/java/cokr/xit/fims/excl/dao/OpnnSbmsnMapper.java @@ -20,8 +20,8 @@ import cokr.xit.foundation.data.DataObject; * ================================ * */ -@Mapper("excl02Mapper") -public interface Excl02Mapper extends AbstractMapper { +@Mapper("opnnSbmsnMapper") +public interface OpnnSbmsnMapper extends AbstractMapper { /**지정한 조건에 따라 의견제출 대장 목록을 조회하여 반환한다.
* @param req 의견제출 대장 조회 조건 diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java index 46a076df..29098b57 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; import cokr.xit.fims.excl.LevyExcl; import cokr.xit.fims.excl.ExclQuery; -import cokr.xit.fims.excl.dao.Excl01Mapper; +import cokr.xit.fims.excl.dao.LevyExclMapper; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.data.DataObject; @@ -26,8 +26,8 @@ import cokr.xit.foundation.data.DataObject; public class Excl01Bean extends AbstractComponent { /** 부과제외 대장 정보 DAO */ - @Resource(name = "excl01Mapper") - private Excl01Mapper excl01Mapper; + @Resource(name = "levyExclMapper") + private LevyExclMapper levyExclMapper; /**지정한 조건에 따라 부과제외 대장 목록을 조회하여 반환한다. * @param req 부과제외 대장 조회 조건 @@ -36,7 +36,7 @@ public class Excl01Bean extends AbstractComponent { public List getLevyExclList(ExclQuery req) { req.setOrderBy("LEVY_EXCL_ID"); // 정렬 - return excl01Mapper.selectLevyExclList(req); + return levyExclMapper.selectLevyExclList(req); } /**지정한 부과제외 ID의 부과제외 정보를 반환한다.
@@ -45,9 +45,9 @@ public class Excl01Bean extends AbstractComponent { */ public DataObject getLevyExclInfo(ExclQuery req) { if (req.getLevyExclId() != null) { - return excl01Mapper.selectLevyExclInfo(req.getLevyExclId()); // 수정(부과제외 조회) + return levyExclMapper.selectLevyExclInfo(req.getLevyExclId()); // 수정(부과제외 조회) } else { - DataObject dataCrdn = excl01Mapper.selectCrdn(req); // 등록(단속 조회) + DataObject dataCrdn = levyExclMapper.selectCrdn(req); // 등록(단속 조회) // 초기 데이터 설정 dataCrdn.set("LEVY_EXCL_YMD", dataCrdn.get("TODAY")); // 부과 제외 일자 @@ -65,7 +65,7 @@ public class Excl01Bean extends AbstractComponent { * */ public boolean createLevyExcl(LevyExcl excl01) { - return excl01Mapper.insert(excl01); + return levyExclMapper.insert(excl01); } /**부과제외 대장 정보를 수정한다. @@ -76,7 +76,7 @@ public class Excl01Bean extends AbstractComponent { * */ public boolean updateLevyExcl(LevyExcl excl01) { - return excl01Mapper.update(excl01); + return levyExclMapper.update(excl01); } /**부과제외 대장 정보를 삭제한다. @@ -87,7 +87,7 @@ public class Excl01Bean extends AbstractComponent { * */ public boolean removeLevyExcl(LevyExcl excl01) { - return excl01Mapper.delete(excl01); + return levyExclMapper.delete(excl01); } /**지정한 조건에 따라 단속자료 기준의 부과제외 대장 목록을 조회하여 반환한다. @@ -95,7 +95,7 @@ public class Excl01Bean extends AbstractComponent { * @return 단속, 부과제외 대장 목록 */ public DataObject getCrdnLevyExcl(String crdnId) { - return excl01Mapper.selectCrdnInfo(crdnId); + return levyExclMapper.selectCrdnInfo(crdnId); } /**지정한 조건에 따라 민원답변문구 대장을 조회하여 반환한다. @@ -103,7 +103,7 @@ public class Excl01Bean extends AbstractComponent { * @return 단속, 부과제외 대장 목록 */ public DataObject selectCvlcptAnsWordsInfo(String ansRsnCd) { - return excl01Mapper.selectCvlcptAnsWordsInfo(ansRsnCd); + return levyExclMapper.selectCvlcptAnsWordsInfo(ansRsnCd); } /**단속민원(TB_CRDN_CVLCPT) 대장 민원처리코드, 민원전송코드를 수정 한다. @@ -114,7 +114,7 @@ public class Excl01Bean extends AbstractComponent { * */ public boolean updateCrdnCvlcptPrcs(LevyExcl excl01) { - return excl01Mapper.updateCrdnCvlcptPrcs(excl01); + return levyExclMapper.updateCrdnCvlcptPrcs(excl01); } /**단속민원(TB_CRDN_CVLCPT) 대장의 민원처리결과내용(CVLCPT_PRCS_RSLT_CN)을 초기화 한다. @@ -125,7 +125,7 @@ public class Excl01Bean extends AbstractComponent { * */ public boolean updateCvlcptPrcsRsltCn(LevyExcl excl01) { - return excl01Mapper.updateCvlcptPrcsRsltCn(excl01); + return levyExclMapper.updateCvlcptPrcsRsltCn(excl01); } /**단속민원(TB_CRDN_CVLCPT) 대장의 민원답변 정보를 초기화 한다. @@ -136,7 +136,7 @@ public class Excl01Bean extends AbstractComponent { * */ public boolean updateCrdnCvlcpt(LevyExcl excl01) { - return excl01Mapper.updateCrdnCvlcpt(excl01); + return levyExclMapper.updateCrdnCvlcpt(excl01); } /**단속(TB_CRDN) 대장의 주차가능결과코드를 수정 한다. @@ -147,7 +147,7 @@ public class Excl01Bean extends AbstractComponent { * */ public boolean updateParkngPsbltyRsltCd(LevyExcl excl01) { - return excl01Mapper.updateParkngPsbltyRsltCd(excl01); + return levyExclMapper.updateParkngPsbltyRsltCd(excl01); } /**지정한 조건에 따라 발송상세 대장을 조회하여 반환한다. @@ -155,7 +155,7 @@ public class Excl01Bean extends AbstractComponent { * @return 단속, 부과제외 대장 목록 */ public DataObject selectSndngDtlInfo(String crdnId, String sndngRcvmtCd) { - return excl01Mapper.selectSndngDtlInfo(crdnId, sndngRcvmtCd); + return levyExclMapper.selectSndngDtlInfo(crdnId, sndngRcvmtCd); } /**발송상세(TB_SNDNG_DTL) 대장의 수납코드를 수정 한다. @@ -166,7 +166,7 @@ public class Excl01Bean extends AbstractComponent { * */ public boolean updateRcvmtCd(LevyExcl excl01) { - return excl01Mapper.updateRcvmtCd(excl01); + return levyExclMapper.updateRcvmtCd(excl01); } } diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl02Bean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl02Bean.java index 61ee4cf6..d9dad547 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl02Bean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl02Bean.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; import cokr.xit.fims.excl.OpnnSbmsn; import cokr.xit.fims.excl.ExclQuery; -import cokr.xit.fims.excl.dao.Excl02Mapper; +import cokr.xit.fims.excl.dao.OpnnSbmsnMapper; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.data.DataObject; @@ -26,8 +26,8 @@ import cokr.xit.foundation.data.DataObject; public class Excl02Bean extends AbstractComponent { /** 의견제출 대장 정보 DAO */ - @Resource(name = "excl02Mapper") - private Excl02Mapper excl02Mapper; + @Resource(name = "opnnSbmsnMapper") + private OpnnSbmsnMapper opnnSbmsnMapper; /**지정한 조건에 따라 의견제출 대장 목록을 조회하여 반환한다. * @param req 의견제출 대장 조회 조건 @@ -36,7 +36,7 @@ public class Excl02Bean extends AbstractComponent { public List getOpnnSbmsnList(ExclQuery req) { req.setOrderBy("OPNN_ID"); // 정렬 - return excl02Mapper.selectOpnnSbmsnList(req); + return opnnSbmsnMapper.selectOpnnSbmsnList(req); } /**지정한 조건에 따라 의견제출 대장 객체들을 반환한다. @@ -44,7 +44,7 @@ public class Excl02Bean extends AbstractComponent { * @return 의견제출 대장 객체 목록 */ public List getOpnnSbmsns(ExclQuery req) { - return excl02Mapper.selectOpnnSbmsns(req); + return opnnSbmsnMapper.selectOpnnSbmsns(req); } /**지정한 ID의 의견제출 정보를 반환한다.
@@ -53,9 +53,9 @@ public class Excl02Bean extends AbstractComponent { */ public DataObject getOpnnSbmsnInfo(ExclQuery req) { if (req.getOpnnId() != null) { - return excl02Mapper.selectOpnnSbmsnInfo(req.getOpnnId()); // 의견ID로 의견제출 조회 + return opnnSbmsnMapper.selectOpnnSbmsnInfo(req.getOpnnId()); // 의견ID로 의견제출 조회 } else { - DataObject dataCrdn = excl02Mapper.selectCrdn(req); // 단속ID로 단속, 의견제출 조회 + DataObject dataCrdn = opnnSbmsnMapper.selectCrdn(req); // 단속ID로 단속, 의견제출 조회 // 등록 호출시.. if (req.getCallPurpose() != null && req.getCallPurpose().equals("create")) { // 의견제출 등록시 기본값 셋팅 @@ -75,7 +75,7 @@ public class Excl02Bean extends AbstractComponent { * */ public boolean createOpnnSbmsn(OpnnSbmsn excl02) { - return excl02Mapper.insert(excl02); + return opnnSbmsnMapper.insert(excl02); } /**의견제출 대장 정보를 수정한다. @@ -86,7 +86,7 @@ public class Excl02Bean extends AbstractComponent { * */ public boolean updateOpnnSbmsn(OpnnSbmsn excl02) { - return excl02Mapper.update(excl02); + return opnnSbmsnMapper.update(excl02); } /**의견제출 대장 정보를 삭제한다. @@ -97,7 +97,7 @@ public class Excl02Bean extends AbstractComponent { * */ public boolean removeOpnnSbmsn(OpnnSbmsn excl02) { - return excl02Mapper.delete(excl02); + return opnnSbmsnMapper.delete(excl02); } /**지정한 조건에 따라 단속자료 기준의 의견제출 대장 목록을 조회하여 반환한다. @@ -105,7 +105,7 @@ public class Excl02Bean extends AbstractComponent { * @return 단속, 의견제출 대장 목록 */ public DataObject getCrdnOpnnSbmsn(String crdnId) { - return excl02Mapper.selectCrdnInfo(crdnId); + return opnnSbmsnMapper.selectCrdnInfo(crdnId); } /**단속 대장 정보의 의견제출여부(OPNN_SBMSN_YN)를 수정한다. @@ -116,7 +116,7 @@ public class Excl02Bean extends AbstractComponent { * */ public boolean updateCrdn(OpnnSbmsn excl02) { - return excl02Mapper.updateCrdn(excl02); + return opnnSbmsnMapper.updateCrdn(excl02); } /**의견제출 대장 답변(상태) 정보를 수정한다. @@ -127,7 +127,7 @@ public class Excl02Bean extends AbstractComponent { * */ public boolean updateOpnnSbmsnAnswer(OpnnSbmsn excl02) { - return excl02Mapper.updateOpnnSbmsnAnswer(excl02); + return opnnSbmsnMapper.updateOpnnSbmsnAnswer(excl02); } } diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java index 724874fd..1dfdcb91 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; import cokr.xit.fims.excl.CrdnReReg; import cokr.xit.fims.excl.ExclQuery; -import cokr.xit.fims.excl.dao.Excl03Mapper; +import cokr.xit.fims.excl.dao.CrdnReRegMapper; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.data.DataObject; @@ -26,8 +26,8 @@ import cokr.xit.foundation.data.DataObject; public class Excl03Bean extends AbstractComponent { /** 단속 재등록 정보 DAO */ - @Resource(name = "excl03Mapper") - private Excl03Mapper excl03Mapper; + @Resource(name = "crdnReRegMapper") + private CrdnReRegMapper crdnReRegMapper; /**지정한 조건에 따라 단속 재등록 목록을 조회하여 반환한다. * @param req 단속 재등록 조회 조건 @@ -36,7 +36,7 @@ public class Excl03Bean extends AbstractComponent { public List getCrackdownReRegistrationList(ExclQuery req) { req.setOrderBy("RE_REG_ID"); // 정렬 - return excl03Mapper.selectCrdnReRegList(req); + return crdnReRegMapper.selectCrdnReRegList(req); } /**지정한 조건에 따라 단속 재등록 객체들을 반환한다. @@ -44,7 +44,7 @@ public class Excl03Bean extends AbstractComponent { * @return 단속 재등록 객체 목록 */ public List getCrackdownReRegistrations(ExclQuery req) { - return excl03Mapper.selectCrdnReRegs(req); + return crdnReRegMapper.selectCrdnReRegs(req); } /**단속 재등록 정보를 등록한다. @@ -55,7 +55,7 @@ public class Excl03Bean extends AbstractComponent { * */ public boolean create(CrdnReReg excl03) { - return excl03Mapper.insert(excl03); + return crdnReRegMapper.insert(excl03); } /**단속 재등록 정보를 삭제한다. @@ -66,7 +66,7 @@ public class Excl03Bean extends AbstractComponent { * */ public boolean remove(CrdnReReg excl03) { - return excl03Mapper.delete(excl03); + return crdnReRegMapper.delete(excl03); } /**지정한 조건에 따라 부과제외 대장 목록을 조회하여 반환한다. @@ -74,7 +74,7 @@ public class Excl03Bean extends AbstractComponent { * @return 부과제외 대장 목록 */ public DataObject getCrackdown(String crdnId) { - return excl03Mapper.selectCrdnInfo(crdnId); + return crdnReRegMapper.selectCrdnInfo(crdnId); } } 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 2586b719..09cd5359 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java @@ -25,7 +25,6 @@ import cokr.xit.fims.excl.service.Excl03Service; * ================================ * */ -@RequestMapping(name = "단속 재등록", value = "/excl/excl03") public class Excl03Controller extends ApplicationController { /**단속 재등록 서비스*/ diff --git a/src/main/java/cokr/xit/fims/sprt/service/Sprt02Service.java b/src/main/java/cokr/xit/fims/sprt/service/Sprt02Service.java index 285b6fdc..e258dbe5 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/Sprt02Service.java +++ b/src/main/java/cokr/xit/fims/sprt/service/Sprt02Service.java @@ -10,21 +10,27 @@ import cokr.xit.foundation.data.DataObject; public interface Sprt02Service { /**단속 ID의 개별총정보를 반환한다. - * @param crdnId 단속 ID + * @param crdnId 단속ID * @return 개별총정보 */ DataObject getCrdnInfo(String crdnId); /**단속 ID의 단속, 납부자, 부과 정보를 반환한다. - * @param crdnId 단속 ID + * @param crdnId 단속ID * @return 단속, 납부자, 부과 정보 */ DataObject getCrdnPayerInfo(String crdnId); /**단속 ID의 의견제출 정보를 반환한다. - * @param crdnId 단속 ID + * @param crdnId 단속ID * @return 의견제출 정보 */ DataObject getOpnnSbmsnInfo(String crdnId); + /**단속 ID의 발송 정보를 반환한다. + * @param crdnId 단속ID + * @return 발송 정보 + */ + DataObject getSndngInfo(String crdnId); + } diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt02ServiceBean.java b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt02ServiceBean.java index a648dee1..e4f29d7a 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt02ServiceBean.java +++ b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt02ServiceBean.java @@ -6,6 +6,8 @@ import org.springframework.stereotype.Service; import cokr.xit.fims.excl.ExclQuery; import cokr.xit.fims.excl.service.bean.Excl02Bean; +import cokr.xit.fims.sndb.Sndb01Query; +import cokr.xit.fims.sndb.service.bean.Sndb01Bean; import cokr.xit.fims.sprt.service.Sprt02Service; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -24,6 +26,10 @@ public class Sprt02ServiceBean extends AbstractServiceBean implements Sprt02Serv @Resource(name = "excl02Bean") protected Excl02Bean excl02Bean; + /** 발송 대장 정보 Bean */ + @Resource(name = "sndb01Bean") + private Sndb01Bean sndb01Bean; + @Override public DataObject getCrdnInfo(String crdnId) { return sprt02Bean.getCrdnInfo(crdnId); @@ -43,7 +49,9 @@ public class Sprt02ServiceBean extends AbstractServiceBean implements Sprt02Serv @Override public DataObject getSndngInfo(String crdnId) { return excl02Bean.getOpnnSbmsnInfo(new ExclQuery().setCallPurpose("select") - .setCrdnId(crdnId)); + .setCrdnId(crdnId)); + +// return sndb01Bean.getSndngInfo(new SndbQuery().setCrdnId(crdnId)); } } 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 81e8f2f2..4c1e12c3 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java @@ -40,7 +40,7 @@ public class Sprt02Controller extends ApplicationController { } /**지정하는 단속 ID의 단속, 납부자 정보를 반환한다. - * @param crdnId 단속 아이디 + * @param crdnId 단속ID * @return fims/sprt/sprt02020-main 또는 jsonView * 
 {
 	 *     "crdnPayerInfo": {...}
@@ -61,7 +61,7 @@ public class Sprt02Controller extends ApplicationController {
 	}
 
 	/**지정하는 단속 ID의 의견제출 정보를 반환한다.
-	 * @param crdnId 단속 아이디
+	 * @param crdnId 단속ID
 	 * @return fims/sprt/sprt02030-main 또는 jsonView
 	 * 
 {
 	 *     "crdnPayerInfo": {...}
@@ -81,4 +81,25 @@ public class Sprt02Controller extends ApplicationController {
 		;
 	}
 
+	/**지정하는 단속 ID의 발송 정보를 반환한다.
+	 * @param crdnId 단속ID
+	 * @return fims/sprt/sprt02030-main 또는 jsonView
+	 * 
 {
+	 *     "crdnPayerInfo": {...}
+	 * }

+	 */
+	@RequestMapping(name="발송 정보 조회", value="/040/info.do")
+	public ModelAndView getSndngInfo(String crdnId) {
+		DataObject sndngInfo = sprt02Service.getSndngInfo(crdnId);
+
+		boolean json = jsonResponse();
+
+		ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02040-info");
+
+		return mav
+				.addObject("pageName", "sprt02040")
+				.addObject("sndngInfo", json ? sndngInfo : toJson(sndngInfo))	// 발송 정보
+		;
+	}
+
 }
diff --git a/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml
similarity index 99%
rename from src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml
rename to src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml
index 4f31fb81..f914ed67 100644
--- a/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml
@@ -1,13 +1,13 @@
 
 
-
+
 
 
 
-	
+	
 		
 							
 							
diff --git a/src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml
similarity index 99%
rename from src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml
rename to src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml
index bd225126..2bd3be1e 100644
--- a/src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml
@@ -1,13 +1,13 @@
 
 
-
+
 
 
 
-	
+	
 		
 						
 								
diff --git a/src/main/resources/sql/mapper/fims/excl/excl02-mapper.xml b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml
similarity index 99%
rename from src/main/resources/sql/mapper/fims/excl/excl02-mapper.xml
rename to src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml
index 9707e4e5..6264a9a0 100644
--- a/src/main/resources/sql/mapper/fims/excl/excl02-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml
@@ -1,13 +1,13 @@
 
 
-
+
 
 
 
-	
+	
 		
 								
 								
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
index 509ba54c..c0b65ac4 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
@@ -349,15 +349,6 @@
 			return;
 		}
 
-// 		let dataItems = ${pageName}Control.dataset.getDataset("item");
-// 		let crdnIDs = {};
-
-// 		for (let iLoop = 0; iLoop < dataItems.length; iLoop++) {
-// 			let key = dataItems[iLoop].data.CRDN_ID;
-
-// 			crdnIDs[iLoop] = key;
-// 		}
-
 		ajax.get({
 			  url : wctx.url("/sprt/sprt02/010/main.do")
 			, data : { crdnId : crdnId }
@@ -370,7 +361,7 @@
 					, content : resp
 					, size : "xxl"
 					, init : () => {
-						sprt02010CrdnIDs = crdnIDs;
+
 					}
 				});
 			}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp
index 21bcda4f..1e647df7 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp
@@ -7,6 +7,9 @@
 		

 			
 			

+				
+				
+
 				

 					
 					

@@ -37,21 +40,22 @@
 		

 			
    
 				
  • 
-					
 				
    • 
 				
  • 
-					
 				
    • 
 				
  • 
-					
+					
 				
    • 
 				
  • 
 					
@@ -76,10 +80,10 @@
 					의견제출 정보
 				

 				

-					발송반송 정보
+					발송 정보
 				

 				

-					처리 상세정보
+					처리상세 정보
 				

 				

 					부과이후 정보
@@ -191,6 +195,24 @@
 		});
 	}
 
+	// 발송 정보
+	fnBtnSndngInfo${pageName} = () => {
+		let crdnId = ${pageName}Control.dataset.getValue("CRDN_ID");
+
+		// 단속 ID 가 없다면.. return
+		if (crdnId == undefined || crdnId == "") {
+			return;
+		}
+
+		ajax.get({
+			  url : wctx.url("/sprt/sprt02/040/info.do")
+			, data : { crdnId : crdnId }
+			, success : resp => {
+				$("#sndngInfo").html(resp);
+			}
+		});
+	}
+
 	/**************************************************************************
 	 * script 진입
 	 **************************************************************************/
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp
index 7757e694..a57c7a44 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp
@@ -108,7 +108,7 @@
 						

 							
 							

-								
 								

diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp
index 938bd7d0..625cccc7 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp
@@ -28,7 +28,7 @@
 							
-							
 						 
@@ -103,7 +103,6 @@
 							
 						

-
 						
 						

 							
@@ -118,7 +117,7 @@
 							

 						
 
 					
 
-				
 
+				
 
 			
 
 
 			
@@ -161,7 +160,7 @@
 							
 						

 					

-				 
+				 
 			 
 		 
 	
@@ -367,7 +366,7 @@
 	}
 
 	// 심의의결서 출력
-	function fnBtnDlbrtLtfrOtpt${pageName}() {
+	function fnBtnDlbrtLtfrPrint${pageName}() {
 
 	}
 
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02040-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02040-info.jsp
new file mode 100644
index 00000000..3b861127
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02040-info.jsp
@@ -0,0 +1,194 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
+<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
+
+
+

+	
+	

+		
+		
+
+		

+			
+			

+				
+				

+					
+					

+						
+						
+						
+							
+							
+							
+							
+							
+							
+						 
+					
 
+
+					

+
+					
 
+				
 
+			
 
+
+			
+			

+				
+				

+					
+					

+						
+						
+						
+						 
+					
 
+
+					

+
+					

+				
 
+			
 
+		
 
+	

+

+
+
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp
new file mode 100644
index 00000000..938bd7d0
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp
@@ -0,0 +1,432 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
+<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
+
+
+

+	
+	

+		
+		
+		
+
+		

+			
+			

+				
+				

+					
+					

+						
+						
+						
+							
+							
+							
+							
+						 
+					
 
+
+					

+						
+						

+							
+							
+						

+						
+						

+							
+							
+						

+						
+						

+							
+							
+						

+						
+						

+							
+							
+						

+						
+						

+							
+							
+						

+						
+						

+							
+							
+							
+						

+						
+						

+							
+							
+						

+						
+						

+							
+							
+						

+						
+						

+							
+							
+						

+						
+						

+							
+							
+						

+						
+						

+							
+							
+						

+						
+						

+							
+							
+						

+						
+						

+							
+							
+						

+
+						
+						

+							
+								
+									
+									
+									
+									
+									
+								
+								
+							
NO.파일 번호파일 이름파일 크기다운로드

+						
 
+					
 
+				
 
+			
 
+
+			
+			

+				
+				

+					
+					

+						
+						
+						
+							
+						 
+					
 
+
+					

+						
+						

+							
+							
+						

+						
+						

+							
+							
+						

+						
+						

+							
+							
+						

+						
+						

+							
+						

+						

+							
+						

+					

+				
 
+			
 
+		
 
+	

+

+
+