From 140357e136137fa866f03e6be7a2fdd633cea077 Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Fri, 29 Apr 2022 15:01:04 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=EB=B3=B4=EA=B3=A0=20>?=
 =?UTF-8?q?=EA=B2=AC=EB=AC=B8=ED=86=B5=EA=B3=84>=EA=B2=AC=EB=AC=B8?=
 =?UTF-8?q?=ED=86=B5=EA=B3=84=20=EC=97=91=EC=85=80=20=EA=B0=80=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/web/ReportStatsController.java     | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/main/java/kcg/faics/report/web/ReportStatsController.java b/src/main/java/kcg/faics/report/web/ReportStatsController.java
index 4513575..e971d05 100644
--- a/src/main/java/kcg/faics/report/web/ReportStatsController.java
+++ b/src/main/java/kcg/faics/report/web/ReportStatsController.java
@@ -1,12 +1,7 @@
 package kcg.faics.report.web;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -202,29 +197,49 @@ public class ReportStatsController {
 		searchVO = ReportCommon.setSearchUserInfo(searchVO);
 		
 		// 분야별 통계
+
+
 		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));
-			if(reportSearchVO.getCategory1()!=null){
+			if(reportSearchVO.getCategory1() != null) {
 				for (String category : reportSearchVO.getCategory1()) {
 					header.put(category + "_1", messageSource.getMessage("report.category." + category + "_1", null, locale));
 				}
-			}
+				}
+				else {
+					HashMap<String, String> category = cateService.getCategory1();
+					searchVO.setCategory1(category.keySet().toArray(new String[category.size()]));
+				}
+
 			if(reportSearchVO.getCategory2()!=null) {
 				for (String category : reportSearchVO.getCategory2()) {
 					header.put(category + "_2", messageSource.getMessage("report.category." + category + "_2", null, locale));
 				}
 			}
+			else {
+				HashMap<String, String> category = cateService.getCategory2();
+				searchVO.setCategory2(category.keySet().toArray(new String[category.size()]));
+			}
 			if(reportSearchVO.getCategory3()!=null) {
 				for (String category : reportSearchVO.getCategory3()) {
 					header.put(category + "_3", messageSource.getMessage("report.category." + category + "_3", null, locale));
 				}
 			}
+			else {
+				HashMap<String, String> category = cateService.getCategory3();
+				searchVO.setCategory3(category.keySet().toArray(new String[category.size()]));
+			}
 			if(reportSearchVO.getCategory4()!=null) {
 				for (String category : reportSearchVO.getCategory4()) {
 					header.put(category + "_4", messageSource.getMessage("report.category." + category + "_4", null, locale));
 				}
 			}
+			else {
+				HashMap<String, String> category = cateService.getCategory4();
+				searchVO.setCategory4(category.keySet().toArray(new String[category.size()]));
+			}
+
 			try {
 				Date d = new Date();
 				SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
@@ -239,7 +254,7 @@ public class ReportStatsController {
 					searchVO.setPlaces(placeList.toArray(new String[placeList.size()]));
 				}
 
-				// 분류 아무것도 선택하지 않은 경우 모두 세팅
+			/*	// 분류 아무것도 선택하지 않은 경우 모두 세팅
 				if (searchVO.isSearchCate1() && searchVO.getCategory1().length == 0) {
 					HashMap<String, String> category = cateService.getCategory1();
 					searchVO.setCategory1(category.keySet().toArray(new String[category.size()]));
@@ -255,7 +270,7 @@ public class ReportStatsController {
 				if (searchVO.isSearchCate1() && searchVO.getCategory4().length == 0) {
 					HashMap<String, String> category = cateService.getCategory4();
 					searchVO.setCategory4(category.keySet().toArray(new String[category.size()]));
-				}
+				}*/
 				
 				List<HashMap<String, String>> list = judgeService.statsCategory(searchVO);