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 387b8154..f860dd9d 100644 --- a/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java +++ b/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java @@ -272,7 +272,7 @@ public class Epst02Controller extends ApplicationController { /**전자우편 접수 등록 관리 메인화면(fims/epst/epst02030-main)을 연다. * @return /fims/epst/epst02030-main */ - @RequestMapping(name="우편 발송 현황", value=METHOD_URL.epostReceiptRegistrationMain) + @RequestMapping(name="전자우편 발송 현황", value=METHOD_URL.epostReceiptRegistrationMain) public ModelAndView epostReceiptRegistrationMain() { ModelAndView mav = new ModelAndView("fims/epst/epst02030-main"); @@ -367,9 +367,11 @@ public class Epst02Controller extends ApplicationController { .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 .addObject("pageName", "epst02040") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("prefixUrl", CLASS_URL) // prefixUrl + .addObject("sggCd", req.getSggCd()) // 시군구 코드(SGG_CD) .addObject("taskSeCd", req.getTaskSeCd()) // 업무 구분 코드(TASK_SE_CD) .addObject("mainQuery", toJson(req)) // 검색 조건 - .addObject("epostRcptRegDtlList", toJson(mav.getModel().get("epostRcptRegDtlList"))) // 자료 + .addObject("List", toJson(mav.getModel().get("List"))) // 데이터 + .addObject("Paging", toJson(mav.getModel().get("Paging"))) // 페이징 ; } @@ -386,7 +388,7 @@ public class Epst02Controller extends ApplicationController { // 엑셀 저장이 아니라면.. 검색 if (!"xls".equals(req.getDownload())) { List result = epostRcptRegService.getEpostRcptRegDtlList(setFetchSize(req)); - return setPagingInfo(new ModelAndView("jsonView"), result, "epostRcptRegDtl"); + return setPagingInfo(new ModelAndView("jsonView"), result, ""); } else { // 현재 날짜 구하기 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); 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 ff2a5649..d2e8ab48 100644 --- a/src/main/resources/sql/mapper/fims/epst/epostRcptReg-mapper.xml +++ b/src/main/resources/sql/mapper/fims/epst/epostRcptReg-mapper.xml @@ -63,101 +63,101 @@ - SELECT ERR.CON_KEY - , ERR.CON_ORG - , ERR.SNDNG_ID - , ERR.RCEPT_ID - , ERR.RCEPT_YMD - , 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_PRCS_STTS_CD - , ERR.DEL_YN - , ERR.REG_DT - , ERR.RGTR - , ERR.MDFCN_DT - , ERR.MDFR - , ERR.DEL_DT - , ERR.DLTR - , (SELECT GET_CODE_NM('EGP002', ERR.DIV_KB) FROM DUAL) AS DIV_KB_NM - , (SELECT GET_CODE_NM('EGP012', ERR.POST_PRCS_STTS_CD) FROM DUAL) AS POST_PRCS_STTS_NM - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = ERR.RGTR) AS RGTR_NM - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = ERR.MDFR) AS MDFR_NM - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = ERR.DLTR) AS DLTR_NM + SELECT ERR.CON_KEY + , ERR.CON_ORG + , ERR.SNDNG_ID + , ERR.RCEPT_ID + , ERR.RCEPT_YMD + , ERR.DATA_CD + , ERR.DIV_KB + , (GET_CODE_NM('EGP002', ERR.DIV_KB)) AS DIV_KB_NM + , 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_PRCS_STTS_CD + , (GET_CODE_NM('EGP012', ERR.POST_PRCS_STTS_CD)) AS POST_PRCS_STTS_NM + , ERR.DEL_YN + , ERR.REG_DT + , ERR.RGTR + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = ERR.RGTR) AS RGTR_NM + , ERR.MDFCN_DT + , ERR.MDFR + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = ERR.MDFR) AS MDFR_NM + , ERR.DEL_DT + , ERR.DLTR + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = ERR.DLTR) AS DLTR_NM FROM TB_EPOST_RCPT_REG ERR /* 전자우편 발송 상태 정보들을 가져오기(epostRcptRegMapper.selectEpostRcptRegDtlList) */ - SELECT ERR.CON_KEY - , ERR.CON_ORG - , ERD.RGST_NMBR + SELECT ERR.CON_KEY + , ERR.CON_ORG + , ERD.RGST_NMBR , ERD.RECEV_CAR_OWNER_ZIPCODE , ERD.RECEV_CAR_OWNER_ADDR , ERD.RECEV_CAR_OWNER_DETAILADDR - , ERD.RECEV_CAR_OWNER_NM - , ERD.REG_DT - , ERD.RGTR - , ERD.MDFCN_DT - , ERD.MDFR - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = ERD.RGTR) AS RGTR_NM - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = ERD.MDFR) AS MDFR_NM - , EDR.DELIVRSLTCD - , EDR.NONDELIVREASNCD - , EDR.NONDELIVREASNCDNM - , EDR.SUBRECPRSNNM - , EDR.RELRECPRSNCD - , EDR.RELRECPRSNCDNM + , ERD.RECEV_CAR_OWNER_NM + , ERD.REG_DT + , ERD.RGTR + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = ERD.RGTR) AS RGTR_NM + , ERD.MDFCN_DT + , ERD.MDFR + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = ERD.MDFR) AS MDFR_NM + , EDR.DELIVRSLTCD + , (GET_CODE_NM('EGP009', EDR.DELIVRSLTCD)) AS DELIVRSLTCD_NM + , EDR.NONDELIVREASNCD + , EDR.NONDELIVREASNCDNM + , EDR.SUBRECPRSNNM + , EDR.RELRECPRSNCD + , EDR.RELRECPRSNCDNM , (CASE WHEN LENGTH(EDR.DELIVHHMI) = 4 THEN CONCAT(EDR.DELIVYMD, EDR.DELIVHHMI, '00') ELSE CONCAT(EDR.DELIVYMD, EDR.DELIVHHMI) - END) AS DELIV_YMD_TM - , (SELECT GET_CODE_NM('EGP009', EDR.DELIVRSLTCD) FROM DUAL) AS DELIVRSLTCD_NM + END) AS DELIV_YMD_TM FROM TB_EPOST_RCPT_REG ERR INNER JOIN TB_EPOST_RCPT_DTL ERD ON (ERR.CON_KEY = ERD.CON_KEY) LEFT OUTER JOIN TB_EPOST_DLVR_RSLT EDR ON (ERD.DLVR_RSLT_ID = EDR.DLVR_RSLT_ID) @@ -263,14 +263,14 @@ /* 전자우편 접수 등록 등록(epostRcptRegMapper.insertEpostRcptReg) */ @@ -479,9 +479,9 @@ , DEL_DT = , DLTR = #{modifiedBy} - + WHERE CON_KEY IN ( - #{epostRcptReg.conKey} + #{conKey} )