From 54db411eed51036be4a0777bea8935131fcb11f3 Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Mon, 25 Apr 2022 15:33:39 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=A0=95=EB=B3=B4=EB=B3=B4?=
 =?UTF-8?q?=EA=B3=A0=20=EA=B2=80=EC=83=89=20=EA=B8=B0=EB=8A=A5=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

---
 .../service/impl/ReportJudgeServiceImpl.java  |  2 +-
 .../report/web/ReportStatsController.java     | 28 +++++++++----------
 .../webapp/WEB-INF/jsp/board/boardList.jsp    |  2 ++
 .../webapp/WEB-INF/jsp/report/statistics.jsp  |  2 --
 .../webapp/WEB-INF/jsp/report/statsResult.jsp |  1 +
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/main/java/kcg/faics/report/service/impl/ReportJudgeServiceImpl.java b/src/main/java/kcg/faics/report/service/impl/ReportJudgeServiceImpl.java
index ca96825..e73ef8e 100644
--- a/src/main/java/kcg/faics/report/service/impl/ReportJudgeServiceImpl.java
+++ b/src/main/java/kcg/faics/report/service/impl/ReportJudgeServiceImpl.java
@@ -529,7 +529,7 @@ public class ReportJudgeServiceImpl extends EgovAbstractServiceImpl implements R
 				}
 				int total = 0;
 				for (HashMap<String, String> item : list) {
-					total += Integer.parseInt(item.get(key));
+					total += Integer.parseInt(String.valueOf(item.get("bg")));
 				}
 				map.put(key, String.valueOf(total));
 			}
diff --git a/src/main/java/kcg/faics/report/web/ReportStatsController.java b/src/main/java/kcg/faics/report/web/ReportStatsController.java
index 661e0f6..3f77fdc 100644
--- a/src/main/java/kcg/faics/report/web/ReportStatsController.java
+++ b/src/main/java/kcg/faics/report/web/ReportStatsController.java
@@ -204,7 +204,7 @@ public class ReportStatsController {
 		// 분야별 통계
 		if ("C".equals(searchVO.getStatsType())) {
 			header.put("placename", messageSource.getMessage("report.view.division", null, locale));
-			header.put("TOTAL", messageSource.getMessage("report.stats.total", null, locale));
+			header.put("total", messageSource.getMessage("report.stats.total", null, locale));
 			for (String category : reportSearchVO.getCategory1()) {
 				header.put(category + "_1", messageSource.getMessage("report.category." + category + "_1", null, locale));
 			}
@@ -261,21 +261,21 @@ public class ReportStatsController {
 		} else if ("J".equals(searchVO.getStatsType())) {
 			header.put("placename", messageSource.getMessage("report.view.division", null, locale));
 			
-			header.put("REPORT1", messageSource.getMessage("report.type.fullReport1", null, locale));
-			header.put("REPORT2", messageSource.getMessage("report.type.fullReport2", null, locale));
+			header.put("report1", messageSource.getMessage("report.type.fullReport1", null, locale));
+			header.put("report2", messageSource.getMessage("report.type.fullReport2", null, locale));
 
-			header.put("JU1", messageSource.getMessage("report.type.newsflash", null, locale));
-			header.put("JU2", messageSource.getMessage("report.type.judge", null, locale));
-			header.put("JU3", messageSource.getMessage("report.type.middle", null, locale));
-			header.put("JU4", messageSource.getMessage("report.type.notice", null, locale));
-			header.put("JU5", messageSource.getMessage("report.type.record", null, locale));
-			header.put("JU6", messageSource.getMessage("report.type.survey", null, locale));
-			header.put("JU7", messageSource.getMessage("report.type.reference", null, locale));
+			header.put("ju1", messageSource.getMessage("report.type.newsflash", null, locale));
+			header.put("ju2", messageSource.getMessage("report.type.judge", null, locale));
+			header.put("ju3", messageSource.getMessage("report.type.middle", null, locale));
+			header.put("ju4", messageSource.getMessage("report.type.notice", null, locale));
+			header.put("ju5", messageSource.getMessage("report.type.record", null, locale));
+			header.put("ju6", messageSource.getMessage("report.type.survey", null, locale));
+			header.put("ju7", messageSource.getMessage("report.type.reference", null, locale));
 
-			header.put("AG", messageSource.getMessage("report.stats.AGrade", null, locale));
-			header.put("BG", messageSource.getMessage("report.stats.BGrade", null, locale));
-			header.put("CG", messageSource.getMessage("report.stats.CGrade", null, locale));
-			header.put("DG", messageSource.getMessage("report.stats.DGrade", null, locale));
+			header.put("ag", messageSource.getMessage("report.stats.AGrade", null, locale));
+			header.put("bg", messageSource.getMessage("report.stats.BGrade", null, locale));
+			header.put("cg", messageSource.getMessage("report.stats.CGrade", null, locale));
+			header.put("dg", messageSource.getMessage("report.stats.DGrade", null, locale));
 			
 			Date d = new Date();
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
diff --git a/src/main/webapp/WEB-INF/jsp/board/boardList.jsp b/src/main/webapp/WEB-INF/jsp/board/boardList.jsp
index de7877b..dc40111 100644
--- a/src/main/webapp/WEB-INF/jsp/board/boardList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/board/boardList.jsp
@@ -6,6 +6,8 @@
 <%@ taglib prefix="ct" tagdir="/WEB-INF/tags"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<% request.setCharacterEncoding("UTF-8"); %>
+
 <script type="text/javaScript" language="javascript" defer="defer">
 
 	
diff --git a/src/main/webapp/WEB-INF/jsp/report/statistics.jsp b/src/main/webapp/WEB-INF/jsp/report/statistics.jsp
index 4f1fbbb..16c33ec 100644
--- a/src/main/webapp/WEB-INF/jsp/report/statistics.jsp
+++ b/src/main/webapp/WEB-INF/jsp/report/statistics.jsp
@@ -135,7 +135,6 @@
 	</div>
 
 <script type="text/javaScript" language="javascript" defer="defer">
-<!--
 	$(document).ready(function(){
 		//날짜 설정
 		$('input[id^="date"]').datepicker({dateFormat: 'yy-mm-dd'});
@@ -178,5 +177,4 @@
 		document.searchForm.submit();
 	}
 	
--->
 </script>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/report/statsResult.jsp b/src/main/webapp/WEB-INF/jsp/report/statsResult.jsp
index 183d078..d9b8af2 100644
--- a/src/main/webapp/WEB-INF/jsp/report/statsResult.jsp
+++ b/src/main/webapp/WEB-INF/jsp/report/statsResult.jsp
@@ -311,6 +311,7 @@
 	}
 
 	//분야별 엑셀받기
+
 	function fn_get_excel() {
 		document.searchForm.statsType.value = "<c:out value='${reportSearchVO.statsType}'/>";
 		document.searchForm.action = "<c:out value='/report/statsExcel.do' />";