From f51182404d983cd4461d58bce7c099e471f42f2b Mon Sep 17 00:00:00 2001 From: jjh Date: Thu, 13 Jun 2024 15:29:29 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EC=9A=B0=ED=8E=B8=ED=86=B5=ED=95=A9=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.=202.=20dialog=20=EB=A7=88=EC=9A=B0=EC=8A=A4?= =?UTF-8?q?=20=EB=93=9C=EB=9E=98=EA=B7=B8=20=ED=95=A8=EC=88=98=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/epst/web/Epst02Controller.java | 6 +- .../WEB-INF/jsp/fims/epst/epst02010-main.jsp | 22 +- .../WEB-INF/jsp/fims/epst/epst02020-info.jsp | 5 +- .../WEB-INF/jsp/fims/epst/epst02030-main.jsp | 326 ++++++++---------- .../WEB-INF/jsp/fims/epst/epst02040-info.jsp | 90 +++-- .../WEB-INF/jsp/fims/epst/epst02050-main.jsp | 229 ++++++------ .../WEB-INF/jsp/fims/excl/excl01020-info.jsp | 3 - .../WEB-INF/jsp/fims/excl/excl02020-info.jsp | 3 - .../WEB-INF/jsp/fims/excl/excl02030-info.jsp | 3 - .../WEB-INF/jsp/fims/excl/excl02040-info.jsp | 3 +- .../WEB-INF/jsp/fims/levy/levy01020-info.jsp | 3 - .../WEB-INF/jsp/fims/levy/levy02020-info.jsp | 3 - 12 files changed, 302 insertions(+), 394 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 85e8598c..22b013a9 100644 --- a/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java +++ b/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java @@ -280,7 +280,6 @@ public class Epst02Controller extends ApplicationController { // 사용자 정보 ManagedUser managedUser = (ManagedUser)currentUser().getUser(); - // 부서 정보 DataObject deptInfo = stngBean.getStng("dept"); @@ -295,7 +294,6 @@ public class Epst02Controller extends ApplicationController { .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) ; } @@ -364,7 +362,6 @@ public class Epst02Controller extends ApplicationController { @Task @RequestMapping(name="전자우편 발송 상세 화면", value=METHOD_URL.getEpostReceiptRegistrationDetailInfo) public ModelAndView getEpostReceiptRegistrationDetailInfo(HttpServletRequest hReq, EpostQuery req) { - // ModelAndView mav = getEpostReceiptRegistrationDetailList(req); mav.setViewName("fims/epst/epst02040-info"); @@ -421,6 +418,7 @@ public class Epst02Controller extends ApplicationController { valueMap.put("미배달사유", format.of("NONDELIVREASNCDNM")); valueMap.put("주소", format.of("RECEV_CAR_OWNER_ADDR")); valueMap.put("상세주소", format.of("RECEV_CAR_OWNER_DETAILADDR")); + valueMap.put("연계식별키", format.of("CON_KEY")); valueMap.put("등록사용자", format.of("RGTR_NM").style(center)); valueMap.put("수정일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "MDFCN_DT").style(dateDT)); valueMap.put("수정사용자", format.of("MDFR_NM").style(center)); @@ -510,7 +508,6 @@ public class Epst02Controller extends ApplicationController { .addObject("deptCd", deptInfo.string("DEPT_CD")) // 부서 코드 7자리 .addObject("conOrg", deptInfo.string("EGP_CON_ORG")) // E그린 외부기관구분코드 .addObject("EGP002List", commonCodes.get("EGP002")) // 취급 구분(DIV_KB) - .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) .addObject("FIM082List", commonCodes.get("FIM082")) // 작업 코드 3(JOB_CD) .addObject("pageDataName2", "SumAmt") // dataset3 합계 정보 ; @@ -584,7 +581,6 @@ public class Epst02Controller extends ApplicationController { @Task @RequestMapping(name="전자우편 접수 결과 합계 금액 조회", value=METHOD_URL.getEpostReceiptResultSumAmount) public ModelAndView getEpostReceiptResultSumAmount(EpostQuery req) { - // List sumAmt = epostRcptRsltService.getEpostRcptRsltSum(req); return new ModelAndView("jsonView") 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 0455e647..f0ddc0c2 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 @@ -79,7 +79,7 @@