From 2ff7722cd7b294789761ce3a0802238fd42dda48 Mon Sep 17 00:00:00 2001 From: jjh Date: Tue, 19 Dec 2023 15:11:07 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EC=97=91=EC=85=80=20=EC=A0=80=EC=9E=A5=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.=202.=20=EA=B8=B0=ED=83=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/excl/web/Excl01Controller.java | 131 ++++++++++++++---- .../xit/fims/excl/web/Excl02Controller.java | 45 +++--- .../xit/fims/excl/web/Excl03Controller.java | 22 +-- .../xit/fims/levy/web/Levy01Controller.java | 6 +- .../sql/mapper/fims/excl/crdnReReg-mapper.xml | 13 +- .../sql/mapper/fims/excl/levyExcl-mapper.xml | 30 ++-- .../sql/mapper/fims/excl/opnnSbmsn-mapper.xml | 15 +- .../sql/mapper/fims/levy/levy-mapper.xml | 2 - .../sql/mapper/fims/rcvm/rcvmt-mapper.xml | 3 - .../WEB-INF/jsp/fims/epst/epst02010-main.jsp | 1 + .../WEB-INF/jsp/fims/epst/epst02030-main.jsp | 1 + .../WEB-INF/jsp/fims/epst/epst02050-main.jsp | 1 + .../WEB-INF/jsp/fims/excl/excl01010-main.jsp | 46 +++--- .../WEB-INF/jsp/fims/excl/excl02010-main.jsp | 60 ++++---- .../WEB-INF/jsp/fims/excl/excl03010-main.jsp | 40 ++---- .../WEB-INF/jsp/fims/levy/levy01010-main.jsp | 2 +- .../WEB-INF/jsp/fims/rcvm/rcvm01010-main.jsp | 4 +- 17 files changed, 235 insertions(+), 187 deletions(-) diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java index 336cd6be..a91e4556 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java @@ -1,7 +1,9 @@ package cokr.xit.fims.excl.web; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.function.BiFunction; import javax.annotation.Resource; @@ -12,8 +14,10 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; import cokr.xit.base.file.xls.XLSWriter; +import cokr.xit.base.file.xls.XLSWriter.Styler; import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.excl.LevyExcl; import cokr.xit.fims.excl.LevyExclQuery; import cokr.xit.fims.excl.service.LevyExclService; @@ -91,38 +95,71 @@ public class Excl01Controller extends ApplicationController { return setCollectionInfo(new ModelAndView("jsonView"), result, "levyExcl"); } else { XLSWriter xlsx = new XLSWriter() - .setFilename("부과제외 목록.xlsx") - .worksheet(0); - - XLSWriter.Styler header = new XLSWriter.Styler() - .width(20) - .foregroundColor(HSSFColor.HSSFColorPredefined.LIGHT_BLUE.getIndex()) - .configure(styler -> { - Font font = xlsx.workbook().createFont(); - font.setColor(HSSFColor.HSSFColorPredefined.WHITE.getIndex()); - styler.font(font); - }); - CellStyle numeric = xlsx.n_nn0(); + .setFilename("부과제외 목록.xlsx") + .worksheet(0); + + CellStyle center = xlsx.cellStyle(Styler.CENTER) // 가운데 정렬 + , numeric = xlsx.n_nn0() // 숫자 3자리 콤마(,) + , dateYMD = xlsx.yyyy_mm_dd() // 연월일 + , dateDT = xlsx.yyyy_mm_dd_hh_mm_ss(); // 연월일+시간 + + String[] excelTitle = req.getExcelTitle(); + List titles = new ArrayList(); + for (int iLoop = 0; iLoop < excelTitle.length; iLoop++) { + String item = excelTitle[iLoop]; + titles.add(item); + } + + int[] excelTitleWidth = req.getExcelTitleWidth(); + List widths = new ArrayList<>(); + for (int jLoop = 0; jLoop < excelTitleWidth.length; jLoop++) { + int item = excelTitleWidth[jLoop]; + widths.add(item); + } + + List headerStylers = CmmnUtil.makeHeadersByDiffrentWidths(widths, xlsx); xlsx.cell(0, 0) - .value("부과제외 목록", XLSWriter.Styler.CENTER) - .merge(0, 15) + .value("부과제외", XLSWriter.Styler.CENTER) + .merge(0, 11) .cell(3, 0) - .rowValues(List.of( - "업무구분", header, "부과제외일자", header, "부과제외구분", header, "부과제외사유", header, "기타내용", header, - "민원신청번호", header, "민원접수번호", header, "민원접수일자", header, "단속일시", header, "차량번호", header, - "법정동", header, "단속장소", header, "과태료금액", header, "처리상태", header, "납부자명", header, "납부자생일", header - )) - .cell(4, 0) - .values( - levyExclService.getLevyExclList(req.setFetchSize(0)), - "TASK_SE_NM", xlsx.format(r -> xlsx.str2date(r.get("LEVY_EXCL_YMD"))), "LEVY_EXCL_SE_NM", "LEVY_EXCL_RSN_NM", "ETC_CN", - "CVLCPT_APLY_NO", "CVLCPT_RCPT_NO", xlsx.format(r -> xlsx.str2date(r.get("CVLCPT_RCPT_YMD"))), xlsx.format(r -> xlsx.str2date(r.get("CRDN_YMD")) + " " + xlsx.str2time(r.get("CRDN_TM"))), - "VHRNO", "CRDN_STDG_NM", "CRDN_PLC", xlsx.style("FFNLG_AMT", numeric), "CRDN_STTS_NM", "RTPYR_NM", xlsx.format(r -> xlsx.str2date(r.get("RTPYR_BRDT"))) - ); + .rowValues(CmmnUtil.mergeListByIndex(titles, headerStylers)); + + List list = levyExclService.getLevyExclList(req.setFetchSize(0)); + + BiFunction getValue = (titleNm, nothing) -> { + switch (titleNm) { + case "업무구분" : return xlsx.style("TASK_SE_NM", center); + case "부과제외일자" : return xlsx.format(o -> xlsx.str2date(o.get("LEVY_EXCL_YMD"))).style(dateYMD); + case "부과제외구분" : return xlsx.style("LEVY_EXCL_SE_NM", center); + case "부과제외사유" : return xlsx.style("LEVY_EXCL_RSN_NM", center); + case "기타내용" : return "ETC_CN"; + case "민원신청번호" : return xlsx.style("CVLCPT_APLY_NO", center); + case "민원접수번호" : return xlsx.style("CVLCPT_RCPT_NO", center); + case "민원접수일자" : return xlsx.format(o -> xlsx.str2date(o.get("CVLCPT_RCPT_YMD"))).style(dateYMD); + case "단속일시" : return xlsx.format(o -> xlsx.str2datetime(o.get("CRDN_YMD_TM"))).style(dateDT); + case "차량번호" : return "VHRNO"; + case "단속법정동" : return "CRDN_STDG_NM"; + case "단속장소" : return "CRDN_PLC"; + case "위반항목" : return "VLTN_ARTCL"; + case "최초단속금액" : return xlsx.style("FFNLG_CRDN_AMT", numeric); + case "처리상태" : return "CRDN_STTS_NM"; + case "납부자명" : return "RTPYR_NM"; + case "납부자생일" : return xlsx.style("RTPYR_BRDT_MASK", center); + case "등록일시" : return xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT); + case "등록사용자" : return xlsx.style("RGTR_NM", center); + case "수정일시" : return xlsx.format(o -> xlsx.str2datetime(o.get("MDFCN_DT"))).style(dateDT); + case "수정사용자" : return xlsx.style("MDFR_NM", center); + } + + return ""; + }; + + xlsx.cell(4, 0) + .values(list, titles.stream().map((item) -> { return getValue.apply(item, null); }).toArray()); return new ModelAndView("xlsView") - .addObject("xls", xlsx); + .addObject("xls", xlsx); } } @@ -259,3 +296,43 @@ public class Excl01Controller extends ApplicationController { } } + +/* 엑셀 저장 샘플 +if (!"xls".equals(req.getDownload())) { + List result = levyExclService.getLevyExclList(setFetchSize(req)); + return setCollectionInfo(new ModelAndView("jsonView"), result, "levyExcl"); +} else { + XLSWriter xlsx = new XLSWriter() + .setFilename("부과제외 목록.xlsx") + .worksheet(0); + + XLSWriter.Styler header = new XLSWriter.Styler() + .width(20) + .foregroundColor(HSSFColor.HSSFColorPredefined.LIGHT_BLUE.getIndex()) + .configure(styler -> { + Font font = xlsx.workbook().createFont(); + font.setColor(HSSFColor.HSSFColorPredefined.WHITE.getIndex()); + styler.font(font); + }); + CellStyle numeric = xlsx.n_nn0(); + + xlsx.cell(0, 0) + .value("부과제외 목록", XLSWriter.Styler.CENTER) + .merge(0, 15) + .cell(3, 0) + .rowValues(List.of( + "업무구분", header, "부과제외일자", header, "부과제외구분", header, "부과제외사유", header, "기타내용", header, + "민원신청번호", header, "민원접수번호", header, "민원접수일자", header, "단속일시", header, "차량번호", header, + "법정동", header, "단속장소", header, "과태료금액", header, "처리상태", header, "납부자명", header, "납부자생일", header + )) + .cell(4, 0) + .values( + levyExclService.getLevyExclList(req.setFetchSize(0)), + "TASK_SE_NM", xlsx.format(r -> xlsx.str2date(r.get("LEVY_EXCL_YMD"))), "LEVY_EXCL_SE_NM", "LEVY_EXCL_RSN_NM", "ETC_CN", + "CVLCPT_APLY_NO", "CVLCPT_RCPT_NO", xlsx.format(r -> xlsx.str2date(r.get("CVLCPT_RCPT_YMD"))), xlsx.format(r -> xlsx.str2date(r.get("CRDN_YMD")) + " " + xlsx.str2time(r.get("CRDN_TM"))), + "VHRNO", "CRDN_STDG_NM", "CRDN_PLC", xlsx.style("FFNLG_AMT", numeric), "CRDN_STTS_NM", "RTPYR_NM", xlsx.format(r -> xlsx.str2date(r.get("RTPYR_BRDT"))) + ); + return new ModelAndView("xlsView") + .addObject("xls", xlsx); +} +*/ diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java index 1fe8ee5e..1bd8ca4b 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -107,7 +107,8 @@ public class Excl02Controller extends ApplicationController { .setFilename("의견제출 목록.xlsx") .worksheet(0); - CellStyle numeric = xlsx.n_nn0() // 숫자 3자리 콤마(,) + CellStyle center = xlsx.cellStyle(Styler.CENTER) // 가운데 정렬 + , numeric = xlsx.n_nn0() // 숫자 3자리 콤마(,) , dateYMD = xlsx.yyyy_mm_dd() // 연월일 , dateDT = xlsx.yyyy_mm_dd_hh_mm_ss(); // 연월일+시간 @@ -129,7 +130,7 @@ public class Excl02Controller extends ApplicationController { xlsx.cell(0, 0) .value("의견제출", XLSWriter.Styler.CENTER) - .merge(0, 23) + .merge(0, 12) .cell(3, 0) .rowValues(CmmnUtil.mergeListByIndex(titles, headerStylers)); @@ -137,30 +138,34 @@ public class Excl02Controller extends ApplicationController { BiFunction getValue = (titleNm, nothing) -> { switch (titleNm) { - case "업무구분" : return xlsx.style("TASK_SE_NM", XLSWriter.Styler.CENTER); + case "업무구분" : return xlsx.style("TASK_SE_NM", center); + case "접수번호" : return xlsx.style("RCPT_NO", center); case "접수일자" : return xlsx.format(o -> xlsx.str2date(o.get("RCPT_YMD"))).style(dateYMD); - case "접수번호" : return xlsx.style("RCPT_NO", XLSWriter.Styler.CENTER); - case "접수구분" : return xlsx.style("RCPT_SE_NM", XLSWriter.Styler.CENTER); - case "통보구분" : return xlsx.style("NTFCTN_SE_NM", XLSWriter.Styler.CENTER); - case "진술자명" : return xlsx.style("STTR_NM", XLSWriter.Styler.LEFT); - case "의견제출상태" : return xlsx.style("OPNN_SBMSN_STTS_NM", XLSWriter.Styler.CENTER); - case "의견제출분류" : return xlsx.style("OPNN_SBMSN_SE_NM", XLSWriter.Styler.LEFT); - case "의견제출요지" : return xlsx.style("OPNN_SBMSN_GIST", XLSWriter.Styler.LEFT); + case "접수구분" : return xlsx.style("RCPT_SE_NM", center); + case "통보구분" : return xlsx.style("NTFCTN_SE_NM", center); + case "소유주관계" : return xlsx.style("OWNR_REL_NM", center); + case "진술자명" : return "STTR_NM"; + case "진술자생일" : return xlsx.style("STTR_BRDT_MASK", center); + case "의견제출상태" : return xlsx.style("OPNN_SBMSN_STTS_NM", center); + case "의견제출분류" : return "OPNN_SBMSN_SE_NM"; + case "의견제출요지" : return "OPNN_SBMSN_GIST"; + case "문서번호" : return "DOC_NO"; + case "답변일자" : return xlsx.format(o -> xlsx.str2date(o.get("ANS_YMD"))).style(dateYMD); + case "답변내용" : return "ANS_CN"; case "단속일시" : return xlsx.format(o -> xlsx.str2datetime(o.get("CRDN_YMD_TM"))).style(dateDT); - case "차량번호" : return xlsx.style("VHRNO", XLSWriter.Styler.LEFT); - case "단속장소" : return xlsx.style("CRDN_PLC", XLSWriter.Styler.LEFT); + case "차량번호" : return "VHRNO"; + case "단속법정동" : return "CRDN_STDG_NM"; + case "단속장소" : return "CRDN_PLC"; + case "위반항목" : return "VLTN_ARTCL"; case "최초단속금액" : return xlsx.style("FFNLG_CRDN_AMT", numeric); case "과태료금액" : return xlsx.style("FFNLG_AMT", numeric); - case "처리상태" : return xlsx.style("CRDN_STTS_NM", XLSWriter.Styler.LEFT); - case "문서번호" : return xlsx.style("DOC_NO", XLSWriter.Styler.LEFT); - case "답변일자" : return xlsx.format(o -> xlsx.str2date(o.get("ANS_YMD"))).style(dateYMD); - case "답변내용" : return xlsx.style("ANS_CN", XLSWriter.Styler.LEFT); - case "납부자명" : return xlsx.style("RTPYR_NM", XLSWriter.Styler.LEFT); - case "납부자생일" : return xlsx.format(o -> xlsx.str2date(o.get("RTPYR_BRDT"))).style(dateYMD); + case "처리상태" : return "CRDN_STTS_NM"; + case "납부자명" : return "RTPYR_NM"; + case "납부자생일" : return xlsx.style("RTPYR_BRDT_MASK", center); case "등록일시" : return xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT); - case "등록사용자" : return xlsx.style("RGTR_NM", XLSWriter.Styler.CENTER); + case "등록사용자" : return xlsx.style("RGTR_NM", center); case "수정일시" : return xlsx.format(o -> xlsx.str2datetime(o.get("MDFCN_DT"))).style(dateDT); - case "수정사용자" : return xlsx.style("MDFR_NM", XLSWriter.Styler.CENTER); + case "수정사용자" : return xlsx.style("MDFR_NM", center); } return ""; diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java index 74d14a7a..f9af8a4d 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java @@ -92,7 +92,8 @@ public class Excl03Controller extends ApplicationController { .setFilename("단속 재등록 목록.xlsx") .worksheet(0); - CellStyle numeric = xlsx.n_nn0() // 숫자 3자리 콤마(,) + CellStyle center = xlsx.cellStyle(Styler.CENTER) // 가운데 정렬 + , numeric = xlsx.n_nn0() // 숫자 3자리 콤마(,) , dateYMD = xlsx.yyyy_mm_dd() // 연월일 , dateDT = xlsx.yyyy_mm_dd_hh_mm_ss(); // 연월일+시간 @@ -114,7 +115,7 @@ public class Excl03Controller extends ApplicationController { xlsx.cell(0, 0) .value("단속 재등록", XLSWriter.Styler.CENTER) - .merge(0, 11) + .merge(0, 12) .cell(3, 0) .rowValues(CmmnUtil.mergeListByIndex(titles, headerStylers)); @@ -122,18 +123,19 @@ public class Excl03Controller extends ApplicationController { BiFunction getValue = (titleNm, nothing) -> { switch (titleNm) { - case "업무구분" : return xlsx.style("TASK_SE_NM", XLSWriter.Styler.CENTER); + case "업무구분" : return xlsx.style("TASK_SE_NM", center); case "재등록일자" : return xlsx.format(o -> xlsx.str2date(o.get("RE_REG_YMD"))).style(dateYMD); - case "단속등록구분" : return xlsx.style("CRDN_REG_SE_NM", XLSWriter.Styler.CENTER); - case "기타내용" : return xlsx.style("ETC_CN", XLSWriter.Styler.LEFT); + case "단속등록구분" : return xlsx.style("CRDN_REG_SE_NM", center); + case "기타내용" : return "ETC_CN"; case "단속일시" : return xlsx.format(o -> xlsx.str2datetime(o.get("CRDN_YMD_TM"))).style(dateDT); - case "차량번호" : return xlsx.style("VHRNO", XLSWriter.Styler.LEFT); - case "법정동" : return xlsx.style("CRDN_STDG_NM", XLSWriter.Styler.CENTER); - case "단속장소" : return xlsx.style("CRDN_PLC", XLSWriter.Styler.LEFT); + case "차량번호" : return "VHRNO"; + case "단속법정동" : return "CRDN_STDG_NM"; + case "단속장소" : return "CRDN_PLC"; + case "위반항목" : return "VLTN_ARTCL"; case "최초단속금액" : return xlsx.style("FFNLG_CRDN_AMT", numeric); - case "처리상태" : return xlsx.style("CRDN_STTS_NM", XLSWriter.Styler.LEFT); + case "처리상태" : return "CRDN_STTS_NM"; case "등록일시" : return xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT); - case "등록사용자" : return xlsx.style("RGTR_NM", XLSWriter.Styler.CENTER); + case "등록사용자" : return xlsx.style("RGTR_NM", center); } return ""; 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 f3b677b1..8923f85a 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java @@ -57,7 +57,7 @@ public class Levy01Controller extends ApplicationController { @Resource(name = "taskService") private TaskService taskService; - /**사전 감경부과 등록 메인화면(levy/levy01010-main)을 연다. + /**사전 감경부과 대상 메인화면(levy/levy01010-main)을 연다. * @return */ public ModelAndView reductionLevyTargetMain() { @@ -76,7 +76,7 @@ public class Levy01Controller extends ApplicationController { ; } - /**부과 대장 목록을 조회하여 반환한다.
+ /**사전 감경부과 대상 목록을 조회하여 반환한다.
* {@link LevyService#getRductLevyTrgtList(LevyQuery)} 참고 * @param req 부과 대장 조회 조건 * @return jsonView @@ -120,7 +120,7 @@ public class Levy01Controller extends ApplicationController { xlsx.cell(0, 0) .value("사전 감경부과 대상", XLSWriter.Styler.CENTER) - .merge(0, 12) + .merge(0, 11) .cell(3, 0) .rowValues(CmmnUtil.mergeListByIndex(titles, headerStylers)); diff --git a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml index 25803777..349291d2 100644 --- a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml @@ -32,9 +32,7 @@ , CRR.ETC_CN /* 기타 내용 */ , CRR.DEL_YN /* 삭제 여부 */ , CRR.REG_DT /* 등록 일시 */ - , CRR.RGTR /* 등록자 */ , CRR.DEL_DT /* 삭제 일시 */ - , CRR.DLTR /* 삭제자 */ , CRR.DEL_RSN /* 삭제 사유 */ , (SELECT GET_CODE_NM('FIM026', CRR.CRDN_REG_SE_CD) FROM DUAL) AS CRDN_REG_SE_NM /* 단속 등록 구분 명 */ , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = CRR.RGTR) AS RGTR_NM /* 등록자 명 */ @@ -42,8 +40,6 @@ , C.SGG_CD /* 시군구 코드 */ , C.TASK_SE_CD /* 업무 구분 코드 */ , C.CRDN_INPT_SE_CD /* 단속 입력 구분 코드 */ - , C.CRDN_YMD /* 단속 일자 */ - , C.CRDN_TM /* 단속 시각 */ , C.VHRNO /* 차량번호 */ , C.CRDN_STDG_NM /* 단속 법정동 명 */ , C.CRDN_ROAD_NM /* 단속 도로 명 */ @@ -57,8 +53,12 @@ , (SELECT GET_CODE_NM('FIM054', C.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM /* 업무 구분 명 */ , (SELECT GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) FROM DUAL) AS CRDN_INPT_SE_NM /* 단속 입력 구분 명 */ , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM /* 단속 상태 명 */ + , V.VLTN_ID /* 위반 ID */ + , V.VLTN_CD /* 위반 코드 */ + , V.VLTN_ARTCL /* 위반 항목 */ FROM TB_CRDN_RE_REG CRR - LEFT OUTER JOIN TB_CRDN C ON (CRR.CRDN_ID = C.CRDN_ID) + INNER JOIN TB_CRDN C ON (CRR.CRDN_ID = C.CRDN_ID) + INNER JOIN TB_VLTN V ON (C.VLTN_ID = V.VLTN_ID) 업무구분 - 접수일자 접수번호 + 접수일자 접수구분 통보구분 + 소유주관계 진술자명 + 진술자생일 의견제출상태 의견제출분류 의견제출요지 + 문서번호 + 답변일자 + 답변내용 단속일시 - 차량번호 + 차량번호 + 단속법정동 단속장소 + 위반항목 최초단속금액 과태료금액 처리상태 - 문서번호 - 답변일자 - 답변내용 납부자명 납부자생일 등록일시 @@ -237,25 +241,29 @@ {ROW_NUM} {TASK_SE_NM} - {RCPT_YMD} {RCPT_NO} + {RCPT_YMD} {RCPT_SE_NM} {NTFCTN_SE_NM} + {OWNR_REL_NM} {STTR_NM} + {STTR_BRDT_MASK} {OPNN_SBMSN_STTS_NM} {OPNN_SBMSN_SE_NM} {OPNN_SBMSN_GIST} + {DOC_NO} + {ANS_YMD} + {ANS_CN} {CRDN_YMD_TM} {VHRNO} + {CRDN_STDG_NM} {CRDN_PLC} + {VLTN_ARTCL} {FFNLG_CRDN_AMT} {FFNLG_AMT} {CRDN_STTS_NM} - {DOC_NO} - {ANS_YMD} - {ANS_CN} {RTPYR_NM} - {RTPYR_BRDT} + {RTPYR_BRDT_MASK} {REG_DT} {RGTR_NM} {MDFCN_DT} @@ -265,7 +273,7 @@ @@ -562,7 +570,7 @@ } // 초기 기본 설정 - initForm${pageName}(taskSeCd); + initForm${pageName}(); // URL 설정 setURL${pageName}(taskSeCd); @@ -589,28 +597,16 @@ content : "검색된 자료가 없습니다." , onOK : () => { } }); + return; } - let excelTitle = []; - let excelTitleWidth = []; - - $("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)").each(function() { - let title = $(this).text(); + let headerInfo = $("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)").getHeaderInfo(); - if (title != "" ) { - excelTitle.push(title); - - let titleWidth = Math.ceil($(this).outerWidth() / 10) + 2; - excelTitleWidth.push(titleWidth); - } - }); - - ${pageName}Control.query.excelTitle = excelTitle.join(","); - ${pageName}Control.query.excelTitleWidth = excelTitleWidth.join(","); - - ${pageName}Control.download(); - } + ${pageName}Control.query.excelTitle = headerInfo.excelTitle; + ${pageName}Control.query.excelTitleWidth = headerInfo.excelTitleWidth; + ${pageName}Control.download(); + } // 사용자 조회 버튼 이벤트 fnFindUser${pageName} = () => { @@ -709,12 +705,10 @@ } // 화면 초기 설정 - initForm${pageName} = (taskSeCd) => { + initForm${pageName} = () => { // 화면 초기화 $("#frmSearch--${pageName}")[0].reset(); - // 업무 구분 코드 - $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + taskSeCd + "']").prop("checked", true); // 최고 관리자 경우 업무구분을 선택할 수 있도록 하자. $("#frmSearch--${pageName} input[name='taskSeCd']").each(function(i) { $(this).prop("disabled", "true"); diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp index 6390044b..11b3076d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp @@ -95,8 +95,7 @@ - - +
@@ -168,9 +167,10 @@ 단속등록구분 기타내용 단속일시 - 차량번호 - 법정동 + 차량번호 + 단속법정동 단속장소 + 위반항목 최초단속금액 처리상태 등록일시 @@ -191,6 +191,7 @@ {VHRNO} {CRDN_STDG_NM} {CRDN_PLC} + {VLTN_ARTCL} {FFNLG_CRDN_AMT} {CRDN_STTS_NM} {REG_DT} @@ -200,7 +201,7 @@ @@ -248,7 +249,6 @@ RE_REG_YMD : dateFormat , CRDN_YMD_TM : datetimeFormat , FFNLG_CRDN_AMT : numberFormat - , FFNLG_AMT : numberFormat , REG_DT : datetimeFormat } }); @@ -403,7 +403,7 @@ } // 초기 기본 설정 - initForm${pageName}(taskSeCd); + initForm${pageName}(); // URL 설정 setURL${pageName}(taskSeCd); @@ -430,27 +430,15 @@ content : "검색된 자료가 없습니다." , onOK : () => { } }); + return; } - let excelTitle = []; - let excelTitleWidth = []; - - $("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)").each(function() { - let title = $(this).text(); - - if (title != "" ) { - excelTitle.push(title); + let headerInfo = $("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)").getHeaderInfo(); - let titleWidth = Math.ceil($(this).outerWidth() / 10) + 2; - excelTitleWidth.push(titleWidth); - } - }); - - ${pageName}Control.query.excelTitle = excelTitle.join(","); - ${pageName}Control.query.excelTitleWidth = excelTitleWidth.join(","); - - ${pageName}Control.download(); + ${pageName}Control.query.excelTitle = headerInfo.excelTitle; + ${pageName}Control.query.excelTitleWidth = headerInfo.excelTitleWidth; + ${pageName}Control.download(); } // 사용자 조회 버튼 이벤트 @@ -502,12 +490,10 @@ } // 화면 초기 설정 - initForm${pageName} = (taskSeCd) => { + initForm${pageName} = () => { // 화면 초기화 $("#frmSearch--${pageName}")[0].reset(); - // 업무 구분 코드 - $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + taskSeCd + "']").prop("checked", true); // 최고 관리자 경우 업무구분을 선택할 수 있도록 하자. $("#frmSearch--${pageName} input[name='taskSeCd']").each(function(i) { $(this).prop("disabled", "true"); diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp index a4a18abd..f1a23f15 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp @@ -156,7 +156,7 @@ NO. 업무구분 단속일시 - 차량번호 + 차량번호 법정동 단속장소 위반항목 diff --git a/src/main/webapp/WEB-INF/jsp/fims/rcvm/rcvm01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/rcvm/rcvm01010-main.jsp index 8a44b8cc..b6f99d0d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/rcvm/rcvm01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/rcvm/rcvm01010-main.jsp @@ -205,10 +205,10 @@ 분납이자 압류일자 압류물건 - 대체압류차량 + 대체압류차량 압류해제일자 단속일시 - 차량번호 + 차량번호 법정동 단속장소 처리상태