From 7b59259e3f3be72010305da66fee3399e047eeba Mon Sep 17 00:00:00 2001 From: jjh Date: Fri, 2 Feb 2024 18:15:38 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9A=B0=ED=8E=B8=20=ED=86=B5=ED=95=A9=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/epst/web/Epst02Controller.java | 7 + .../WEB-INF/jsp/fims/epst/epst02010-main.jsp | 682 +++++++++--------- .../WEB-INF/jsp/fims/epst/epst02020-info.jsp | 236 +++--- .../WEB-INF/jsp/fims/excl/excl01010-main.jsp | 14 +- .../WEB-INF/jsp/fims/excl/excl01020-info.jsp | 3 +- .../WEB-INF/jsp/fims/excl/excl02010-main.jsp | 6 +- .../WEB-INF/jsp/fims/excl/excl02020-info.jsp | 1 + .../WEB-INF/jsp/fims/excl/excl02030-info.jsp | 1 + .../WEB-INF/jsp/fims/excl/excl03010-main.jsp | 4 +- .../WEB-INF/jsp/fims/levy/levy01010-main.jsp | 10 +- .../WEB-INF/jsp/fims/levy/levy01050-main.jsp | 2 +- .../WEB-INF/jsp/fims/rdca/rdca01010-main.jsp | 2 +- .../WEB-INF/jsp/fims/sprt/sprt02010-main.jsp | 7 +- 13 files changed, 519 insertions(+), 456 deletions(-) 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 ecf3db13..b7753600 100644 --- a/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java +++ b/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java @@ -20,6 +20,7 @@ import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.CmmnUtil; +import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.epst.EpostGdcc; import cokr.xit.fims.epst.EpostQuery; import cokr.xit.fims.epst.EpostRcptReg; @@ -83,6 +84,9 @@ public class Epst02Controller extends ApplicationController { @Resource(name = "deptService") private DeptService deptService; + @Resource(name = "stngBean") + private StngBean stngBean; + /**전자우편 안내문 관리 메인화면(epostGdcc/epostGdcc-main)을 연다. * 조건없는 {@link #getEpostGdccList(EpostGdccQuery) 전자우편 안내문 조회 결과}를 포함시킨다. * @return /epostGdcc/epostGdcc-main @@ -100,6 +104,7 @@ public class Epst02Controller extends ApplicationController { .addObject("pageName", "epst02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "epostGdcc") // prefix .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) ; @@ -278,6 +283,7 @@ public class Epst02Controller extends ApplicationController { .addObject("pageName", "epst02030") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "epostRcptReg") // prefix .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) .addObject("deptCd", deptInfo.string("DEPT_CD")) // 부서 코드 7자리 .addObject("conOrg", deptInfo.string("EGP_CON_ORG")) // E그린 외부기관구분코드 .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) @@ -484,6 +490,7 @@ public class Epst02Controller extends ApplicationController { .addObject("pageName", "epst02050") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "epostRcptRslt") // prefix .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) .addObject("deptCd", deptInfo.string("DEPT_CD")) // 부서 코드 7자리 .addObject("conOrg", deptInfo.string("EGP_CON_ORG")) // E그린 외부기관구분코드 .addObject("EGP002List", commonCodes.get("EGP002")) // 취급 구분(DIV_KB) 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 5e501693..9f9268da 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 @@ -13,14 +13,14 @@
- - - @@ -39,10 +39,10 @@
- + @@ -124,14 +124,14 @@
- - - @@ -147,13 +147,13 @@ NO. - + 업무구분 발송구분 - 사용여부 최종사용일시 - 제목 - 문구내용 + 제목 + 문구내용 + 사용여부 등록일시 등록사용자 수정일시 @@ -166,13 +166,13 @@