From 38b6e5fb7922d5eb1853e92a50659b503ef10562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Fri, 15 Apr 2022 17:45:24 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EA=B2=BD=EC=B0=B0=20>=20?=
 =?UTF-8?q?=EC=A0=95=EC=9B=90/=ED=98=84=EC=9B=90=20=ED=98=84=ED=99=A9=20?=
 =?UTF-8?q?=EC=97=91=EC=85=80=20=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kcg/faics/cmmn/excel/ExcelExporter.java   |  2 +-
 .../java/kcg/faics/fa/web/FaController.java   | 44 +++++++++----------
 .../sqlmapper/mappers/member/member.xml       | 14 +++---
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/main/java/kcg/faics/cmmn/excel/ExcelExporter.java b/src/main/java/kcg/faics/cmmn/excel/ExcelExporter.java
index d49e974..f381a56 100644
--- a/src/main/java/kcg/faics/cmmn/excel/ExcelExporter.java
+++ b/src/main/java/kcg/faics/cmmn/excel/ExcelExporter.java
@@ -103,7 +103,7 @@ public class ExcelExporter<T> extends AbstractExcelExport {
 						Object o = ((Map<?, ?>) t).get(key);
 						if (o instanceof String) {
 							value = o.toString();
-						} else if (o instanceof Integer || o instanceof Double) {
+						} else if (o instanceof Integer || o instanceof Double || o instanceof Long) {
 							value = String.valueOf(o);
 						} else if (o instanceof BigDecimal) {
 							value = ((BigDecimal) o).toString();
diff --git a/src/main/java/kcg/faics/fa/web/FaController.java b/src/main/java/kcg/faics/fa/web/FaController.java
index 97d6b79..15fa015 100644
--- a/src/main/java/kcg/faics/fa/web/FaController.java
+++ b/src/main/java/kcg/faics/fa/web/FaController.java
@@ -87,37 +87,37 @@ public class FaController {
 	 */
 	@RequestMapping("/memberManagePersonnelExcel.do")
 	public String memberManagePersonnelExcel(final Model model) throws Exception {
-		
-		String title = "외사경찰 정원 및 현원 현황";
-		
+
 		List<HashMap<String, Object>> resultList = memberService.getCapacityManagement();
 		
 		LinkedHashMap<String, String> header = new LinkedHashMap<String, String>();
-		header.put("CODENM", "구분");
-		header.put("TOT_CNT", "전체 정원");
-		header.put("CURRENT_CNT", "현재 정원");
-		header.put("EXCESS", "과부족");
-		header.put("POSITION204", "총경 정원");
-		header.put("CNT_204", "총경 현원");
+		header.put("codenm", "구분");
+		header.put("tot_cnt", "전체 정원");
+		header.put("current_cnt", "현재 정원");
+		header.put("excess", "과부족");
+		header.put("position204", "총경 정원");
+		header.put("cnt_204", "총경 현원");
 		
-		header.put("POSITION203", "경정 정원");
-		header.put("CNT_203", "경정 현원");
+		header.put("position203", "경정 정원");
+		header.put("cnt_203", "경정 현원");
 		
-		header.put("POSITION202", "경감 정원");
-		header.put("CNT_202", "경감 현원");
+		header.put("position202", "경감 정원");
+		header.put("cnt_202", "경감 현원");
 		
-		header.put("POSITION201", "경위 정원");
-		header.put("CNT_201", "경위 현원");
+		header.put("position201", "경위 정원");
+		header.put("cnt_201", "경위 현원");
 		
-		header.put("POSITION104", "경사 정원");
-		header.put("CNT_104", "경사 현원");
+		header.put("position104", "경사 정원");
+		header.put("cnt_104", "경사 현원");
 		
-		header.put("POSITION103", "경장 정원");
-		header.put("CNT_103", "경장 현원");
-		
-		header.put("POSITION102", "순경 정원");
-		header.put("CNT_102", "순경 현원");
+		header.put("position103", "경장 정원");
+		header.put("cnt_103", "경장 현원");
 		
+		header.put("position102", "순경 정원");
+		header.put("cnt_102", "순경 현원");
+
+    String title = "외사경찰 정원 및 현원 현황";
+
 		model.addAttribute("excel", new ExcelExporter<HashMap<String, Object>>(header, resultList, title));
 		model.addAttribute("filename", title);
 		
diff --git a/src/main/resources/sqlmapper/mappers/member/member.xml b/src/main/resources/sqlmapper/mappers/member/member.xml
index 8cec396..1ff27d8 100644
--- a/src/main/resources/sqlmapper/mappers/member/member.xml
+++ b/src/main/resources/sqlmapper/mappers/member/member.xml
@@ -482,11 +482,15 @@
 	
 	<select id="Member.getCapacityManagement" resultType="hashmap">
 	<![CDATA[	
-		SELECT
-		 CASE RESULT_LIST.PLACE WHEN 'PS0' THEN '계' WHEN 'PS001' THEN '소계'  ELSE CODE.CODENM END AS CODENM,  
-     RESULT_LIST.*, CURRENT_CNT - TOT_CNT AS EXCESS
+		SELECT CASE RESULT_LIST.PLACE
+              WHEN 'PS0' THEN '계'
+              WHEN 'PS001' THEN '소계'
+              ELSE CODE.CODENM
+           END AS CODENM,
+           RESULT_LIST.*,
+           CURRENT_CNT - TOT_CNT AS EXCESS
 		FROM (
-		  SELECT 
+		  SELECT
 		    A.PLACE1 AS PLACE,
         COALESCE(A.TOT_CNT, 0) AS TOT_CNT,	
 		    COALESCE(B.CURRENT_CNT,0) AS CURRENT_CNT,	
@@ -509,7 +513,7 @@
 		      SUM(COALESCE(POSITION103,0)) AS POSITION103,	
 		      SUM(COALESCE(POSITION102,0)) AS POSITION102 
 		    FROM TAGENTNUM
-		      WHERE PLACE1 <> 'PS95' 
+        WHERE PLACE1 <> 'PS95'
 		  ) A INNER JOIN (
 		    SELECT 
 		      'PS0' AS PLACE1,