From 355603c9f516971f1e81f40edd21574234eb273e Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Tue, 30 Jul 2024 12:15:23 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=ED=8F=90=EA=B8=B0=EB=B3=B4=EA=B3=A0=20?= =?UTF-8?q?=ED=86=B5=EA=B3=84=20=EC=83=81=EC=84=B8=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/adds/nims/web/AddsNimsController.java | 37 ++++++++++--------- .../dsuseMgtDsuseQyByBsshStatistics-info.jsp | 2 +- .../dsuseMgtDsuseQyByBsshStatistics-main.jsp | 25 ++----------- ...dsuseMgtDsuseQyByIndutyStatistics-info.jsp | 2 +- ...dsuseMgtDsuseQyByIndutyStatistics-main.jsp | 33 +++++------------ .../dsuseMgtDsuseQyByPrdStatistics-info.jsp | 2 +- .../dsuseMgtDsuseQyByPrdStatistics-main.jsp | 26 ++----------- .../dsuseMgtNcrdAndPrtmStatistics-info.jsp | 2 +- .../dsuseMgtNcrdAndPrtmStatistics-main.jsp | 22 ++--------- 9 files changed, 42 insertions(+), 109 deletions(-) diff --git a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java index 9fa21c8..309800d 100644 --- a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java +++ b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java @@ -951,7 +951,7 @@ public class AddsNimsController extends ApplicationController { private ModelAndView excelDownloadDsuseMgtNcrdAndPrtmStatistics(DsuseMgtStatisticsQuery query) { List cellDefs = fromJson(query.getCellDefs(), CellDef.listType()); - XLSWriter xlsx = new XLSWriter().worksheet(0); + XLSWriter xlsx = new XLSWriter().worksheet("마약류 제품 구분별 현황"); Format format = new Format(xlsx); CellStyle center = format.cellStyle(Style.CENTER); CellStyle right = format.cellStyle(Style.RIGHT); @@ -970,7 +970,7 @@ public class AddsNimsController extends ApplicationController { valueMap.put("비마약류", a_slash_b(format, "비마약류", "비마약류Qy").style(right)); valueMap.put("일반관리대상", a_slash_b(format, "일반관리대상", "일반관리대상Qy").style(right)); valueMap.put("중점관리대상", a_slash_b(format, "중점관리대상", "중점관리대상Qy").style(right)); - valueMap.put("폐기건수", format.of("dsuseCnt").style(numeric)); + valueMap.put("신청건수", format.of("dsuseCnt").style(numeric)); valueMap.put("폐기수량", format.of("dsuseQy").style(numeric)); CellDef.setValues(cellDefs, valueMap); @@ -990,9 +990,9 @@ public class AddsNimsController extends ApplicationController { xlsx.cell(0, 1).value("마약류 제품 구분별 현황").value(center).merge(1, cellDefs.size()-1); // 관할관청 - rowspan xlsx.cell(2, 0).value("관할관청").value(headerStyle).merge(2, 3, 0, 0); - xlsx.cell(2, 1).value("마약/향정 구분(폐기건수 / 폐기수량)").value(headerStyle2).merge(1, 6); - xlsx.cell(2, 7).value("중점/일반 구분(폐기건수 / 폐기수량)").value(headerStyle2).merge(7, 9); - xlsx.cell(2, 10).value("폐기건수").value(headerStyle).merge(2, 3, 10, 10); + xlsx.cell(2, 1).value("마약/향정 구분(신청건수 / 폐기수량)").value(headerStyle2).merge(1, 6); + xlsx.cell(2, 7).value("중점/일반 구분(신청건수 / 폐기수량)").value(headerStyle2).merge(7, 9); + xlsx.cell(2, 10).value("신청건수").value(headerStyle).merge(2, 3, 10, 10); xlsx.cell(2, 11).value("폐기수량").value(headerStyle).merge(2, 3, 11, 11); List cellDefs2 = cellDefs.subList(1, cellDefs.size()-2); @@ -1009,7 +1009,7 @@ public class AddsNimsController extends ApplicationController { private ModelAndView excelDownloadDsuseMgtDsuseQyByPrdStatistics(DsuseMgtStatisticsQuery query) { List cellDefs = fromJson(query.getCellDefs(), CellDef.listType()); - XLSWriter xlsx = new XLSWriter().worksheet(0); + XLSWriter xlsx = new XLSWriter().worksheet("마약류 제품별 폐기 현황"); Format format = new Format(xlsx); CellStyle center = format.cellStyle(Style.CENTER); CellStyle right = format.cellStyle(Style.RIGHT); @@ -1027,7 +1027,7 @@ public class AddsNimsController extends ApplicationController { valueMap.put("결과[통보]처리", a_slash_b(format, "rsltCnt", "rsltQy").style(right)); valueMap.put("폐기보고확인", a_slash_b(format, "mappingCnt", "mappingQy").style(right)); valueMap.put("보고완료", a_slash_b(format, "cpltCnt", "cpltQy").style(right)); - valueMap.put("폐기건수", format.of("dsuseCnt").style(numeric)); + valueMap.put("신청건수", format.of("dsuseCnt").style(numeric)); valueMap.put("폐기수량", format.of("dsuseQy").style(numeric)); CellDef.setValues(cellDefs, valueMap); @@ -1047,13 +1047,14 @@ public class AddsNimsController extends ApplicationController { }); xlsx.cell(0, 0).value("마약류 제품별 폐기 현황").value(center).merge(0, cellDefs.size()-1); + // rowspan xlsx.cell(2, 0).value("NO.").value(headerStyle).merge(2, 3, 0, 0); xlsx.cell(2, 1).value("관할관청").value(headerStyle).merge(2, 3, 1, 1); xlsx.cell(2, 2).value("제품코드").value(headerStyle).merge(2, 3, 2, 2); xlsx.cell(2, 3).value("제품명").value(headerStyle).merge(2, 3, 3, 3); - xlsx.cell(2, 4).value("처리상태 별 (폐기건수 / 폐기수량)").value(headerStyle2).merge(4, 7); - xlsx.cell(2, 8).value("폐기건수").value(headerStyle).merge(2, 3, 8, 8); + xlsx.cell(2, 4).value("처리상태 별 (신청건수 / 폐기수량)").value(headerStyle2).merge(4, 7); + xlsx.cell(2, 8).value("신청건수").value(headerStyle).merge(2, 3, 8, 8); xlsx.cell(2, 9).value("폐기수량").value(headerStyle).merge(2, 3, 9, 9); List cellDefs2 = cellDefs.subList(5, cellDefs.size()-2); @@ -1071,7 +1072,7 @@ public class AddsNimsController extends ApplicationController { private ModelAndView excelDownloadDsuseMgtDsuseQyByIndutyStatistics(DsuseMgtStatisticsQuery query) { List cellDefs = fromJson(query.getCellDefs(), CellDef.listType()); - XLSWriter xlsx = new XLSWriter().worksheet(0); + XLSWriter xlsx = new XLSWriter().worksheet("마약류 취급 업종별 폐기 현황"); Format format = new Format(xlsx); CellStyle center = format.cellStyle(Style.CENTER); CellStyle right = format.cellStyle(Style.RIGHT); @@ -1088,7 +1089,7 @@ public class AddsNimsController extends ApplicationController { valueMap.put("마약류수출입업", a_slash_b(format, "마약류수출입업", "마약류수출입업Qy").style(right)); valueMap.put("마약류원료사용", a_slash_b(format, "마약류원료사용", "마약류원료사용Qy").style(right)); valueMap.put("마약류취급학술연구", a_slash_b(format, "마약류취급학술연구", "마약류취급학술연구Qy").style(right)); - valueMap.put("폐기건수", format.of("dsuseCnt").style(numeric)); + valueMap.put("신청건수", format.of("dsuseCnt").style(numeric)); valueMap.put("폐기수량", format.of("dsuseQy").style(numeric)); CellDef.setValues(cellDefs, valueMap); @@ -1108,8 +1109,8 @@ public class AddsNimsController extends ApplicationController { xlsx.cell(0, 0).value("마약류 취급 업종별 폐기 현황").value(center).merge(0, cellDefs.size()-1); xlsx.cell(2, 0).value("관할관청").value(headerStyle).merge(2, 3, 0, 0); - xlsx.cell(2, 1).value("업종별 구분 (폐기건수 / 폐시수량)").value(headerStyle2).merge(1, 7); - xlsx.cell(2, 8).value("폐기건수").value(headerStyle).merge(2, 3, 8, 8); + xlsx.cell(2, 1).value("업종별 구분 (신청건수 / 폐시수량)").value(headerStyle2).merge(1, 7); + xlsx.cell(2, 8).value("신청건수").value(headerStyle).merge(2, 3, 8, 8); xlsx.cell(2, 9).value("폐기수량").value(headerStyle).merge(2, 3, 9, 9); List cellDefs2 = cellDefs.subList(1, cellDefs.size()-2); @@ -1126,7 +1127,7 @@ public class AddsNimsController extends ApplicationController { private ModelAndView excelDownloadDsuseMgtDsuseQyByBsshStatistics(DsuseMgtStatisticsQuery query) { List cellDefs = fromJson(query.getCellDefs(), CellDef.listType()); - XLSWriter xlsx = new XLSWriter().worksheet(0); + XLSWriter xlsx = new XLSWriter().worksheet("마약류 취급자별 폐기 현황"); Format format = new Format(xlsx); CellStyle center = format.cellStyle(Style.CENTER); CellStyle right = format.cellStyle(Style.RIGHT); @@ -1142,10 +1143,10 @@ public class AddsNimsController extends ApplicationController { valueMap.put("취급업체명", format.of("bssh_nm").style(left)); valueMap.put("대표자", format.of("rprsntv_nm").style(center)); valueMap.put("신청서접수", a_slash_b(format, "receiptCnt", "receiptQy").style(right)); - valueMap.put("폐기결과[통보]처리", a_slash_b(format, "rsltCnt", "rsltQy").style(right)); + valueMap.put("결과[통보]처리", a_slash_b(format, "rsltCnt", "rsltQy").style(right)); valueMap.put("폐기보고확인", a_slash_b(format, "mappingCnt", "mappingQy").style(right)); valueMap.put("보고완료", a_slash_b(format, "cpltCnt", "cpltQy").style(right)); - valueMap.put("폐기건수", format.of("dsuseCnt").style(numeric)); + valueMap.put("신청건수", format.of("dsuseCnt").style(numeric)); valueMap.put("폐기수량", format.of("dsuseQy").style(numeric)); CellDef.setValues(cellDefs, valueMap); @@ -1168,8 +1169,8 @@ public class AddsNimsController extends ApplicationController { xlsx.cell(2, 2).value("취급자번호").value(headerStyle).merge(2, 3, 2, 2); xlsx.cell(2, 3).value("취급업체명").value(headerStyle).merge(2, 3, 3, 3); xlsx.cell(2, 4).value("대표자").value(headerStyle).merge(2, 3, 4, 4); - xlsx.cell(2, 5).value("처리상태 별 (폐기건수 / 폐기수량)").value(headerStyle2).merge(5, 8); - xlsx.cell(2, 9).value("폐기건수").value(headerStyle).merge(2, 3, 9, 9); + xlsx.cell(2, 5).value("처리상태 별 (신청건수 / 폐기수량)").value(headerStyle2).merge(5, 8); + xlsx.cell(2, 9).value("신청건수").value(headerStyle).merge(2, 3, 9, 9); xlsx.cell(2, 10).value("폐기수량").value(headerStyle).merge(2, 3, 10, 10); List cellDefs2 = cellDefs.subList(5, cellDefs.size()-2); diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-info.jsp index 7d0ff77..07644fd 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-info.jsp @@ -17,7 +17,7 @@ 대표자 제품코드 제품명 -<%-- 폐기건수--%> +<%-- 신청건수--%> 폐기수량 처리상태 diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-main.jsp index ef1077b..1e54d7a 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-main.jsp @@ -33,25 +33,6 @@  폐기일자 적용 - -<%--
--%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%--
--%> - -<%--
--%> -<%-- --%> -<%-- --%> -<%--
--%>
- - -<%--
--%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%--
--%> -<%--
--%> -<%-- --%> -<%-- --%> -<%--
--%> -
+
+ + -
@@ -84,8 +71,8 @@ 관할관청 - 업종별 구분 (폐기건수 / 폐기수량) - 폐기건수 + 업종별 구분 (신청건수 / 폐기수량) + 신청건수 폐기수량 대표자 제품코드 제품명 -<%-- 폐기건수--%> +<%-- 신청건수--%> 폐기수량 처리상태 diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByPrdStatistics-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByPrdStatistics-main.jsp index 2f111a3..bd28e82 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByPrdStatistics-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByPrdStatistics-main.jsp @@ -32,26 +32,6 @@  폐기일자 적용 - - -<%--
--%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%--
--%> - -<%--
--%> -<%-- --%> -<%-- --%> -<%--
--%>
- - -<%--
--%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%--
--%>
@@ -55,12 +45,6 @@ 검색
-<%--
--%> -<%-- --%> -<%-- --%> -<%--
--%> @@ -87,9 +71,9 @@ 관할관청 - 마약 / 향정 구분 (폐기건수 / 폐기수량) - 중점 / 일반 구분 (폐기건수 / 폐기수량) - 폐기건수 + 마약 / 향정 구분 (신청건수 / 폐기수량) + 중점 / 일반 구분 (신청건수 / 폐기수량) + 신청건수 폐기수량