From 0b4aec7bb3c8c51a25c0e97c3f2f7f24f2908bbb Mon Sep 17 00:00:00 2001 From: jjh Date: Mon, 15 Jul 2024 11:13:14 +0900 Subject: [PATCH] =?UTF-8?q?=ED=91=9C=EC=A4=80=EC=9A=A9=EC=96=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=BB=AC?= =?UTF-8?q?=EB=9F=BC=EB=AA=85=20=EB=B3=80=EA=B2=BD.=201.=20TB=5FCRDN=5FCVL?= =?UTF-8?q?CPT=20=20=20CVLCPT=5FPRCS=5FSUMRY=20->=20CVLCPT=5FPRCS=5FSMRY?= =?UTF-8?q?=202.=20TB=5FCVLCPT=5FANS=5FWORDS=20=20=20PRCS=5FSUMRY=20->=20P?= =?UTF-8?q?RCS=5FSMRY=203.=20TB=5FEPOST=5FGDCC=20->=20TB=5FEPOST=5FGDNTC?= =?UTF-8?q?=20=20=20GDCC=5FID=20->=20GDNTC=5FID=204.=20TB=5FFILE=5FMOSC=20?= =?UTF-8?q?=20=20MOSC=5FLT=20->=20MOSC=5FLEN=20=20=20MOSC=5FHG=20->=20MOSC?= =?UTF-8?q?=5FHGT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/base/web/FileController.java | 4 +- .../java/cokr/xit/fims/cmmn/CmmnUtil.java | 4 +- .../fims/crdn/service/bean/ImportBean.java | 2 +- .../java/cokr/xit/fims/cvlc/CrdnCvlcpt.java | 4 +- .../cvlc/service/bean/CrdnCvlcptMainBean.java | 8 +- .../service/bean/CrdnCvlcptServiceBean.java | 8 +- .../epst/{EpostGdcc.java => EpostGdntc.java} | 6 +- .../java/cokr/xit/fims/epst/EpostQuery.java | 22 ++--- ...tGdccMapper.java => EpostGdntcMapper.java} | 24 +++--- ...dccService.java => EpostGdntcService.java} | 16 ++-- .../service/bean/EpostGdccServiceBean.java | 63 -------------- ...EpostGdccBean.java => EpostGdntcBean.java} | 44 +++++----- .../service/bean/EpostGdntcServiceBean.java | 63 ++++++++++++++ .../xit/fims/epst/web/Epst02Controller.java | 86 +++++++++---------- .../java/cokr/xit/fims/sprt/MediaUtil.java | 4 +- .../xit/fims/sprt/service/bean/MediaBean.java | 4 +- .../sql/mapper/fims/crdn/crdn-info-mapper.xml | 2 +- .../sql/mapper/fims/crdn/crdn-list-mapper.xml | 2 +- .../mapper/fims/cvlc/answer-words-mapper.xml | 4 +- .../mapper/fims/cvlc/crdnCvlcpt-mapper.xml | 28 +++--- .../mapper/fims/cvlc/warning-words-mapper.xml | 6 +- ...tGdcc-mapper.xml => epostGdntc-mapper.xml} | 58 ++++++------- .../sql/mapper/fims/levy/levy-mapper.xml | 2 +- .../sql/mapper/fims/sndb/sndng-mapper.xml | 2 +- .../sql/mapper/fims/sprt/media-mapper.xml | 14 +-- .../sql/mapper/fims/sprt/totalInfo-mapper.xml | 2 +- .../WEB-INF/jsp/fims/epst/epst02010-main.jsp | 45 +++++----- .../WEB-INF/jsp/fims/epst/epst02020-info.jsp | 8 +- 28 files changed, 266 insertions(+), 269 deletions(-) rename src/main/java/cokr/xit/fims/epst/{EpostGdcc.java => EpostGdntc.java} (85%) rename src/main/java/cokr/xit/fims/epst/dao/{EpostGdccMapper.java => EpostGdntcMapper.java} (76%) rename src/main/java/cokr/xit/fims/epst/service/{EpostGdccService.java => EpostGdntcService.java} (80%) delete mode 100644 src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccServiceBean.java rename src/main/java/cokr/xit/fims/epst/service/bean/{EpostGdccBean.java => EpostGdntcBean.java} (72%) create mode 100644 src/main/java/cokr/xit/fims/epst/service/bean/EpostGdntcServiceBean.java rename src/main/resources/sql/mapper/fims/epst/{epostGdcc-mapper.xml => epostGdntc-mapper.xml} (77%) diff --git a/src/main/java/cokr/xit/fims/base/web/FileController.java b/src/main/java/cokr/xit/fims/base/web/FileController.java index bb328289..990356cd 100644 --- a/src/main/java/cokr/xit/fims/base/web/FileController.java +++ b/src/main/java/cokr/xit/fims/base/web/FileController.java @@ -93,8 +93,8 @@ public class FileController extends cokr.xit.base.file.web.FileController { } mosaic += mosaicInfo.string("X_AXS") + "," + mosaicInfo.string("Y_AXS") - + "," + mosaicInfo.string("MOSC_LT") - + "," + mosaicInfo.string("MOSC_HG"); + + "," + mosaicInfo.string("MOSC_LEN") + + "," + mosaicInfo.string("MOSC_HGT"); } fileInfo.set("MOSAIC", mosaic); } else { diff --git a/src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java b/src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java index 1bd0edca..ea0db5d3 100644 --- a/src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java +++ b/src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java @@ -151,8 +151,8 @@ public class CmmnUtil { for(DataObject mosaicInfo : mosaicInfos){ int mosaicX = mosaicInfo.number("X_AXS").intValue(); int mosaicY = mosaicInfo.number("Y_AXS").intValue(); - int mosaicWidth = mosaicInfo.number("MOSC_LT").intValue(); - int mosaicHeight = mosaicInfo.number("MOSC_HG").intValue(); + int mosaicWidth = mosaicInfo.number("MOSC_LEN").intValue(); + int mosaicHeight = mosaicInfo.number("MOSC_HGT").intValue(); graphic.drawImage(buffer_black_image, mosaicX, mosaicY, mosaicWidth, mosaicHeight, null); } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/ImportBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/ImportBean.java index f62c6080..b931fea3 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/ImportBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/ImportBean.java @@ -274,7 +274,7 @@ public class ImportBean extends AbstractBean { cvlcpt.setCvlcptPrcsPicNm(petition.getDutyIdV()); cvlcpt.setCvlcptPrcsPrnmntDt(parseDate.apply(petition.getPetiEndD())); cvlcpt.setCvlcptPrcsCd(null);; // 민원 처리 코드 - cvlcpt.setCvlcptPrcsSumry(petition.getCivilAbstractL()); + cvlcpt.setCvlcptPrcsSmry(petition.getCivilAbstractL()); cvlcpt.setCvlcptPrcsRsltCn(petition.getPcdRstContL()); cvlcpt.setCvlcptPrcsCmptnDt(parseDate.apply(petition.getDoRegD())); cvlcpt.setCvlcptPrcsPic(petition.getDutyIdV()); diff --git a/src/main/java/cokr/xit/fims/cvlc/CrdnCvlcpt.java b/src/main/java/cokr/xit/fims/cvlc/CrdnCvlcpt.java index acff5da6..613d7dd9 100644 --- a/src/main/java/cokr/xit/fims/cvlc/CrdnCvlcpt.java +++ b/src/main/java/cokr/xit/fims/cvlc/CrdnCvlcpt.java @@ -96,7 +96,7 @@ public class CrdnCvlcpt extends AbstractEntity { /** * 민원 처리 요약 */ - private java.lang.String cvlcptPrcsSumry; + private java.lang.String cvlcptPrcsSmry; /** * 민원 처리 결과 내용 @@ -186,7 +186,7 @@ public class CrdnCvlcpt extends AbstractEntity { /** * 처리 요약 */ - private java.lang.String prcsSumry; + private java.lang.String prcsSmry; /** * 처리 결과 내용 diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java index f401e6e3..ae724886 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java @@ -139,7 +139,7 @@ public class CrdnCvlcptMainBean extends AbstractBean { cvlcptLink.put("civilNoC", cvlcptInfo.string("CVLCPT_RCPT_NO"));//민원 접수 번호 cvlcptLink.put("petiTitleV", cvlcptInfo.string("CVLCPT_APLY_TTL_NM"));//민원제목 cvlcptLink.put("civilGistV", cvlcptInfo.string("CVLCPT_GIST"));//민원요지 - cvlcptLink.put("civilAbstractL", cvlcptInfo.string("CVLCPT_PRCS_SUMRY"));//민원 처리 요약 + cvlcptLink.put("civilAbstractL", cvlcptInfo.string("CVLCPT_PRCS_SMRY"));//민원 처리 요약 cvlcptLink.put("ancCodeV", cvlcptInfo.string("CVLCPT_PRCS_NSTT_CD"));//기관 코드 cvlcptLink.put("pcdDeptV", cvlcptInfo.string("CVLCPT_PRCS_DEPT_CD"));//처리 부서 코드 cvlcptLink.put("pcdAncCodeV", cvlcptInfo.string("CVLCPT_PRCS_DEPT_CD"));//민원 실 처리 기관 코드 @@ -325,17 +325,17 @@ public class CrdnCvlcptMainBean extends AbstractBean { String code = ""; if(crdnCvlcpt.getAnsRsnCd().startsWith("1") || crdnCvlcpt.getAnsRsnCd().startsWith("2")) { if(crdnCvlcpt.getAnsRsnCd().startsWith("1")) { - crdnCvlcpt.setPrcsSumry("과태료 미부과"); + crdnCvlcpt.setPrcsSmry("과태료 미부과"); } if(crdnCvlcpt.getAnsRsnCd().startsWith("2")) { - crdnCvlcpt.setPrcsSumry("과태료 계고"); + crdnCvlcpt.setPrcsSmry("과태료 계고"); } codeGroupId = "FIM022"; code = crdnCvlcpt.getAnsRsnCd(); } else if(crdnCvlcpt.getAnsRsnCd().startsWith("3")) { - crdnCvlcpt.setPrcsSumry("과태료 부과"); + crdnCvlcpt.setPrcsSmry("과태료 부과"); switch(crdnCvlcpt.getTaskSeCd()) { case "PVS" -> codeGroupId = "FIM004"; case "BPV" -> codeGroupId = "FIM005"; diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java index 0ce56312..27fa46cf 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java @@ -293,11 +293,11 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv crdnCvlcpt.setCvlcptPrcsCd(newCvlcptPrcsCd); // 민원 처리 코드 if (acceptType.equals("someAccept")) { - crdnCvlcpt.setCvlcptPrcsSumry("과태료 계고"); // 민원 처리 요약 + crdnCvlcpt.setCvlcptPrcsSmry("과태료 계고"); // 민원 처리 요약 } else if(acceptType.equals("accept")) { - crdnCvlcpt.setCvlcptPrcsSumry("과태료부과"); // 민원 처리 요약 + crdnCvlcpt.setCvlcptPrcsSmry("과태료부과"); // 민원 처리 요약 } else if(acceptType.equals("nonAccept")) { - crdnCvlcpt.setCvlcptPrcsSumry("과태료 미부과"); // 민원 처리 요약 + crdnCvlcpt.setCvlcptPrcsSmry("과태료 미부과"); // 민원 처리 요약 } crdnCvlcpt.setCvlcptTrsmCd(newCvlcptTrsmCd); // 민원 전송 코드 @@ -494,7 +494,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv CrdnCvlcpt crdnCvlcpt = new CrdnCvlcpt(); crdnCvlcpt.setCvlcptLinkId(crdnInfo.string("CVLCPT_LINK_ID")); crdnCvlcpt.setCvlcptPrcsCd("04"); - crdnCvlcpt.setCvlcptPrcsSumry("과태료 미부과"); + crdnCvlcpt.setCvlcptPrcsSmry("과태료 미부과"); CrdnQuery crdnQuery = new CrdnQuery(); crdnQuery.setSggCd(crdnInfo.string("SGG_CD")); diff --git a/src/main/java/cokr/xit/fims/epst/EpostGdcc.java b/src/main/java/cokr/xit/fims/epst/EpostGdntc.java similarity index 85% rename from src/main/java/cokr/xit/fims/epst/EpostGdcc.java rename to src/main/java/cokr/xit/fims/epst/EpostGdntc.java index c4d01956..1168891d 100644 --- a/src/main/java/cokr/xit/fims/epst/EpostGdcc.java +++ b/src/main/java/cokr/xit/fims/epst/EpostGdntc.java @@ -10,12 +10,12 @@ import lombok.Setter; */ @Getter @Setter -public class EpostGdcc extends AbstractEntity { +public class EpostGdntc extends AbstractEntity { /** * 안내문 ID */ - private String gdccId; + private String gdntcId; /** * 시군구 코드 @@ -50,7 +50,7 @@ public class EpostGdcc extends AbstractEntity { /** * 안내문 Ids */ - private String[] gdccIds; + private String[] gdntcIds; } diff --git a/src/main/java/cokr/xit/fims/epst/EpostQuery.java b/src/main/java/cokr/xit/fims/epst/EpostQuery.java index 28a6dcc8..ea187710 100644 --- a/src/main/java/cokr/xit/fims/epst/EpostQuery.java +++ b/src/main/java/cokr/xit/fims/epst/EpostQuery.java @@ -25,8 +25,8 @@ public class EpostQuery extends CmmnQuery { private String sndngDtlId; // 발송 상세 Id private String[] svbtcIds; // 공시송달 Ids private String svbtcId; // 공시송달 Id - private String[] gdccIds; // 안내문 Ids - private String gdccId; // 안내문 Id + private String[] gdntcIds; // 안내문 Ids + private String gdntcId; // 안내문 Id private String[] rcptRsltIds; // 접수 결과 Ids private String rcptRsltId; // 접수 결과 Id private String conKey; // 외부연계식별키 @@ -59,7 +59,7 @@ public class EpostQuery extends CmmnQuery { private String relorsectCd; // 전자우편 접수 등록(TB_EPOST_RCPT_REG)_연계기관결제부서코드 private String postPrcsSttsCdFrom; // 전자우편 접수 등록(TB_EPOST_RCPT_REG)_우편 처리 상태 코드 시작 private String postPrcsSttsCdTo; // 전자우편 접수 등록(TB_EPOST_RCPT_REG)_우편 처리 상태 코드 종료 - private String ttlNm; // 전자우편 안내문(TB_EPOST_GDCC)_제목 명 + private String ttlNm; // 전자우편 안내문(TB_EPOST_GDNTC)_제목 명 private String conOrg; // 전자우편 접수 결과(TB_EPOST_RCPT_RSLT)_외부기관구분코드 private String reletcdata; // 전자우편 접수 결과(TB_EPOST_RCPT_RSLT)_발송인별추가데이터 // ETC @@ -139,21 +139,21 @@ public class EpostQuery extends CmmnQuery { return self(); } - public String[] getGdccIds() { - return ifEmpty(gdccIds, () -> null); + public String[] getGdntcIds() { + return ifEmpty(gdntcIds, () -> null); } - public T setGdccIds(String... gdccIds) { - this.gdccIds = gdccIds; + public T setGdntcIds(String... gdntcIds) { + this.gdntcIds = gdntcIds; return self(); } - public String getGdccId() { - return ifEmpty(gdccId, () -> null); + public String getGdntcId() { + return ifEmpty(gdntcId, () -> null); } - public T setGdccId(String gdccId) { - this.gdccId = gdccId; + public T setGdntcId(String gdntcId) { + this.gdntcId = gdntcId; return self(); } diff --git a/src/main/java/cokr/xit/fims/epst/dao/EpostGdccMapper.java b/src/main/java/cokr/xit/fims/epst/dao/EpostGdntcMapper.java similarity index 76% rename from src/main/java/cokr/xit/fims/epst/dao/EpostGdccMapper.java rename to src/main/java/cokr/xit/fims/epst/dao/EpostGdntcMapper.java index ebfb6f87..ff8b983f 100644 --- a/src/main/java/cokr/xit/fims/epst/dao/EpostGdccMapper.java +++ b/src/main/java/cokr/xit/fims/epst/dao/EpostGdntcMapper.java @@ -4,7 +4,7 @@ import java.util.List; import org.egovframe.rte.psl.dataaccess.mapper.Mapper; -import cokr.xit.fims.epst.EpostGdcc; +import cokr.xit.fims.epst.EpostGdntc; import cokr.xit.fims.epst.EpostQuery; import cokr.xit.foundation.component.AbstractMapper; import cokr.xit.foundation.data.DataObject; @@ -19,38 +19,38 @@ import cokr.xit.foundation.data.DataObject; * ================================ * */ -@Mapper("epostGdccMapper") -public interface EpostGdccMapper extends AbstractMapper { +@Mapper("epostGdntcMapper") +public interface EpostGdntcMapper extends AbstractMapper { /**지정한 조건에 따라 전자우편 안내문 목록을 조회하여 반환한다.
* @param req 전자우편 안내문 조회 조건 * @return 전자우편 안내문 목록 */ - List selectEpostGdccList(EpostQuery req); + List selectEpostGdntcList(EpostQuery req); /**지정한 조건에 따라 전자우편 안내문 객체들을 반환한다. * @param req 전자우편 안내문 조회 조건 * @return 전자우편 안내문 객체 목록 */ - List selectEpostGdccs(EpostQuery req); + List selectEpostGdntcs(EpostQuery req); /**지정한 조건에 따라 부과제외 대장 객체의 마지막 1개를 반환한다. * @param req 전자우편 안내문 조회 조건 * @return 전자우편 안내문 객체 */ - default DataObject selectEpostGdccInfo(EpostQuery req) { + default DataObject selectEpostGdntcInfo(EpostQuery req) { // 사용 여부 if (req.getUseYn() == null) { req.setUseYn("Y"); } // 기본 정렬 if (req.getOrderBy() == null) { - req.setOrderBy("EG.GDCC_ID DESC"); + req.setOrderBy("EG.GDNTC_ID DESC"); } - List epostGdccs = selectEpostGdccs(req); + List epostGdntcs = selectEpostGdntcs(req); - return !epostGdccs.isEmpty() ? epostGdccs.get(0) : null; + return !epostGdntcs.isEmpty() ? epostGdntcs.get(0) : null; } /**전자우편 안내문 정보를 등록한다. @@ -60,7 +60,7 @@ public interface EpostGdccMapper extends AbstractMapper { * * @return 저장된 정보수 */ - int insertEpostGdcc(EpostGdcc epostGdcc); + int insertEpostGdntc(EpostGdntc epostGdntc); /**전자우편 안내문 정보를 수정한다. * @param params 파라미터 @@ -69,7 +69,7 @@ public interface EpostGdccMapper extends AbstractMapper { * * @return 저장된 정보수 */ - int updateEpostGdcc(EpostGdcc epostGdcc); + int updateEpostGdntc(EpostGdntc epostGdntc); /**지정한 전자우편 안내문을 삭제한다. * @param params 파라미터 @@ -78,6 +78,6 @@ public interface EpostGdccMapper extends AbstractMapper { * * @return 저장된 정보수 */ - int deleteEpostGdcc(EpostGdcc epostGdcc); + int deleteEpostGdntc(EpostGdntc epostGdntc); } diff --git a/src/main/java/cokr/xit/fims/epst/service/EpostGdccService.java b/src/main/java/cokr/xit/fims/epst/service/EpostGdntcService.java similarity index 80% rename from src/main/java/cokr/xit/fims/epst/service/EpostGdccService.java rename to src/main/java/cokr/xit/fims/epst/service/EpostGdntcService.java index a8322616..7a1825f7 100644 --- a/src/main/java/cokr/xit/fims/epst/service/EpostGdccService.java +++ b/src/main/java/cokr/xit/fims/epst/service/EpostGdntcService.java @@ -4,7 +4,7 @@ import java.util.List; import cokr.xit.foundation.data.DataObject; -import cokr.xit.fims.epst.EpostGdcc; +import cokr.xit.fims.epst.EpostGdntc; import cokr.xit.fims.epst.EpostQuery; /**전자우편 안내문 관리 서비스 인터페이스. @@ -17,25 +17,25 @@ import cokr.xit.fims.epst.EpostQuery; * ================================ * */ -public interface EpostGdccService { +public interface EpostGdntcService { /**지정한 조건에 따라 전자우편 안내문 목록을 조회하여 반환한다. * @param req 전자우편 안내문 조회 조건 * @return 전자우편 안내문 목록 */ - List getEpostGdccList(EpostQuery req); + List getEpostGdntcList(EpostQuery req); /**지정한 조건에 따라 전자우편 안내문 객체들을 반환한다. * @param req 전자우편 안내문 조회 조건 * @return 전자우편 안내문 객체 목록 */ - List getEpostGdccs(EpostQuery req); + List getEpostGdntcs(EpostQuery req); /**지정한 조건에 따라 전자우편 안내문 정보를 반환한다. * @param req 전자우편 안내문 조회 조건 * @return 전자우편 안내문 정보 */ - DataObject getEpostGdccInfo(EpostQuery req); + DataObject getEpostGdntcInfo(EpostQuery req); /**전자우편 안내문 정보를 등록한다. * @param epostGdcc 전자우편 안내문 @@ -44,7 +44,7 @@ public interface EpostGdccService { *
  • 그렇지 않으면 false
    • * */ - String createEpostGdcc(EpostGdcc epostGdcc); + String createEpostGdntc(EpostGdntc epostGdntc); /**전자우편 안내문 정보를 수정한다. * @param epostGdcc 전자우편 안내문 @@ -53,7 +53,7 @@ public interface EpostGdccService { *
  • 그렇지 않으면 false
    • * */ - String updateEpostGdcc(EpostGdcc epostGdcc); + String updateEpostGdntc(EpostGdntc epostGdntc); /**전자우편 안내문 정보를 삭제한다. * @param epostGdcc 전자우편 안내문 @@ -62,6 +62,6 @@ public interface EpostGdccService { *
  • 그렇지 않으면 false
    • * */ - String removeEpostGdcc(EpostGdcc epostGdcc); + String removeEpostGdntc(EpostGdntc epostGdntc); } diff --git a/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccServiceBean.java b/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccServiceBean.java deleted file mode 100644 index 21ab7ebc..00000000 --- a/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccServiceBean.java +++ /dev/null @@ -1,63 +0,0 @@ -package cokr.xit.fims.epst.service.bean; - -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import cokr.xit.foundation.component.AbstractServiceBean; -import cokr.xit.foundation.data.DataObject; - -import cokr.xit.fims.epst.EpostGdcc; -import cokr.xit.fims.epst.EpostQuery; -import cokr.xit.fims.epst.service.EpostGdccService; - -/**전자우편 안내문 서비스 구현체. - * - *

    상세 설명: - * - * 

    - * ============ 변경 이력 ============
- * 2023-12-04	JoJH 최초 작성
- * ================================
- *
    - */ -@Service("epostGdccService") -public class EpostGdccServiceBean extends AbstractServiceBean implements EpostGdccService { - - /** 전자우편 안내문 정보 Bean */ - @Resource(name = "epostGdccBean") - private EpostGdccBean epostGdccBean; - - @Override - public List getEpostGdccList(EpostQuery req) { - return epostGdccBean.getEpostGdccList(req); - } - - @Override - public List getEpostGdccs(EpostQuery req) { - return epostGdccBean.getEpostGdccs(req); - } - - @Override - public DataObject getEpostGdccInfo(EpostQuery req) { - return epostGdccBean.getEpostGdccInfo(req); - } - - @Override - public String createEpostGdcc(EpostGdcc epostGdcc) { - return epostGdccBean.createEpostGdcc(epostGdcc); - } - - @Override - public String updateEpostGdcc(EpostGdcc epostGdcc) { - return epostGdccBean.updateEpostGdcc(epostGdcc); - } - - @Override - public String removeEpostGdcc(EpostGdcc epostGdcc) { - return epostGdccBean.removeEpostGdcc(epostGdcc); - } - -} diff --git a/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccBean.java b/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdntcBean.java similarity index 72% rename from src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccBean.java rename to src/main/java/cokr/xit/fims/epst/service/bean/EpostGdntcBean.java index 6bc9d3d6..fec1c572 100644 --- a/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccBean.java +++ b/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdntcBean.java @@ -7,9 +7,9 @@ import javax.annotation.Resource; import org.springframework.stereotype.Component; import cokr.xit.fims.cmmn.CmmnUtil; -import cokr.xit.fims.epst.EpostGdcc; +import cokr.xit.fims.epst.EpostGdntc; import cokr.xit.fims.epst.EpostQuery; -import cokr.xit.fims.epst.dao.EpostGdccMapper; +import cokr.xit.fims.epst.dao.EpostGdntcMapper; import cokr.xit.foundation.component.AbstractBean; import cokr.xit.foundation.data.DataObject; @@ -23,18 +23,18 @@ import cokr.xit.foundation.data.DataObject; * ================================ * */ -@Component("epostGdccBean") -public class EpostGdccBean extends AbstractBean { +@Component("epostGdntcBean") +public class EpostGdntcBean extends AbstractBean { /** 전자우편 안내문 정보 DAO */ - @Resource(name = "epostGdccMapper") - private EpostGdccMapper epostGdccMapper; + @Resource(name = "epostGdntcMapper") + private EpostGdntcMapper epostGdntcMapper; /**지정한 조건에 따라 전자우편 안내문 목록을 조회하여 반환한다. * @param req 전자우편 안내문 조회 조건 * @return 전자우편 안내문 목록 */ - public List getEpostGdccList(EpostQuery req) { + public List getEpostGdntcList(EpostQuery req) { // 사용 여부 확인 if (req.getUseYn() == null) { req.setUseYn("Y"); @@ -48,37 +48,37 @@ public class EpostGdccBean extends AbstractBean { } } - return epostGdccMapper.selectEpostGdccList(req); + return epostGdntcMapper.selectEpostGdntcList(req); } /**지정한 조건에 따라 전자우편 안내문 객체들을 반환한다. * @param req 전자우편 안내문 조회 조건 * @return 전자우편 안내문 객체 목록 */ - public List getEpostGdccs(EpostQuery req) { + public List getEpostGdntcs(EpostQuery req) { // 사용 여부 확인 if (req.getUseYn() == null) { req.setUseYn("Y"); } if (req.getOrderBy() == null) { - req.setOrderBy("EG.GDCC_ID DESC"); + req.setOrderBy("EG.GDNTC_ID DESC"); } - return epostGdccMapper.selectEpostGdccs(req); + return epostGdntcMapper.selectEpostGdntcs(req); } /**지정한 조건에 따라 전자우편 안내문 정보를 반환한다. * @param req 전자우편 안내문 조회 조건 * @return 전자우편 안내문 정보 */ - public DataObject getEpostGdccInfo(EpostQuery req) { + public DataObject getEpostGdntcInfo(EpostQuery req) { DataObject dataInfo = new DataObject(); if (req.getCallPurpose().equals("create")) { dataInfo.set("SGG_CD", req.getSggCd()); dataInfo.set("TASK_SE_CD", req.getTaskSeCd()); } else { - dataInfo = epostGdccMapper.selectEpostGdccInfo(req);; + dataInfo = epostGdntcMapper.selectEpostGdntcInfo(req);; } return dataInfo; @@ -91,9 +91,9 @@ public class EpostGdccBean extends AbstractBean { *
  • 그렇지 않으면 false
    • * */ - public String createEpostGdcc(EpostGdcc epostGdcc) { - // 전자우편안내문(TB_EPOST_GDCC) 정보를 등록한다. - int rtnNocs = epostGdccMapper.insertEpostGdcc(epostGdcc); + public String createEpostGdntc(EpostGdntc epostGdntc) { + // 전자우편안내문(TB_EPOST_GDNTC) 정보를 등록한다. + int rtnNocs = epostGdntcMapper.insertEpostGdntc(epostGdntc); if (rtnNocs != 1) { throw new RuntimeException("전자우편 안내문 정보 등록에 실패하였습니다."); // 예외를 발생시켜서 DB Rollback } @@ -108,9 +108,9 @@ public class EpostGdccBean extends AbstractBean { *
  • 그렇지 않으면 false
    • * */ - public String updateEpostGdcc(EpostGdcc epostGdcc) { - // 전자우편안내문(TB_EPOST_GDCC) 정보를 수정한다. - int rtnNocs = epostGdccMapper.updateEpostGdcc(epostGdcc); + public String updateEpostGdntc(EpostGdntc epostGdntc) { + // 전자우편안내문(TB_EPOST_GDNTC) 정보를 수정한다. + int rtnNocs = epostGdntcMapper.updateEpostGdntc(epostGdntc); if (rtnNocs != 1) { throw new RuntimeException("전자우편 안내문 정보 수정에 실패하였습니다."); // 예외를 발생시켜서 DB Rollback } @@ -125,9 +125,9 @@ public class EpostGdccBean extends AbstractBean { *
  • 그렇지 않으면 false
    • * */ - public String removeEpostGdcc(EpostGdcc epostGdcc) { - // 전자우편안내문(TB_EPOST_GDCC) 정보를 삭제한다. - int rtnNocs = epostGdccMapper.deleteEpostGdcc(epostGdcc); + public String removeEpostGdntc(EpostGdntc epostGdntc) { + // 전자우편안내문(TB_EPOST_GDNTC) 정보를 삭제한다. + int rtnNocs = epostGdntcMapper.deleteEpostGdntc(epostGdntc); if (rtnNocs < 1) { throw new RuntimeException("전자우편 안내문 정보 수정에 실패하였습니다."); // 예외를 발생시켜서 DB Rollback } diff --git a/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdntcServiceBean.java b/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdntcServiceBean.java new file mode 100644 index 00000000..32e1edc5 --- /dev/null +++ b/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdntcServiceBean.java @@ -0,0 +1,63 @@ +package cokr.xit.fims.epst.service.bean; + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import cokr.xit.foundation.component.AbstractServiceBean; +import cokr.xit.foundation.data.DataObject; + +import cokr.xit.fims.epst.EpostGdntc; +import cokr.xit.fims.epst.EpostQuery; +import cokr.xit.fims.epst.service.EpostGdntcService; + +/**전자우편 안내문 서비스 구현체. + * + *

    상세 설명: + * + * 

    + * ============ 변경 이력 ============
+ * 2023-12-04	JoJH 최초 작성
+ * ================================
+ *
    + */ +@Service("epostGdntcService") +public class EpostGdntcServiceBean extends AbstractServiceBean implements EpostGdntcService { + + /** 전자우편 안내문 정보 Bean */ + @Resource(name = "epostGdntcBean") + private EpostGdntcBean epostGdntcBean; + + @Override + public List getEpostGdntcList(EpostQuery req) { + return epostGdntcBean.getEpostGdntcList(req); + } + + @Override + public List getEpostGdntcs(EpostQuery req) { + return epostGdntcBean.getEpostGdntcs(req); + } + + @Override + public DataObject getEpostGdntcInfo(EpostQuery req) { + return epostGdntcBean.getEpostGdntcInfo(req); + } + + @Override + public String createEpostGdntc(EpostGdntc epostGdntc) { + return epostGdntcBean.createEpostGdntc(epostGdntc); + } + + @Override + public String updateEpostGdntc(EpostGdntc epostGdntc) { + return epostGdntcBean.updateEpostGdntc(epostGdntc); + } + + @Override + public String removeEpostGdntc(EpostGdntc epostGdntc) { + return epostGdntcBean.removeEpostGdntc(epostGdntc); + } + +} 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 8e44c99e..30d8c235 100644 --- a/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java +++ b/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java @@ -23,10 +23,10 @@ import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; -import cokr.xit.fims.epst.EpostGdcc; +import cokr.xit.fims.epst.EpostGdntc; import cokr.xit.fims.epst.EpostQuery; import cokr.xit.fims.epst.EpostRcptReg; -import cokr.xit.fims.epst.service.EpostGdccService; +import cokr.xit.fims.epst.service.EpostGdntcService; import cokr.xit.fims.epst.service.EpostRcptDtlService; import cokr.xit.fims.epst.service.EpostRcptRegService; import cokr.xit.fims.epst.service.EpostRcptRsltService; @@ -51,27 +51,27 @@ public class Epst02Controller extends ApplicationController { public class METHOD_URL { public static final String - epostGuidanceDocumentMain = "/010/main.do" // 전자우편 안내문 메인 - , getEpostGuidanceDocumentList = "/010/list.do" // 전자우편 안내문 목록 조회 - , removeEpostGuidanceDocument = "/010/remove.do" // 전자우편 안내문 삭제 - , getEpostGuidanceDocumentInfo = "/020/info.do" // 전자우편 안내문 상세 정보 조회 - , createEpostGuidanceDocument = "/020/create.do" // 전자우편 안내문 등록 - , updateEpostGuidanceDocument = "/020/update.do" // 전자우편 안내문 수정 - , epostReceiptRegistrationMain = "/030/main.do" // 전자우편 우편발송 메인 - , getEpostReceiptRegistrationList = "/030/list.do" // 전자우편 우편발송 목록 조회 - , updateEpostSendingProcessStatus = "/030/updateSttsCd.do" // 전자우편 우편발송 처리상태코드 수정 - , removeEpostSendingStatus = "/030/remove.do" // 전자우편 우편발송 삭제 - , getEpostReceiptRegistrationDetailInfo = "/040/info.do" // 전자우편 발송 상세 정보 조회 - , getEpostReceiptRegistrationDetailList = "/040/list.do" // 전자우편 발송 상세 정보 조회 - , epostReceiptResultMain = "/050/main.do" // 전자우편 접수 결과 메인 - , getEpostReceiptResultList = "/050/list.do" // 전자우편 접수 결과 목록 조회 - , getEpostReceiptResultSumAmount = "/050/sumAmt.do" // 전자우편 접수 결과 합계 금액 조회 + epostGuidanceNoticeMain = "/010/main.do" // 전자우편 안내문 메인 + , getEpostGuidanceNoticeList = "/010/list.do" // 전자우편 안내문 목록 조회 + , removeEpostGuidanceNotice = "/010/remove.do" // 전자우편 안내문 삭제 + , getEpostGuidanceNoticeInfo = "/020/info.do" // 전자우편 안내문 상세 정보 조회 + , createEpostGuidanceNotice = "/020/create.do" // 전자우편 안내문 등록 + , updateEpostGuidanceNotice = "/020/update.do" // 전자우편 안내문 수정 + , epostReceiptRegistrationMain = "/030/main.do" // 전자우편 우편발송 메인 + , getEpostReceiptRegistrationList = "/030/list.do" // 전자우편 우편발송 목록 조회 + , updateEpostSendingProcessStatus = "/030/updateSttsCd.do" // 전자우편 우편발송 처리상태코드 수정 + , removeEpostSendingStatus = "/030/remove.do" // 전자우편 우편발송 삭제 + , getEpostReceiptRegistrationDetailInfo = "/040/info.do" // 전자우편 발송 상세 정보 조회 + , getEpostReceiptRegistrationDetailList = "/040/list.do" // 전자우편 발송 상세 정보 조회 + , epostReceiptResultMain = "/050/main.do" // 전자우편 접수 결과 메인 + , getEpostReceiptResultList = "/050/list.do" // 전자우편 접수 결과 목록 조회 + , getEpostReceiptResultSumAmount = "/050/sumAmt.do" // 전자우편 접수 결과 합계 금액 조회 ; } /**전자우편 안내문 서비스*/ - @Resource(name="epostGdccService") - private EpostGdccService epostGdccService; + @Resource(name="epostGdntcService") + private EpostGdntcService epostGdntcService; /**전자우편 접수 등록 서비스*/ @Resource(name="epostRcptRegService") @@ -92,8 +92,8 @@ public class Epst02Controller extends ApplicationController { * 조건없는 {@link #getEpostGdccList(EpostGdccQuery) 전자우편 안내문 조회 결과}를 포함시킨다. * @return /epostGdcc/epostGdcc-main */ - @RequestMapping(name="안내문관리", value=METHOD_URL.epostGuidanceDocumentMain) - public ModelAndView epostGuidanceDocumentMain() { + @RequestMapping(name="안내문관리", value=METHOD_URL.epostGuidanceNoticeMain) + public ModelAndView epostGuidanceNoticeMain() { ModelAndView mav = new ModelAndView("fims/epst/epst02010-main"); // 사용자 정보 @@ -104,7 +104,7 @@ public class Epst02Controller extends ApplicationController { return mav .addObject("pageName", "epst02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("infoPrefix", "epostGdcc") // prefix + .addObject("infoPrefix", "epostGdntc") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) @@ -114,7 +114,7 @@ public class Epst02Controller extends ApplicationController { } /**전자우편 안내문 목록을 조회하여 반환한다. - * {@link EpostGdccService#getEpostGdccList(EpostGdccQuery)} 참고 + * {@link EpostGdntcService#getEpostGdccList(EpostGdccQuery)} 참고 * @param req 전자우편 안내문 조회 조건 * @return jsonView * 
     {
@@ -125,11 +125,11 @@ public class Epst02Controller extends ApplicationController {
 	 * }
    */ @Task - @RequestMapping(name="전자우편 안내문 목록 조회", value=METHOD_URL.getEpostGuidanceDocumentList) - public ModelAndView getEpostGuidanceDocumentList(EpostQuery req) { + @RequestMapping(name="전자우편 안내문 목록 조회", value=METHOD_URL.getEpostGuidanceNoticeList) + public ModelAndView getEpostGuidanceNoticeList(EpostQuery req) { if (!"xls".equals(req.getDownload())) { - List result = epostGdccService.getEpostGdccList(setFetchSize(req)); - return setCollectionInfo(new ModelAndView("jsonView"), result, "epostGdcc"); + List result = epostGdntcService.getEpostGdntcList(setFetchSize(req)); + return setCollectionInfo(new ModelAndView("jsonView"), result, "epostGdntc"); } else { // 현재 날짜 구하기 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); @@ -142,7 +142,7 @@ public class Epst02Controller extends ApplicationController { CellStyle center = format.cellStyle(Style.CENTER); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); - List list = epostGdccService.getEpostGdccList(req.setFetchSize(0)); + List list = epostGdntcService.getEpostGdntcList(req.setFetchSize(0)); Map valueMap = new HashMap(); @@ -176,9 +176,9 @@ public class Epst02Controller extends ApplicationController { * } */ @Task - @RequestMapping(name="전자우편 안내문 정보 조회", value=METHOD_URL.getEpostGuidanceDocumentInfo) - public ModelAndView getEpostGuidanceDocumentInfo(HttpServletRequest hReq, EpostQuery req) { - DataObject info = epostGdccService.getEpostGdccInfo(req); + @RequestMapping(name="전자우편 안내문 정보 조회", value=METHOD_URL.getEpostGuidanceNoticeInfo) + public ModelAndView getEpostGuidanceNoticeInfo(HttpServletRequest hReq, EpostQuery req) { + DataObject info = epostGdntcService.getEpostGdntcInfo(req); boolean json = jsonResponse(); ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/epst/epst02020-info"); @@ -190,11 +190,11 @@ public class Epst02Controller extends ApplicationController { .addObject("openerPageName", hReq.getParameter("openerPageName")) // 호출한 Jsp PageName .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 .addObject("pageName", "epst02020") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("infoPrefix", "epostGdcc") // prefix + .addObject("infoPrefix", "epostGdntc") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) - .addObject("epostGdccInfo", json ? info : toJson(info)) // + .addObject("epostGdntcInfo", json ? info : toJson(info)) // ; } @@ -206,10 +206,10 @@ public class Epst02Controller extends ApplicationController { * } */ @Task - @RequestMapping(name="전자우편 안내문 등록", value=METHOD_URL.createEpostGuidanceDocument) - public ModelAndView createEpostGuidanceDocument(EpostGdcc epostGdcc) { + @RequestMapping(name="전자우편 안내문 등록", value=METHOD_URL.createEpostGuidanceNotice) + public ModelAndView createEpostGuidanceNotice(EpostGdntc epostGdntc) { boolean saved = false; - String rtnMsg = epostGdccService.createEpostGdcc(epostGdcc); + String rtnMsg = epostGdntcService.createEpostGdntc(epostGdntc); if (rtnMsg.contains("[S]")) { saved = true; @@ -230,10 +230,10 @@ public class Epst02Controller extends ApplicationController { * } */ @Task - @RequestMapping(name="전자우편 안내문 수정", value=METHOD_URL.updateEpostGuidanceDocument) - public ModelAndView updateEpostGuidanceDocument(EpostGdcc epostGdcc) { + @RequestMapping(name="전자우편 안내문 수정", value=METHOD_URL.updateEpostGuidanceNotice) + public ModelAndView updateEpostGuidanceNotice(EpostGdntc epostGdntc) { boolean saved = false; - String rtnMsg = epostGdccService.updateEpostGdcc(epostGdcc); + String rtnMsg = epostGdntcService.updateEpostGdntc(epostGdntc); if (rtnMsg.contains("[S]")) { saved = true; @@ -247,7 +247,7 @@ public class Epst02Controller extends ApplicationController { } /**지정한 전자우편 안내문를 제거한다. - * @param epostGdccIds 전자우편 안내문 아이디 + * @param epostGdntcIds 전자우편 안내문 아이디 * @return jsonView * 
     {
 	 *     "affected": 저장된 정보수
@@ -255,10 +255,10 @@ public class Epst02Controller extends ApplicationController {
 	 * }
    */ @Task - @RequestMapping(name="전자우편 안내문 삭제", value=METHOD_URL.removeEpostGuidanceDocument) - public ModelAndView removeEpostGuidanceDocument(EpostGdcc epostGdcc) { + @RequestMapping(name="전자우편 안내문 삭제", value=METHOD_URL.removeEpostGuidanceNotice) + public ModelAndView removeEpostGuidanceNotice(EpostGdntc epostGdntc) { boolean saved = false; - String rtnMsg = epostGdccService.removeEpostGdcc(epostGdcc); + String rtnMsg = epostGdntcService.removeEpostGdntc(epostGdntc); if (rtnMsg.contains("[S]")) { saved = true; diff --git a/src/main/java/cokr/xit/fims/sprt/MediaUtil.java b/src/main/java/cokr/xit/fims/sprt/MediaUtil.java index 4f1db3b9..1e1fb7bb 100644 --- a/src/main/java/cokr/xit/fims/sprt/MediaUtil.java +++ b/src/main/java/cokr/xit/fims/sprt/MediaUtil.java @@ -28,8 +28,8 @@ public class MediaUtil { DataObject mosaicInfo = mosaicInfos.get(k); float x = mosaicInfo.number("X_AXS").floatValue(); float y = mosaicInfo.number("Y_AXS").floatValue(); - float w = mosaicInfo.number("MOSC_LT").floatValue(); - float h = mosaicInfo.number("MOSC_HG").floatValue(); + float w = mosaicInfo.number("MOSC_LEN").floatValue(); + float h = mosaicInfo.number("MOSC_HGT").floatValue(); PstnAndSize mosaic = new PstnAndSize(x, y, w, h); mosaic.transXY(transX, transY); diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/MediaBean.java b/src/main/java/cokr/xit/fims/sprt/service/bean/MediaBean.java index 64de75ba..23e8e70d 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/bean/MediaBean.java +++ b/src/main/java/cokr/xit/fims/sprt/service/bean/MediaBean.java @@ -83,8 +83,8 @@ public class MediaBean extends AbstractBean { } mosaic += mosaicInfo.string("X_AXS") + "," + mosaicInfo.string("Y_AXS") - + "," + mosaicInfo.string("MOSC_LT") - + "," + mosaicInfo.string("MOSC_HG"); + + "," + mosaicInfo.string("MOSC_LEN") + + "," + mosaicInfo.string("MOSC_HGT"); } fileInfo.set("MOSAIC", mosaic); } else { diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml index 3fba5400..76c9eb84 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml @@ -72,7 +72,7 @@ - + diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml index 981d214d..1b0e1cfe 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml @@ -84,7 +84,7 @@ SELECT C.CRDN_ID , CC.CVLCPT_PRCS_PIC_NM , CC.CVLCPT_PRCS_PRNMNT_DT , CC.CVLCPT_PRCS_CD - , CC.CVLCPT_PRCS_SUMRY + , CC.CVLCPT_PRCS_SMRY , CC.CVLCPT_PRCS_CMPTN_DT , CC.CVLCPT_PRCS_PIC , CC.CVLCPT_TRSM_DT diff --git a/src/main/resources/sql/mapper/fims/cvlc/answer-words-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/answer-words-mapper.xml index e4da11f7..cd1f8709 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/answer-words-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/answer-words-mapper.xml @@ -175,7 +175,7 @@ INSERT , DSTRBNC_YN , ANS_RSN_CD , ANS_RSN_NM - , PRCS_SUMRY + , PRCS_SMRY , PRCS_RSLT_CN , USE_YN , REG_DT @@ -191,7 +191,7 @@ VALUES ( , IFNULL(#{dstrbncYn},'N') , #{ansRsnCd} , #{ansRsnNm} - , #{prcsSumry} + , #{prcsSmry} , #{prcsRsltCn} , 'Y' , diff --git a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml index 43a6edc2..1b88a1ca 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml @@ -19,7 +19,7 @@ INSERT INTO TB_CRDN_CVLCPT ( , CVLCPT_PRCS_PIC_NM , CVLCPT_PRCS_PRNMNT_DT , CVLCPT_PRCS_CD - , CVLCPT_PRCS_SUMRY + , CVLCPT_PRCS_SMRY , CVLCPT_PRCS_RSLT_CN , CVLCPT_PRCS_CMPTN_DT , CVLCPT_PRCS_PIC @@ -50,7 +50,7 @@ INSERT INTO TB_CRDN_CVLCPT ( , #{cvlcptPrcsPicNm} , #{cvlcptPrcsPrnmntDt} , #{cvlcptPrcsCd} - , #{cvlcptPrcsSumry} + , #{cvlcptPrcsSmry} , #{cvlcptPrcsRsltCn} , #{cvlcptPrcsCmptnDt} , #{cvlcptPrcsPic} @@ -142,7 +142,7 @@ SELECT C.CRDN_ID ) AS CVLCPT_PRCS_PIC_TELNO , CC.CVLCPT_PRCS_PRNMNT_DT , CC.CVLCPT_PRCS_CD - , CC.CVLCPT_PRCS_SUMRY + , CC.CVLCPT_PRCS_SMRY , CC.CVLCPT_PRCS_CMPTN_DT , CC.CVLCPT_PRCS_PIC , CC.CVLCPT_TRSM_DT @@ -372,17 +372,17 @@ SELECT C.CRDN_ID /* 초기자료 민원 처리구분 수정(crdnCvlcptMapper.updateCvlcptProcessSection) */ UPDATE TB_CRDN_CVLCPT SET MDFCN_DT = /* 수정일시 */ - , MDFR = #{currentUser.id} /* 수정자 */ - , CVLCPT_PRCS_PIC = #{currentUser.id} /* 민원 처리 담당자 */ + , MDFR = #{currentUser.id} /* 수정자 */ + , CVLCPT_PRCS_PIC = #{currentUser.id} /* 민원 처리 담당자 */ , CVLCPT_PRCS_PIC_NM = (SELECT USER_NM FROM TB_USER WHERE USER_ID=#{currentUser.id}) , CVLCPT_PRCS_CMPTN_DT = - , CVLCPT_PRCS_CD = #{crdnCvlcpt.cvlcptPrcsCd} /* 민원처리코드 */ - , CVLCPT_TRSM_CD = #{crdnCvlcpt.cvlcptTrsmCd} /* 민원전송코드 */ - , CVLCPT_PRCS_SUMRY = #{crdnCvlcpt.cvlcptPrcsSumry} /* 민원처리요약 */ + , CVLCPT_PRCS_CD = #{crdnCvlcpt.cvlcptPrcsCd} /* 민원처리코드 */ + , CVLCPT_TRSM_CD = #{crdnCvlcpt.cvlcptTrsmCd} /* 민원전송코드 */ + , CVLCPT_PRCS_SMRY = #{crdnCvlcpt.cvlcptPrcsSmry} /* 민원처리요약 */ - , DSTRBNC_YN = NULLIF(#{crdnCvlcpt.dstrbncYn},'N') /* 방해 여부 */ + , DSTRBNC_YN = NULLIF(#{crdnCvlcpt.dstrbncYn},'N') /* 방해 여부 */ - WHERE CVLCPT_LINK_ID = #{crdnCvlcpt.cvlcptLinkId} /* 연계 ID */ + WHERE CVLCPT_LINK_ID = #{crdnCvlcpt.cvlcptLinkId} /* 연계 ID */ @@ -395,16 +395,16 @@ SELECT C.CRDN_ID , CVLCPT_PRCS_CMPTN_DT = , CVLCPT_PRCS_CD = '01' /* 민원처리코드 */ , CVLCPT_TRSM_CD = '04' /* 민원전송코드 */ - , CVLCPT_PRCS_SUMRY = '' /* 민원처리요약 */ + , CVLCPT_PRCS_SMRY = '' /* 민원처리요약 */ , CVLCPT_PRCS_RSLT_CN = '' /* 민원처리결과내용 */ - WHERE CVLCPT_LINK_ID = #{cvlcptLinkId} /* 연계 ID */ + WHERE CVLCPT_LINK_ID = #{cvlcptLinkId} /* 연계 ID */ /* 단속민원 대장 민원처리결과내용 초기화(crdnCvlcptMapper.initCvlcptPrcsRsltCn) */ UPDATE TB_CRDN_CVLCPT - SET CVLCPT_PRCS_SUMRY = NULL /* 민원 처리 요약 */ + SET CVLCPT_PRCS_SMRY = NULL /* 민원 처리 요약 */ , CVLCPT_PRCS_RSLT_CN = NULL /* 민원 처리 결과 내용 */ , MDFCN_DT = /* 수정 일시 */ , MDFR = #{modifiedBy} /* 수정자 */ @@ -567,7 +567,7 @@ SELECT CC.CVLCPT_LINK_ID /* 민원 연계 ID */ , CC.CVLCPT_RCPT_NO /* 민원 접수 번호 */ , CC.CVLCPT_APLY_TTL_NM /* 민원 신청 제목 명 */ , CC.CVLCPT_GIST /* 민원 요지 */ - , CC.CVLCPT_PRCS_SUMRY /* 민원 처리 요약 */ + , CC.CVLCPT_PRCS_SMRY /* 민원 처리 요약 */ , CC.CVLCPT_PRCS_RSLT_CN /* 민원 처리 결과 내용 */ , CC.CVLCPT_PRCS_CMPTN_DT /* 민원 처리 완료 일시 */ , CC.CVLCPT_PRCS_PIC_NM /* 민원 처리 담당자 명 */ diff --git a/src/main/resources/sql/mapper/fims/cvlc/warning-words-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/warning-words-mapper.xml index a9576cd9..3eb4638a 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/warning-words-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/warning-words-mapper.xml @@ -10,9 +10,9 @@ SELECT A.CODE AS LEVY_EXCL_RSN_CD , B.MAIL_TTL_NM , B.MAIL_CN FROM TB_CMN_CODE A - LEFT OUTER JOIN TB_CVLCPT_ANS_WORDS B + LEFT OUTER JOIN TB_CVLCPT_ANS_WORDS B ON (A.CODE = B.ANS_RSN_CD - AND B.USE_YN = 'Y' + AND B.USE_YN = 'Y' AND B.ANS_SE_CD = '2' AND B.SGG_CD = #{sggCd} AND B.TASK_SE_CD = #{taskSeCd} @@ -40,7 +40,7 @@ INSERT , DSTRBNC_YN , ANS_RSN_CD , ANS_RSN_NM - , PRCS_SUMRY + , PRCS_SMRY , MAIL_TTL_NM , MAIL_CN , USE_YN diff --git a/src/main/resources/sql/mapper/fims/epst/epostGdcc-mapper.xml b/src/main/resources/sql/mapper/fims/epst/epostGdntc-mapper.xml similarity index 77% rename from src/main/resources/sql/mapper/fims/epst/epostGdcc-mapper.xml rename to src/main/resources/sql/mapper/fims/epst/epostGdntc-mapper.xml index 112e5283..e5d2e0be 100644 --- a/src/main/resources/sql/mapper/fims/epst/epostGdcc-mapper.xml +++ b/src/main/resources/sql/mapper/fims/epst/epostGdntc-mapper.xml @@ -1,14 +1,14 @@ - + - - + + @@ -23,7 +23,7 @@ - SELECT EG.GDCC_ID + SELECT EG.GDNTC_ID , EG.SGG_CD , EG.TASK_SE_CD , (SELECT GET_CODE_NM('FIM054', EG.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM @@ -40,10 +40,10 @@ , EG.MDFCN_DT , EG.MDFR , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = EG.MDFR) AS MDFR_NM - FROM TB_EPOST_GDCC EG + FROM TB_EPOST_GDNTC EG - /* 전자우편 안내문 목록 조회(epostGdntcMapper.selectEpostGdntcList) */ WHERE EG.SGG_CD = #{sggCd} @@ -108,16 +108,16 @@ - /* 전자우편 안내문 객체 가져오기(epostGdntcMapper.selectEpostGdntcs) */ - - AND EG.GDCC_ID IN ( - #{gdccIds} + + AND EG.GDNTC_ID IN ( + #{gdntcIds} ) - - AND EG.GDCC_ID = #{gdccId} + + AND EG.GDNTC_ID = #{gdntcId} AND EG.USE_YN = #{useYn} @@ -126,15 +126,15 @@ - /* 전자우편 안내문 등록(epostGdccMapper.insertEpostGdcc) */ - - SELECT CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y%m%d'), '-', LPAD(CAST(IFNULL(MAX(SUBSTRING(GDCC_ID, 10)) + 1, 1) AS INT), 4, '0')) AS NEW_ID - FROM TB_EPOST_GDCC - WHERE GDCC_ID LIKE CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y%m%d'), '%') + /* 전자우편 안내문 등록(epostGdntcMapper.insertEpostGdntc) */ + + SELECT CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y%m%d'), '-', LPAD(CAST(IFNULL(MAX(SUBSTRING(GDNTC_ID, 10)) + 1, 1) AS INT), 4, '0')) AS NEW_ID + FROM TB_EPOST_GDNTC + WHERE GDNTC_ID LIKE CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y%m%d'), '%') INSERT - INTO TB_EPOST_GDCC ( - GDCC_ID + INTO TB_EPOST_GDNTC ( + GDNTC_ID , SGG_CD , TASK_SE_CD , SNDNG_SE_CD @@ -148,7 +148,7 @@ , MDFR ) VALUES ( - #{gdccId} + #{gdntcId} , #{sggCd} , #{taskSeCd} , #{sndngSeCd} @@ -163,30 +163,30 @@ ) - /* 전자우편 안내문 수정(epostGdccMapper.updateEpostGdcc) */ - UPDATE TB_EPOST_GDCC + /* 전자우편 안내문 수정(epostGdntcMapper.updateEpostGdntc) */ + UPDATE TB_EPOST_GDNTC SET SNDNG_SE_CD = #{sndngSeCd} , TTL_NM = #{ttlNm} , WORDS_CN = #{wordsCn} , MDFCN_DT = , MDFR = #{modifiedBy} - WHERE GDCC_ID = #{gdccId} + WHERE GDNTC_ID = #{gdntcId} AND USE_YN = 'Y' - /* 전자우편 안내문 삭제(epostGdccMapper.deleteEpostGdcc) */ - UPDATE TB_EPOST_GDCC + /* 전자우편 안내문 삭제(epostGdntcMapper.deleteEpostGdntc) */ + UPDATE TB_EPOST_GDNTC SET USE_YN = 'N' , MDFCN_DT = , MDFR = #{modifiedBy} - - WHERE GDCC_ID IN ( - #{gdccId} + + WHERE GDNTC_ID IN ( + #{gdntcId} ) - WHERE GDCC_ID = #{gdccId} + WHERE GDNTC_ID = #{gdntcId} AND USE_YN = 'Y' diff --git a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml index 388e0315..3b652ed7 100644 --- a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml +++ b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml @@ -144,7 +144,7 @@ , CC.CVLCPT_APLY_NO , CC.CVLCPT_RCPT_NO , CC.CVLCPT_PRCS_PIC_NM - , CC.CVLCPT_PRCS_SUMRY + , CC.CVLCPT_PRCS_SMRY , CC.CVLCPT_PRCS_CD , (SELECT GET_CODE_NM('FIM017', CC.CVLCPT_PRCS_CD) FROM DUAL) AS CVLCPT_PRCS_NM , CC.CVLCPT_PRCS_CMPTN_DT 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 da5689aa..5a656b95 100644 --- a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml @@ -794,7 +794,7 @@ , CC.CVLCPT_RCPT_YMD , CC.CVLCPT_APLY_NO , CC.CVLCPT_RCPT_NO - , CC.CVLCPT_PRCS_SUMRY + , CC.CVLCPT_PRCS_SMRY , CC.CVLCPT_PRCS_CD , CC.CVLCPT_PRCS_CMPTN_DT , CC.CVLCPT_TRSM_CD diff --git a/src/main/resources/sql/mapper/fims/sprt/media-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/media-mapper.xml index 5e251c21..23c13bcb 100644 --- a/src/main/resources/sql/mapper/fims/sprt/media-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/media-mapper.xml @@ -8,8 +8,8 @@ SELECT MOSC_ID , FILE_ID , X_AXS , Y_AXS - , MOSC_LT - , MOSC_HG + , MOSC_LEN + , MOSC_HGT FROM TB_FILE_MOSC WHERE FILE_ID = #{fileId} AND DEL_YN = 'N' @@ -18,7 +18,7 @@ SELECT MOSC_ID /* 이미지파일 순서 변경 (mediaMapper.reorder) */ UPDATE TB_FILE - SET SRT_ORD = #{srtOrd} + SET SRT_ORD = #{srtOrd} WHERE FILE_ID = #{fileId} @@ -36,8 +36,8 @@ INSERT , FILE_ID , X_AXS , Y_AXS - , MOSC_LT - , MOSC_HG + , MOSC_LEN + , MOSC_HGT , DEL_YN , REG_DT , RGTR @@ -48,8 +48,8 @@ SELECT #{newMoscId} , #{newFileId} , X_AXS , Y_AXS - , MOSC_LT - , MOSC_HG + , MOSC_LEN + , MOSC_HGT , 'N' , , #{currentUser.id} diff --git a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml index a608ce62..b2d62f23 100644 --- a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml @@ -137,7 +137,7 @@ , CC.CVLCPT_PRCS_PIC_NM , CC.CVLCPT_PRCS_PRNMNT_DT , CC.CVLCPT_PRCS_CD - , CC.CVLCPT_PRCS_SUMRY + , CC.CVLCPT_PRCS_SMRY , CC.CVLCPT_PRCS_RSLT_CN , CC.CVLCPT_PRCS_CMPTN_DT , CC.CVLCPT_PRCS_PIC diff --git a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp index 03a96163..9795666b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp @@ -158,9 +158,9 @@