diff --git a/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java b/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java index 4fb10198..478e6633 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java @@ -86,7 +86,6 @@ public class Levy01Controller extends ApplicationController { return mav .addObject("pageName", "levy01010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("infoPrefix", "rdctLevyTrgt") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) @@ -109,7 +108,7 @@ public class Levy01Controller extends ApplicationController { public ModelAndView getReductionLevyTargetList(LevyQuery req) { if (!"xls".equals(req.getDownload())) { List result = levyService.getRdctLevyTrgtList(setFetchSize(req)); - return setCollectionInfo(new ModelAndView("jsonView"), result, "rdctLevyTrgt"); + return setCollectionInfo(new ModelAndView("jsonView"), result, ""); } else { // 현재 날짜 구하기 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); @@ -135,11 +134,12 @@ public class Levy01Controller extends ApplicationController { valueMap.put("위반항목", format.of("VLTN_ARTCL")); valueMap.put("단속원금", format.of("FFNLG_CRDN_AMT").style(numeric)); valueMap.put("과태료금액", format.of("FFNLG_AMT").style(numeric)); - valueMap.put("사전통지금액", format.of("ADVNTCE_AMT").style(numeric)); valueMap.put("처리상태", format.of("CRDN_STTS_NM")); + valueMap.put("민원접수일자", FormatMaker.yyyy_mm_dd(format, "CVLCPT_RCPT_YMD").style(dateYMD)); valueMap.put("민원신청번호", format.of("CVLCPT_APLY_NO").style(center)); valueMap.put("민원접수번호", format.of("CVLCPT_RCPT_NO").style(center)); - valueMap.put("민원접수일자", FormatMaker.yyyy_mm_dd(format, "CVLCPT_RCPT_YMD").style(dateYMD)); + valueMap.put("민원담당자", format.of("CVLCPT_PRCS_PIC_NM").style(center)); + valueMap.put("민원처리일시", FormatMaker.yyyy_mm_dd(format, "CVLCPT_PRCS_CMPTN_DT").style(dateYMD)); valueMap.put("민원전송결과", format.of("CVLCPT_TRSM_NM").style(center)); valueMap.put("납부자구분", format.of("RTPYR_SE_NM").style(center)); valueMap.put("납부자번호", format.of("RTPYR_NO").style(center)); @@ -186,13 +186,11 @@ public class Levy01Controller extends ApplicationController { info.put("GRAMT_ADVNTCE_AMT", req.getGramtAdvntceAmt()); return mav - .addObject("openerPageName", hReq.getParameter("openerPageName")) // 호출한 Jsp PageName - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("pageName", "levy01020") // jsp pageName - .addObject("infoPrefix", "rdctLevyTrgt") // prefix - .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("mainQuery", json ? req : toJson(req)) // 검색 조건 - .addObject("rdctLevyTrgtInfo", json ? info : toJson(info)) + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("pageName", "levy01020") // jsp pageName + .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl + .addObject("mainQuery", json ? req : toJson(req)) // 검색 조건 + .addObject("info", json ? info : toJson(info)) ; } @@ -235,7 +233,6 @@ public class Levy01Controller extends ApplicationController { return mav .addObject("pageName", "levy01050") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("infoPrefix", "levy") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) @@ -260,7 +257,7 @@ public class Levy01Controller extends ApplicationController { public ModelAndView getLevyList(LevyQuery req) { if (!"xls".equals(req.getDownload())) { List result = levyService.getLevyList(setFetchSize(req)); - return setCollectionInfo(new ModelAndView("jsonView"), result, "levy"); + return setCollectionInfo(new ModelAndView("jsonView"), result, ""); } else { // 현재 날짜 구하기 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");