From 9372ab082dbb1c3833f6a4423928856f330f1e6d Mon Sep 17 00:00:00 2001 From: jjh Date: Wed, 6 Dec 2023 14:40:13 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9A=B0=ED=8E=B8=ED=86=B5=ED=95=A9=20-=20?= =?UTF-8?q?=EB=B0=9C=EC=86=A1=EC=83=81=ED=83=9C=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/epst/dao/EpostGdccMapper.java | 3 + .../xit/fims/epst/dao/EpostRcptRegMapper.java | 20 +- .../epst/service/EpostRcptRegService.java | 10 +- .../fims/epst/service/bean/EpostGdccBean.java | 19 +- .../epst/service/bean/EpostRcptRegBean.java | 39 +- .../service/bean/EpostRcptRegServiceBean.java | 7 +- .../xit/fims/epst/web/Epst01Controller.java | 72 ++- .../xit/fims/epst/web/Epst02Controller.java | 11 +- .../xit/fims/excl/dao/LevyExclMapper.java | 2 +- .../fims/excl/service/bean/LevyExclBean.java | 8 +- .../service/bean/LevyExclServiceBean.java | 10 +- .../cokr/xit/fims/task/web/CmnController.java | 24 +- .../cokr/xit/fims/task/web/DpvController.java | 12 + .../mapper/fims/epst/epostRcptReg-mapper.xml | 117 ++-- .../WEB-INF/jsp/fims/epst/epst01010-main.jsp | 518 ++++++++++++++++++ .../WEB-INF/jsp/fims/epst/epst01020-info.jsp | 181 ++++++ .../WEB-INF/jsp/fims/epst/epst02010-main.jsp | 6 +- .../WEB-INF/jsp/fims/epst/epst02020-info.jsp | 12 +- .../WEB-INF/jsp/fims/excl/excl01020-info.jsp | 16 +- 19 files changed, 972 insertions(+), 115 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/fims/epst/epst01010-main.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/fims/epst/epst01020-info.jsp 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 47434fc2..18871094 100644 --- a/src/main/java/cokr/xit/fims/epst/dao/EpostGdccMapper.java +++ b/src/main/java/cokr/xit/fims/epst/dao/EpostGdccMapper.java @@ -42,6 +42,9 @@ public interface EpostGdccMapper extends AbstractMapper { */ default DataObject selectEpostGdccInfo(EpostQuery req) { // 기본 정렬 + 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 6a4d631e..49243a27 100644 --- a/src/main/java/cokr/xit/fims/epst/dao/EpostRcptRegMapper.java +++ b/src/main/java/cokr/xit/fims/epst/dao/EpostRcptRegMapper.java @@ -35,7 +35,25 @@ public interface EpostRcptRegMapper extends AbstractMapper { * @param req 전자우편 접수 등록 조회 조건 * @return 전자우편 접수 등록 객체 목록 */ - List selectEpostRcptRegs(EpostQuery req); + List selectEpostRcptRegs(EpostQuery req); + + /**지정한 조건에 따라 부과제외 대장 객체의 마지막 1개를 반환한다. + * @param levyExclId 부과제외 ID + * @return 부과제외 대장 객체 + */ + default DataObject selectEpostRcptRegInfo(EpostQuery req) { + // 기본 정렬 + if (req.getUseYN() == null) { + req.setUseYN("Y"); + } + if (req.getOrderBy() == null) { + req.setOrderBy("ERR.CON_KEY DESC"); + } + + List epostRcptReg = selectEpostRcptRegs(req); + + return !epostRcptReg.isEmpty() ? epostRcptReg.get(0) : null; + } /**전자우편 접수 등록 정보를 등록한다. * @param params 파라미터 diff --git a/src/main/java/cokr/xit/fims/epst/service/EpostRcptRegService.java b/src/main/java/cokr/xit/fims/epst/service/EpostRcptRegService.java index 1a321a3d..8eae6ceb 100644 --- a/src/main/java/cokr/xit/fims/epst/service/EpostRcptRegService.java +++ b/src/main/java/cokr/xit/fims/epst/service/EpostRcptRegService.java @@ -14,7 +14,7 @@ import cokr.xit.fims.epst.EpostRcptDtl; * *
  * ============ 변경 이력 ============
- * 2023-10-11	mjkhan 최초 작성
+ * 2023-10-11	JoJH 최초 작성
  * ================================
  * 
*/ @@ -29,7 +29,13 @@ public interface EpostRcptRegService { * @param req 전자우편 접수 등록 조회 조건 * @return 전자우편 접수 등록 객체 목록 */ - List getEpostRcptRegs(EpostQuery req); + List getEpostRcptRegs(EpostQuery req); + + /**지정한 조건에 따라 전자우편 안내문 정보를 반환한다. + * @param req 전자우편 안내문 조회 조건 + * @return 전자우편 안내문 정보 + */ + DataObject getEpostRcptRegInfo(EpostQuery req); /**전자우편 접수 등록 정보를 등록한다. * @param epostRcptReg 전자우편 접수 등록 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 63041923..640d0ecf 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 @@ -56,6 +56,14 @@ public class EpostGdccBean extends AbstractComponent { * @return 전자우편 안내문 객체 목록 */ public List getEpostGdccs(EpostQuery req) { + // 삭제 여부 확인 + if (req.getDelYn() == null) { + req.setDelYn("N"); + } + if (req.getOrderBy() == null) { + req.setOrderBy("EG.GDCC_ID DESC"); + } + return epostGdccMapper.selectEpostGdccs(req); } @@ -64,7 +72,16 @@ public class EpostGdccBean extends AbstractComponent { * @return 전자우편 안내문 정보 */ public DataObject getEpostGdccInfo(EpostQuery req) { - return epostGdccMapper.selectEpostGdccInfo(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);; + } + + return dataInfo; } /**전자우편 안내문 정보를 등록한다. 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 ba11e7ce..b61a1b43 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 @@ -10,6 +10,7 @@ import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.data.DataObject; import cokr.xit.fims.epst.dao.EpostRcptRegMapper; +import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.epst.EpostQuery; import cokr.xit.fims.epst.EpostRcptReg; import cokr.xit.fims.epst.EpostRcptDtl; @@ -36,6 +37,18 @@ public class EpostRcptRegBean extends AbstractComponent { * @return 전자우편 접수 등록 목록 */ public List getEpostRcptRegList(EpostQuery req) { + // 삭제 여부 확인 + if (req.getDelYn() == null) { + req.setDelYn("N"); + } + // 정렬 확인 + if (req.getOrderBy() == null) { + if (req.getBy() == null) { + req.setOrderBy("REG_DT"); + } else { + req.setOrderBy(CmmnUtil.convertCamelCaseToSnakeCase(req.getBy())); + } + } return epostRcptRegMapper.selectEpostRcptRegList(req); } @@ -43,10 +56,34 @@ public class EpostRcptRegBean extends AbstractComponent { * @param req 전자우편 접수 등록 조회 조건 * @return 전자우편 접수 등록 객체 목록 */ - public List getEpostRcptRegs(EpostQuery req) { + public List getEpostRcptRegs(EpostQuery req) { + // 삭제 여부 확인 + if (req.getDelYn() == null) { + req.setDelYn("N"); + } + if (req.getOrderBy() == null) { + req.setOrderBy("ERR.CON_KEY DESC"); + } return epostRcptRegMapper.selectEpostRcptRegs(req); } + /**지정한 조건에 따라 전자우편 접수 등록 정보를 반환한다. + * @param req 전자우편 접수 등록 조회 조건 + * @return 전자우편 접수 등록 정보 + */ + public DataObject getEpostRcptRegInfo(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 = epostRcptRegMapper.selectEpostRcptRegInfo(req);; + } + + return dataInfo; + } + /**전자우편 접수 등록 정보를 등록한다. * @param epostRcptReg 전자우편 접수 등록 * @return 저장 여부 diff --git a/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRegServiceBean.java b/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRegServiceBean.java index 41561ba3..c68cc172 100644 --- a/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRegServiceBean.java +++ b/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRegServiceBean.java @@ -37,10 +37,15 @@ public class EpostRcptRegServiceBean extends AbstractServiceBean implements Epos } @Override - public List getEpostRcptRegs(EpostQuery req) { + public List getEpostRcptRegs(EpostQuery req) { return epostRcptRegBean.getEpostRcptRegs(req); } + @Override + public DataObject getEpostRcptRegInfo(EpostQuery req) { + return epostRcptRegBean.getEpostRcptRegInfo(req); + } + @Override public boolean createEpostRcptReg(EpostRcptReg epostRcptReg) { return epostRcptRegBean.createEpostRcptReg(epostRcptReg); diff --git a/src/main/java/cokr/xit/fims/epst/web/Epst01Controller.java b/src/main/java/cokr/xit/fims/epst/web/Epst01Controller.java index 50e55c88..63a4a613 100644 --- a/src/main/java/cokr/xit/fims/epst/web/Epst01Controller.java +++ b/src/main/java/cokr/xit/fims/epst/web/Epst01Controller.java @@ -1,16 +1,19 @@ package cokr.xit.fims.epst.web; import java.util.List; +import java.util.Map; import javax.annotation.Resource; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.servlet.ModelAndView; +import cokr.xit.base.code.CommonCode; +import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.epst.EpostQuery; import cokr.xit.fims.epst.EpostRcptReg; import cokr.xit.fims.epst.service.EpostRcptRegService; +import cokr.xit.foundation.data.DataObject; /**전자우편 접수 등록 서비스의 웹 컨트롤러 * @@ -28,11 +31,12 @@ public class Epst01Controller extends ApplicationController { public class METHOD_URL { public static final String - epostRcptRegMain = "/epostRcptRegMain.do" // 전자우편 접수 메인 - , getEpostRcptRegList = "/getEpostRcptRegList.do" // 전자우편 접수 조회 - , createEpostRcptReg = "/createEpostRcptReg.do" // 전자우편 접수 등록 - , updateEpostRcptReg = "/updateEpostRcptReg.do" // 전자우편 접수 수정 - , deleteEpostRcptReg = "/deleteEpostRcptReg" // 전자우편 접수 삭제 + epostReceiptRegistrationMain = "/010/main.do" // 전자우편 접수 메인 화면 + , getEpostReceiptRegistrationList = "/010/list.do" // 전자우편 접수 대장 목록 조회 + , getEpostReceiptRegistrationInfo = "/020/info.do" // 전자우편 접수 정보 조회 + , createEpostReceiptRegistration = "/010/create.do" // 전자우편 접수 정보 등록 + , updateEpostReceiptRegistration = "/010/update.do" // 전자우편 접수 정보 수정 + , deleteEpostReceiptRegistration = "/010/delete.do" // 전자우편 접수 정보 삭제 ; } @@ -44,12 +48,20 @@ public class Epst01Controller extends ApplicationController { * 조건없는 {@link #getEpostRcptRegList(EpostRcptRegQuery) 전자우편 접수 등록 조회 결과}를 포함시킨다. * @return /epostRcptReg/epostRcptReg-main */ - public ModelAndView epostRcptRegMain() { - ModelAndView mav = getEpostRcptRegList(new EpostQuery().setPageNum(1)); + public ModelAndView epostReceiptRegistrationMain() { + ModelAndView mav = new ModelAndView("fims/epst/epst01010-main"); - mav.setViewName("/epostRcptReg/epostRcptReg-main"); + // 사용자 정보 + ManagedUser managedUser = (ManagedUser)currentUser().getUser(); - return mav.addObject("epostRcptRegList", toJson(mav.getModel().get("epostRcptRegList"))); + // View(jsp)에서 사용할 공통코드를 조회 + Map> commonCodes = getCodesOf("FIM054"); + + return mav.addObject("pageName", "epst01010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("infoPrefix", "epost") // prefix + .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) + ; } /**전자우편 접수 등록 목록을 조회하여 반환한다.
@@ -64,12 +76,42 @@ public class Epst01Controller extends ApplicationController { * } */ - public ModelAndView getEpostRcptRegList(EpostQuery req) { + public ModelAndView getEpostReceiptRegistrationList(EpostQuery req) { List result = epostRcptRegService.getEpostRcptRegList(setFetchSize(req)); return setCollectionInfo(new ModelAndView("jsonView"), result, "epostRcptReg"); } + + /**전자우편 접수 등록 단건의 정보(info)를 반환한다. + * @param req 부과제외 대장 조회 조건 + * @return fims/epst/epst01020-info 또는 jsonView + *
{
+	 *     "epostRcptReg": 전자우편 접수 등록 정보
+	 * }
+ */ + public ModelAndView getEpostGuidanceDocumentInfo(EpostQuery req) { + // + DataObject epostRcptRegInfo = epostRcptRegService.getEpostRcptRegInfo(req); + + boolean json = jsonResponse(); + + ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/epst/epst02020-info"); + + // View(jsp)에서 사용할 공통코드를 조회 + Map> commonCodes = getCodesOf("FIM047", "FIM054"); + + addCodes(commonCodes, mav, "FIM047", "FIM054"); + + return mav + .addObject("pageName", "epst01020") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) + .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) + .addObject("epostRcptRegInfo", json ? epostRcptRegInfo : toJson(epostRcptRegInfo)) + ; + } + /**전자우편 접수 등록를 등록한다. * @param epostRcptReg 전자우편 접수 등록 정보 * @return jsonView @@ -77,7 +119,7 @@ public class Epst01Controller extends ApplicationController { * "saved": 등록되었으면 true, 그렇지 않으면 false * } */ - public ModelAndView createEpostRcptReg(EpostRcptReg epostRcptReg) { + public ModelAndView createEpostReceiptRegistration(EpostRcptReg epostRcptReg) { boolean saved = epostRcptRegService.createEpostRcptReg(epostRcptReg); return new ModelAndView("jsonView") .addObject("saved", saved); @@ -90,8 +132,7 @@ public class Epst01Controller extends ApplicationController { * "saved": 수정되었으면 true, 그렇지 않으면 false * } */ - @PostMapping(name = "전자우편 접수 등록 수정", value = "/update.do") - public ModelAndView updateEpostRcptReg(EpostRcptReg epostRcptReg) { + public ModelAndView updateEpostReceiptRegistration(EpostRcptReg epostRcptReg) { boolean saved = epostRcptRegService.updateEpostRcptReg(epostRcptReg); return new ModelAndView("jsonView") .addObject("saved", saved); @@ -105,8 +146,7 @@ public class Epst01Controller extends ApplicationController { * "saved": 저장되었으면 true, 그렇지 않으면 false * } */ - @PostMapping(name = "전자우편 접수 등록 제거", value = "/remove.do") - public ModelAndView removeEpostRcptReg(EpostRcptReg epostRcptReg) { + public ModelAndView deleteEpostReceiptRegistration(EpostRcptReg epostRcptReg) { boolean saved = epostRcptRegService.removeEpostRcptReg(epostRcptReg); return new ModelAndView("jsonView") .addObject("saved", saved); 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 1795ca2a..b4b615bb 100644 --- a/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java +++ b/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java @@ -5,7 +5,6 @@ import java.util.Map; import javax.annotation.Resource; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; @@ -91,14 +90,7 @@ public class Epst02Controller extends ApplicationController { */ public ModelAndView getEpostGuidanceDocumentInfo(EpostQuery req) { // - DataObject epostGdccInfo = new DataObject(); - - if (req.getCallPurpose().equals("create")) { - epostGdccInfo.set("SGG_CD", req.getSggCd()); - epostGdccInfo.set("TASK_SE_CD", req.getTaskSeCd()); - } else { - epostGdccInfo = epostGdccService.getEpostGdccInfo(req); - } + DataObject epostGdccInfo = epostGdccService.getEpostGdccInfo(req); boolean json = jsonResponse(); @@ -219,7 +211,6 @@ public class Epst02Controller extends ApplicationController { * "saved": 저장되었으면 true, 그렇지 않으면 false * } */ - @PostMapping(name = "전자우편 안내문 제거", value = "/remove.do") public ModelAndView remove(EpostGdcc epostGdcc) { boolean saved = epostGdccService.remove(epostGdcc); return new ModelAndView("jsonView") 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 774ac6b9..332d502e 100644 --- a/src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java +++ b/src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java @@ -49,7 +49,7 @@ public interface LevyExclMapper extends AbstractMapper { } // 기본 정렬 if (req.getOrderBy() == null) { - req.setOrderBy("LE.LEVY_EXCL_ID DESC"); + req.setOrderBy("C.CRDN_ID, LE.LEVY_EXCL_ID DESC"); } List levyExcls = selectLevyExcls(req); 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 713a4780..6cc7c947 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 @@ -79,7 +79,13 @@ public class LevyExclBean extends AbstractComponent { * @return 부과제외 정보 */ public DataObject getLevyExclInfo(LevyExclQuery req) { - return levyExclMapper.selectLevyExclInfo(req); + DataObject levyExclInfo = levyExclMapper.selectLevyExclInfo(req); + + if (req.getCallPurpose().equals("create")) { + levyExclInfo.set("LEVY_EXCL_SE_CD", req.getLevyExclSeCd()); // 부과 제외 구분 코드 + } + + return levyExclInfo; } /**지정한 단속 ID의 단속 정보를 반환한다.
diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclServiceBean.java index 73a0d5ba..ddb0b891 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclServiceBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclServiceBean.java @@ -41,15 +41,7 @@ public class LevyExclServiceBean extends AbstractServiceBean implements LevyExcl @Override public DataObject getLevyExclInfo(LevyExclQuery req) { - if (req.getCallPurpose() == null) { - req.setCallPurpose("view"); - } - - if (req.getCallPurpose().equals("create")) { - return levyExclBean.getCrdnInfo(req); - } else { - return levyExclBean.getLevyExclInfo(req); - } + return levyExclBean.getLevyExclInfo(req); } @Override diff --git a/src/main/java/cokr/xit/fims/task/web/CmnController.java b/src/main/java/cokr/xit/fims/task/web/CmnController.java index ed033abc..5fd024cb 100644 --- a/src/main/java/cokr/xit/fims/task/web/CmnController.java +++ b/src/main/java/cokr/xit/fims/task/web/CmnController.java @@ -546,10 +546,28 @@ public class CmnController { } @Controller - @RequestMapping(name="우편통합", value=Epst02Controller.CLASS_URL) - class Epst02Controller extends cokr.xit.fims.epst.web.Epst02Controller { + @RequestMapping(name="우편통합", value=Epst01Controller.CLASS_URL) + class Epst01Controller extends cokr.xit.fims.epst.web.Epst01Controller { - @Override + @Override + @RequestMapping(name="발송상태", value=METHOD_URL.epostReceiptRegistrationMain) + public ModelAndView epostReceiptRegistrationMain() { + return super.epostReceiptRegistrationMain(); + } + +// @Override +// @RequestMapping(name="정산결과", value=METHOD_URL.epostGuidanceDocumentMain) +// public ModelAndView epostGuidanceDocumentMain() { +// return super.epostGuidanceDocumentMain(); +// } + + } + + @Controller + @RequestMapping(name="우편통합_안내문 관리", value=Epst02Controller.CLASS_URL) + class Epst02Controller extends cokr.xit.fims.epst.web.Epst02Controller { + + @Override @RequestMapping(name="전자우편 안내문 메인", value=METHOD_URL.epostGuidanceDocumentMain) public ModelAndView epostGuidanceDocumentMain() { return super.epostGuidanceDocumentMain(); diff --git a/src/main/java/cokr/xit/fims/task/web/DpvController.java b/src/main/java/cokr/xit/fims/task/web/DpvController.java index fd1907d3..5b80358a 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -894,6 +894,18 @@ public class DpvController { } + @Controller + @RequestMapping(name="우편통합", value=CLASS_URL+Epst01Controller.CLASS_URL) + class Epst01Controller extends cokr.xit.fims.epst.web.Epst01Controller { + + @Override + @RequestMapping(name="전자우편안내문 대장 목록 조회", value=METHOD_URL.getEpostReceiptRegistrationList) + public ModelAndView getEpostReceiptRegistrationList(EpostQuery req) { + return super.getEpostReceiptRegistrationList(req); + } + + } + @Controller @RequestMapping(name="우편통합", value=CLASS_URL+Epst02Controller.CLASS_URL) class Epst02Controller extends cokr.xit.fims.epst.web.Epst02Controller { diff --git a/src/main/resources/sql/mapper/fims/epst/epostRcptReg-mapper.xml b/src/main/resources/sql/mapper/fims/epst/epostRcptReg-mapper.xml index 2fccb1a1..69067025 100644 --- a/src/main/resources/sql/mapper/fims/epst/epostRcptReg-mapper.xml +++ b/src/main/resources/sql/mapper/fims/epst/epostRcptReg-mapper.xml @@ -130,65 +130,68 @@ -SELECT CON_KEY - , RCEPT_ID - , DATA_CD - , DIV_KB - , DFPAYYN - , RCPT_KB - , SEAL_CD - , WORD_KB - , MAIL_CNT - , RECEV_CNT - , ENV_CD - , COLOR_YN - , MM_YN - , FLEX_CD - , DM_CNT - , SB_FG - , APVL_NB - , SEND_DATE - , SEND_TIME - , RELORSECT_CD - , RECEV_SENDER_ORG_CODE - , RECEV_SENDER_NM - , RECEV_SENDER_ZIPCODE - , RECEV_SENDER_ADDR - , RECEV_SENDER_DETAILADDR - , RECEV_SENDER_DEPART_TEL - , RECEV_SENDER_DEPART_NM - , RECEV_DIV_CD - , RECEV_PRINT_DT - , RECEV_PRINT_YEAR - , RECEV_PRINT_MONTH - , RECEV_PRINT_DAY - , RECEV_SENDER_FAX - , RECEV_SERDER_STAFF - , RECEV_SENDER_EMAIL - , SNDNG_ID - , JOB_CD - , POST_PROC_STT - , RCEPT_YMD - , DEL_YN - , REG_DT - , RGTR - , DEL_DT - , DLTR - , REG_VAR_DATA1 - , REG_VAR_DATA2 - , REG_VAR_DATA3 - , REG_VAR_DATA4 - , REG_VAR_DATA5 - FROM TB_EPOST_RCPT_REG + + SELECT ERR.CON_KEY + , ERR.RCEPT_ID + , ERR.DATA_CD + , ERR.DIV_KB + , ERR.DFPAYYN + , ERR.RCPT_KB + , ERR.SEAL_CD + , ERR.WORD_KB + , ERR.MAIL_CNT + , ERR.RECEV_CNT + , ERR.ENV_CD + , ERR.COLOR_YN + , ERR.MM_YN + , ERR.FLEX_CD + , ERR.DM_CNT + , ERR.SB_FG + , ERR.APVL_NB + , ERR.SEND_DATE + , ERR.SEND_TIME + , ERR.RELORSECT_CD + , ERR.RECEV_SENDER_ORG_CODE + , ERR.RECEV_SENDER_NM + , ERR.RECEV_SENDER_ZIPCODE + , ERR.RECEV_SENDER_ADDR + , ERR.RECEV_SENDER_DETAILADDR + , ERR.RECEV_SENDER_DEPART_TEL + , ERR.RECEV_SENDER_DEPART_NM + , ERR.RECEV_DIV_CD + , ERR.RECEV_PRINT_DT + , ERR.RECEV_PRINT_YEAR + , ERR.RECEV_PRINT_MONTH + , ERR.RECEV_PRINT_DAY + , ERR.RECEV_SENDER_FAX + , ERR.RECEV_SERDER_STAFF + , ERR.RECEV_SENDER_EMAIL + , ERR.REG_VAR_DATA1 + , ERR.REG_VAR_DATA2 + , ERR.REG_VAR_DATA3 + , ERR.REG_VAR_DATA4 + , ERR.REG_VAR_DATA5 + , ERR.JOB_CD + , ERR.POST_PROC_STT + , ERR.SNDNG_ID + , ERR.RCEPT_YMD + , ERR.DEL_YN + , ERR.REG_DT + , ERR.RGTR + , ERR.DEL_DT + , ERR.DLTR + FROM TB_EPOST_RCPT_REG ERR + - + -/* 전자우편 접수 등록 객체 가져오기(epostRcptRegMapper.selectEpostRcptRegs) */ diff --git a/src/main/webapp/WEB-INF/jsp/fims/epst/epst01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst01010-main.jsp new file mode 100644 index 00000000..a8a879cf --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/fims/epst/epst01010-main.jsp @@ -0,0 +1,518 @@ +<%@ 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/epst/epst01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst01020-info.jsp new file mode 100644 index 00000000..795fb350 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/fims/epst/epst01020-info.jsp @@ -0,0 +1,181 @@ +<%@ 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/epst/epst02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp index a8a879cf..568357bf 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 @@ -421,9 +421,9 @@ // URL 설정 setURL${pageName} = (taskSeCd) => { - ${pageName}Control.urls.load = wctx.url("/" + taskSeCd + ${pageName}PrefixUrl + "/010/list.do"); // 조회 - ${pageName}Control.urls.remove = wctx.url("/" + taskSeCd + ${pageName}PrefixUrl + "/010/remove.do"); // 삭제 - ${pageName}Control.urls.getInfo = wctx.url("/" + taskSeCd + ${pageName}PrefixUrl + "/020/info.do"); // 정보 + ${pageName}Control.urls.load = wctx.url(taskSeCd + ${pageName}PrefixUrl + "/010/list.do"); // 조회 + ${pageName}Control.urls.remove = wctx.url(taskSeCd + ${pageName}PrefixUrl + "/010/remove.do"); // 삭제 + ${pageName}Control.urls.getInfo = wctx.url(taskSeCd + ${pageName}PrefixUrl + "/020/info.do"); // 정보 } // 기본 데이터 설정 diff --git a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02020-info.jsp index 3036c4de..795fb350 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02020-info.jsp @@ -127,12 +127,12 @@ // 초기 기본 설정 initForm${pageName} = () => { - $("#sndngSeCd--${pageName}").attr("disabled", true); - $("#ttlNm--${pageName}").attr("disabled", true); - $("#wordsCn--${pageName}").attr("disabled", true); - $("#btnSave--${pageName}").attr("disabled", true); - - if (${pageName}CallPurpose != "view") { + if (${pageName}CallPurpose == "view") { + $("#sndngSeCd--${pageName}").attr("disabled", true); + $("#ttlNm--${pageName}").attr("disabled", true); + $("#wordsCn--${pageName}").attr("disabled", true); + $("#btnSave--${pageName}").attr("disabled", true); + } else { $("#sndngSeCd--${pageName}").attr("disabled", false); $("#ttlNm--${pageName}").attr("disabled", false); $("#wordsCn--${pageName}").attr("disabled", false); diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp index 8dd1d9d2..a0528530 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp @@ -82,8 +82,8 @@ // 공통 코드 var FIM021 = new CommonCodes(${FIM021}, true); var FIM022 = new CommonCodes(${FIM022}, true); - // 호출한 Page Name - var openerPageName = "${openerPageName}"; + // 호출 용도 + var ${pageName}CallPurpose = "${callPurpose}"; /************************************************************************** * DatasetControl @@ -192,11 +192,21 @@ // 달력 초기화 initDatepicker("frmEdit--${pageName}"); $("#levyExclYmd--${pageName}").datepicker("setDate", new Date()); + + // 등록 + if (${pageName}CallPurpose == "view") { + $("btnSave--${pageName}").attr("disabled", true); + } else { + $("btnSave--${pageName}").attr("disabled", false); + } } // 화면 데이터 셋팅 setForm${pageName} = () => { - + // 등록 + if (${pageName}CallPurpose == "create") { + $("#levyExclYmd--${pageName}").datepicker("setDate", new Date()); + } } /**************************************************************************