From 2fca65e7427ba3cdcfce7d6d4b2c7c8656685572 Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Fri, 15 Apr 2022 15:20:51 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=ED=86=B5=EA=B3=84(=EB=B6=84?=
 =?UTF-8?q?=EC=95=BC=EB=B3=84=ED=86=B5=EA=B3=84),=20=EA=B2=AC=EB=AC=B8?=
 =?UTF-8?q?=EC=A0=9C=EC=B6=9C=ED=98=84=ED=99=A9(=EA=B2=AC=EB=AC=B8?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C,=EA=B2=80=EC=83=89)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ReportJudgeServiceImpl.java  | 42 +++++++++----------
 .../sqlmapper/mappers/report/report.xml       |  2 +-
 .../sqlmapper/mappers/report/reportFile.xml   |  4 +-
 .../sqlmapper/mappers/report/reportJudge.xml  | 34 +++++++--------
 .../webapp/WEB-INF/jsp/report/statsResult.jsp | 10 ++---
 5 files changed, 46 insertions(+), 46 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 bef142a..e3a192a 100644
--- a/src/main/java/kcg/faics/report/service/impl/ReportJudgeServiceImpl.java
+++ b/src/main/java/kcg/faics/report/service/impl/ReportJudgeServiceImpl.java
@@ -401,17 +401,17 @@ public class ReportJudgeServiceImpl extends EgovAbstractServiceImpl implements R
 				
 				HashMap<String, String> ttt = new HashMap<String, String>();
 				for (String mapKey : newMap.keySet()) {
-					if (!mapKey.equals("TOTAL") && !mapKey.equals("PLACENAME") && !mapKey.equals("PLACECODE")) {
+					if (!mapKey.equals("total") && !mapKey.equals("placename") && !mapKey.equals("placecode")) {
 						ttt.put(mapKey + "_1", newMap.get(mapKey));
 					}
 				}
-				ttt.put("PLACENAME", newMap.get("PLACENAME"));
+				ttt.put("placename", newMap.get("placename"));
 
 				if (cateMap.size() > idx && cateMap.get(idx) != null) {
 					cateMap.get(idx).putAll(ttt);
-					cateMap.get(idx).put("TOTAL", String.valueOf(Integer.parseInt(cateMap.get(idx).get("TOTAL").toString()) + Integer.parseInt(newMap.get("TOTAL").toString())));
+					cateMap.get(idx).put("total", String.valueOf(Integer.parseInt(cateMap.get(idx).get("total").toString()) + Integer.parseInt(newMap.get("total").toString())));
 				} else {
-					ttt.put("TOTAL", newMap.get("TOTAL"));
+					ttt.put("total", newMap.get("total"));
 					cateMap.add(idx, ttt);
 				}
 				idx++;
@@ -427,17 +427,17 @@ public class ReportJudgeServiceImpl extends EgovAbstractServiceImpl implements R
 				HashMap<String, String> ttt = new HashMap<String, String>();
 				
 				for (String mapKey : newMap.keySet()) {
-					if (!mapKey.equals("TOTAL") && !mapKey.equals("PLACENAME") && !mapKey.equals("PLACECODE")) {
+					if (!mapKey.equals("total") && !mapKey.equals("placename") && !mapKey.equals("placecode")) {
 						ttt.put(mapKey + "_2", newMap.get(mapKey));
 					}
-					ttt.put("PLACENAME", newMap.get("PLACENAME"));
+					ttt.put("placename", newMap.get("placename"));
 				}
 				
 				if (cateMap.size() > idx && cateMap.get(idx) != null) {
 					cateMap.get(idx).putAll(ttt);
-					cateMap.get(idx).put("TOTAL", String.valueOf(Integer.parseInt(cateMap.get(idx).get("TOTAL").toString()) + Integer.parseInt(newMap.get("TOTAL").toString())));
+					cateMap.get(idx).put("total", String.valueOf((Integer.parseInt(String.valueOf(cateMap.get(idx).get("total"))) + Integer.parseInt(String.valueOf(newMap.get("total"))))));
 				} else {
-					ttt.put("TOTAL", newMap.get("TOTAL"));
+					ttt.put("total", newMap.get("total"));
 					cateMap.add(idx, ttt);
 				}
 				idx++;
@@ -452,17 +452,17 @@ public class ReportJudgeServiceImpl extends EgovAbstractServiceImpl implements R
 				HashMap<String, String> ttt = new HashMap<String, String>();
 				
 				for (String mapKey : newMap.keySet()) {
-					if (!mapKey.equals("TOTAL") && !mapKey.equals("PLACENAME") && !mapKey.equals("PLACECODE")) {
+					if (!mapKey.equals("total") && !mapKey.equals("placename") && !mapKey.equals("placecode")) {
 						ttt.put(mapKey + "_3", newMap.get(mapKey));
 					}
-					ttt.put("PLACENAME", newMap.get("PLACENAME"));
+					ttt.put("placename", newMap.get("placename"));
 				}
 
 				if (cateMap.size() > idx && cateMap.get(idx) != null) {
 					cateMap.get(idx).putAll(ttt);
-					cateMap.get(idx).put("TOTAL", String.valueOf(Integer.parseInt(cateMap.get(idx).get("TOTAL").toString()) + Integer.parseInt(newMap.get("TOTAL").toString())));
+					cateMap.get(idx).put("total", String.valueOf(Integer.parseInt(String.valueOf(cateMap.get(idx).get("total"))) + Integer.parseInt(String.valueOf(newMap.get("total")))));
 				} else {
-					ttt.put("TOTAL", newMap.get("TOTAL"));
+					ttt.put("total", newMap.get("total"));
 					cateMap.add(idx, ttt);
 				}
 				idx++;
@@ -477,17 +477,17 @@ public class ReportJudgeServiceImpl extends EgovAbstractServiceImpl implements R
 				HashMap<String, String> ttt = new HashMap<String, String>();
 				
 				for (String mapKey : newMap.keySet()) {
-					if (!mapKey.equals("TOTAL") && !mapKey.equals("PLACENAME") && !mapKey.equals("PLACECODE")) {
+					if (!mapKey.equals("total") && !mapKey.equals("placename") && !mapKey.equals("placecode")) {
 						ttt.put(mapKey + "_4", newMap.get(mapKey));
 					}
-					ttt.put("PLACENAME", newMap.get("PLACENAME"));
+					ttt.put("placename", newMap.get("placename"));
 				}
 
 				if (cateMap.size() > idx && cateMap.get(idx) != null) {
 					cateMap.get(idx).putAll(ttt);
-					cateMap.get(idx).put("TOTAL", String.valueOf(Integer.parseInt(cateMap.get(idx).get("TOTAL").toString()) + Integer.parseInt(newMap.get("TOTAL").toString())));
+					cateMap.get(idx).put("total", String.valueOf(Integer.parseInt(String.valueOf(cateMap.get(idx).get("total"))) + Integer.parseInt(String.valueOf(newMap.get("total")))));
 				} else {
-					ttt.put("TOTAL", newMap.get("TOTAL"));
+					ttt.put("total", newMap.get("total"));
 					cateMap.add(idx, ttt);
 				}
 				idx++;
@@ -496,15 +496,15 @@ public class ReportJudgeServiceImpl extends EgovAbstractServiceImpl implements R
 		
 		if (cateMap.size() > 0) {
 			HashMap<String, String> totalMap = new HashMap<String, String>();
-			totalMap.put("PLACENAME", "누계");
+			totalMap.put("placename", "누계");
 			
 			for (String key : cateMap.get(0).keySet()) {
-				if (key.equals("PLACENAME")) {
+				if (key.equals("placename")) {
 					continue;
 				}
 				int tt = 0;
 				for (HashMap<String, String> hashMap : cateMap) {
-					tt = tt + Integer.parseInt(hashMap.get(key));
+					tt = tt + Integer.parseInt(String.valueOf(hashMap.get(key)));
 				}
 				totalMap.put(key, String.valueOf(tt));
 			}
@@ -520,11 +520,11 @@ public class ReportJudgeServiceImpl extends EgovAbstractServiceImpl implements R
 		List<HashMap<String, String>> list = reportJudgeMapper.statsJudge(reportSearchVO);
 		
 		HashMap<String, String> map = new HashMap<String, String>();
-		map.put("PLACENAME", "누계");
+		map.put("placename", "누계");
 		
 		if (list.size() > 0) {
 			for (String key : list.get(0).keySet()) {
-				if (key.equals("PLACENAME")) {
+				if (key.equals("placename")) {
 					continue;
 				}
 				int total = 0;
diff --git a/src/main/resources/sqlmapper/mappers/report/report.xml b/src/main/resources/sqlmapper/mappers/report/report.xml
index 7ef78fb..0d45337 100644
--- a/src/main/resources/sqlmapper/mappers/report/report.xml
+++ b/src/main/resources/sqlmapper/mappers/report/report.xml
@@ -1211,7 +1211,7 @@
 			</if>
 		 
 				) T
-			)
+			) AS LIST
 	  	WHERE
 	  		RNUM > #{firstIndex} AND
 	  		RNUM &lt;= #{firstIndex} + #{recordCountPerPage}
diff --git a/src/main/resources/sqlmapper/mappers/report/reportFile.xml b/src/main/resources/sqlmapper/mappers/report/reportFile.xml
index 364b6fe..aa08d3c 100644
--- a/src/main/resources/sqlmapper/mappers/report/reportFile.xml
+++ b/src/main/resources/sqlmapper/mappers/report/reportFile.xml
@@ -30,9 +30,9 @@
 		UPDATE
 			RPT_FILE_STORAGE 
 		SET
-			FS_FILE_COUNT = FS_FILE_COUNT + #{cnt}
+			FS_FILE_COUNT = FS_FILE_COUNT + #{cnt}::int
 		WHERE 
-			FS_SEQ = #{fsseq}
+			FS_SEQ = #{fsseq}::int
 		]]>
 	</update>
 	
diff --git a/src/main/resources/sqlmapper/mappers/report/reportJudge.xml b/src/main/resources/sqlmapper/mappers/report/reportJudge.xml
index 6235a07..66cfe24 100644
--- a/src/main/resources/sqlmapper/mappers/report/reportJudge.xml
+++ b/src/main/resources/sqlmapper/mappers/report/reportJudge.xml
@@ -119,28 +119,28 @@
 		SELECT 
 		]]>
 			<if test="categoryType.equals(1)">
-				<foreach collection="category1" item="cate" separator=""><![CDATA[
-					TO_CHAR(MAX(DECODE(CATEGORYCODE, #{cate}, TOTAL))) AS "${cate}",
-				]]></foreach>
+				<foreach collection="category1" item="cate" separator="">
+					MAX(CASE CATEGORYCODE WHEN #{cate} THEN TOTAL::int end) AS "${cate}",
+				</foreach>
 			</if>
 			<if test="categoryType.equals(2)">
-				<foreach collection="category2" item="cate" ><![CDATA[
-					TO_CHAR(MAX(DECODE(CATEGORYCODE, #{cate}, TOTAL))) AS "${cate}",
-				]]></foreach>
+				<foreach collection="category2" item="cate" >
+					MAX(CASE CATEGORYCODE WHEN #{cate} THEN TOTAL::int end) AS "${cate}",
+				</foreach>
 			</if>
 			<if test="categoryType.equals(3)">
-				<foreach collection="category3" item="cate" ><![CDATA[
-					TO_CHAR(MAX(DECODE(CATEGORYCODE, #{cate}, TOTAL))) AS "${cate}",
-				]]></foreach>
+				<foreach collection="category3" item="cate" >
+					MAX(CASE CATEGORYCODE WHEN #{cate} THEN TOTAL::int end) AS "${cate}",
+				</foreach>
 			</if>
 			<if test="categoryType.equals(4)">
-				<foreach collection="category4" item="cate" ><![CDATA[
-					TO_CHAR(MAX(DECODE(CATEGORYCODE, #{cate}, TOTAL))) AS "${cate}",
-				]]></foreach>
+				<foreach collection="category4" item="cate" >
+					MAX(CASE CATEGORYCODE WHEN #{cate} THEN TOTAL::int end) AS "${cate}",
+			</foreach>
 			</if>
 		<![CDATA[
 			PLACENAME, PLACECODE,
-			TO_CHAR(SUM(TOTAL)) AS TOTAL
+			SUM(TOTAL) AS TOTAL
 		FROM
 			(
 				SELECT 
@@ -164,10 +164,10 @@
 					</choose>
 					
 					<if test="dateStart != null and dateStart != ''"><![CDATA[
-						AND IN_INFODATE >= #{dateStart}
+						AND IN_INFODATE >= #{dateStart}::date
 					]]></if>
 					<if test="dateEnd != null and dateEnd != ''"><![CDATA[
-						AND IN_INFODATE <= #{dateEnd}
+						AND IN_INFODATE <= #{dateEnd}::date
 					]]></if>
 					<if test="subject != null and subject != ''"><![CDATA[
 						AND IN_SUBJECT LIKE '%'||#{subject}||'%'
@@ -277,8 +277,8 @@
 			WHERE
 				IN_COMPLETE = '1' 
 				AND IN_STATE_CODE <> '99'
-				AND IN_INFODATE >= #{dateStart}
-				AND IN_INFODATE <= #{dateEnd}
+				AND IN_INFODATE >= #{dateStart}::date
+				AND IN_INFODATE <= #{dateEnd}::date
 	]]>
 			<if test="policeType != null and policeType.length > 0">
 				AND IN_TYPE IN
diff --git a/src/main/webapp/WEB-INF/jsp/report/statsResult.jsp b/src/main/webapp/WEB-INF/jsp/report/statsResult.jsp
index b4a76b9..eca8fc5 100644
--- a/src/main/webapp/WEB-INF/jsp/report/statsResult.jsp
+++ b/src/main/webapp/WEB-INF/jsp/report/statsResult.jsp
@@ -200,9 +200,9 @@
 				
 			 	<c:forEach var="stats" items="${statistics}" varStatus="status">
 					<tr>
-						<c:if test="${status.last}"><td align="center" style="font-weight:bold;"><c:out value="${stats.PLACENAME}"/></td></c:if>
-						<c:if test="${!status.last}"><td align="left"><c:out value="${stats.PLACENAME}"/></td></c:if>
-						<td align="center"><c:out value="${stats.TOTAL}"/></td>
+						<c:if test="${status.last}"><td align="center" style="font-weight:bold;"><c:out value="${stats.placename}"/></td></c:if>
+						<c:if test="${!status.last}"><td align="left"><c:out value="${stats.placename}"/></td></c:if>
+						<td align="center"><c:out value="${stats.total}"/></td>
 						
 						<c:if test="${reportSearchVO.searchCate1}">
 							<c:forEach var="item" items="${searchVO.category1}">
@@ -264,8 +264,8 @@
 				
 			 	<c:forEach var="stats" items="${statistics}" varStatus="status">
 					<tr>
-						<c:if test="${status.last}"><td align="center"><c:out value="${stats.PLACENAME}"/></td></c:if>
-						<c:if test="${!status.last}"><td align="left"><c:out value="${stats.PLACENAME}"/></td></c:if>
+						<c:if test="${status.last}"><td align="center"><c:out value="${stats.placename}"/></td></c:if>
+						<c:if test="${!status.last}"><td align="left"><c:out value="${stats.placename}"/></td></c:if>
 						
 						<td align="center"><c:out value="${stats.REPORT1}"/></td>
 						<td align="center"><c:out value="${stats.REPORT2}"/></td>