From 3cab7c123a8696be8216f1a8d7d959505869e54e 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: Mon, 18 Apr 2022 17:34:15 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=8B=A4=EC=A0=81=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=20=EC=A1=B0=ED=9A=8C=20=EC=98=A4=EB=A5=98=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

---
 .../faics/equip/web/EquipmentController.java  |   4 +-
 .../resources/sqlmapper/mappers/fa/equip.xml  |  33 +++---
 .../webapp/WEB-INF/jsp/equip/useStateList.jsp | 102 +++++++++---------
 3 files changed, 65 insertions(+), 74 deletions(-)

diff --git a/src/main/java/kcg/faics/equip/web/EquipmentController.java b/src/main/java/kcg/faics/equip/web/EquipmentController.java
index 948c3bc..6efd1ad 100644
--- a/src/main/java/kcg/faics/equip/web/EquipmentController.java
+++ b/src/main/java/kcg/faics/equip/web/EquipmentController.java
@@ -186,10 +186,10 @@ public class EquipmentController {
 
 		Calendar c = Calendar.getInstance();
 		int currYear = c.get(Calendar.YEAR);
-		int lastYear = Integer.parseInt((String) year.get(year.size() - 1).get("UYEAR"));
+		int lastYear = Integer.parseInt((String) year.get(year.size() - 1).get("uyear"));
 		for (int i = lastYear + 1; i <= currYear; i++) {
 			HashMap<String, Object> map = new HashMap<String, Object>();
-			map.put("UYEAR", i);
+			map.put("uyear", i);
 			year.add(map);
 		}
 		
diff --git a/src/main/resources/sqlmapper/mappers/fa/equip.xml b/src/main/resources/sqlmapper/mappers/fa/equip.xml
index c9d0067..fdda63d 100644
--- a/src/main/resources/sqlmapper/mappers/fa/equip.xml
+++ b/src/main/resources/sqlmapper/mappers/fa/equip.xml
@@ -115,11 +115,9 @@
 			COALESCE(SUM(CASE EU_POLICE WHEN #{item.code2} THEN ${type} ELSE 0 END), 0) AS ${item.code2}
 	 	</foreach>	 
 	<![CDATA[ 
-		FROM
-		  H3_EQUIP_USE_STATE
-		WHERE
-		  EU_YEAR = #{criteria.year} AND
-		  EU_QUATER = #{criteria.quater}
+		FROM H3_EQUIP_USE_STATE
+    WHERE EU_YEAR = (#{criteria.year}||'')
+      AND EU_QUATER = (#{criteria.quater}||'')
 		UNION
 			SELECT
 		   		2 AS CNT, B.CODENM AS GUBUN, B.CODE2 AS CODE,
@@ -131,25 +129,18 @@
 	 	<![CDATA[
 			FROM
 		    (
-		      SELECT 
-		        * 
-		      FROM 
-		        H3_EQUIP_USE_STATE  
-		      WHERE 
-		        EU_YEAR = #{criteria.year} AND
-		  		EU_QUATER = #{criteria.quater}
+		      SELECT *
+		      FROM H3_EQUIP_USE_STATE
+		      WHERE EU_YEAR = (#{criteria.year}||'')
+		        AND EU_QUATER = (#{criteria.quater}||'')
 		    ) A
 		    RIGHT JOIN
 		      (
-		        SELECT 
-		          CODE2, CODENM 
-		        FROM 
-		          TCODE 
-		        WHERE 
-		          CODE1 = 'EQUI' AND 
-		          CODE_USE_YN = 'Y'
-		        ORDER BY
-		          CODE2
+		        SELECT CODE2, CODENM
+		        FROM TCODE
+		        WHERE CODE1 = 'EQUI'
+		          AND CODE_USE_YN = 'Y'
+		        ORDER BY CODE2
 		      ) B
 		    ON A.EU_CODE = B.CODE2 
 		GROUP BY CODE2, CODENM
diff --git a/src/main/webapp/WEB-INF/jsp/equip/useStateList.jsp b/src/main/webapp/WEB-INF/jsp/equip/useStateList.jsp
index 820c4ab..09bf902 100644
--- a/src/main/webapp/WEB-INF/jsp/equip/useStateList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/equip/useStateList.jsp
@@ -41,7 +41,7 @@
 				<li class="form_search margin-left">
 					<form:select path="year" cssClass="use">
 						<c:forEach var="item" items="${equipStatusYearList}" varStatus="status">
-			 				<form:option value="${item.UYEAR}" label="${item.UYEAR}년"/>
+			 				<form:option value="${item.uyear}" label="${item.uyear}년"/>
 						</c:forEach>
 			 		</form:select>
 			 	</li>
@@ -85,60 +85,60 @@
 			<tr>
 				<th align="center"><spring:message code="equip.name" /></th>
 				<th align="center"><spring:message code="equip.total" /></th>
-				<th align="center"><spring:message code="equip.PS00" /></th>
-				<th align="center"><spring:message code="equip.PS01" /></th>
-				<th align="center"><spring:message code="equip.PS02" /></th>
-				<th align="center"><spring:message code="equip.PS03" /></th>
-				<th align="center"><spring:message code="equip.PS04" /></th>
-				<th align="center"><spring:message code="equip.PS05" /></th>
-				<th align="center"><spring:message code="equip.PS06" /></th>
-				<th align="center"><spring:message code="equip.PS07" /></th>
-				<th align="center"><spring:message code="equip.PS08" /></th>
-				<th align="center"><spring:message code="equip.PS09" /></th>
-				<th align="center"><spring:message code="equip.PS10" /></th>
-				<th align="center"><spring:message code="equip.PS11" /></th>
-				<th align="center"><spring:message code="equip.PS12" /></th>
-				<th align="center"><spring:message code="equip.PS13" /></th>
-				<th align="center"><spring:message code="equip.PS14" /></th>
-				<th align="center"><spring:message code="equip.PS15" /></th>
-				<th align="center"><spring:message code="equip.PS16" /></th>
-				<th align="center"><spring:message code="equip.PS17" /></th>
-				<th align="center"><spring:message code="equip.PS18" /></th>
-				<th align="center"><spring:message code="equip.PS90" /></th>
-				<th align="center"><spring:message code="equip.PS91" /></th>
-				<th align="center"><spring:message code="equip.PS92" /></th>
-				<th align="center"><spring:message code="equip.PS93" /></th>
-				<th align="center"><spring:message code="equip.PS94" /></th>
+				<th align="center"><spring:message code="equip.ps00" /></th>
+				<th align="center"><spring:message code="equip.ps01" /></th>
+				<th align="center"><spring:message code="equip.ps02" /></th>
+				<th align="center"><spring:message code="equip.ps03" /></th>
+				<th align="center"><spring:message code="equip.ps04" /></th>
+				<th align="center"><spring:message code="equip.ps05" /></th>
+				<th align="center"><spring:message code="equip.ps06" /></th>
+				<th align="center"><spring:message code="equip.ps07" /></th>
+				<th align="center"><spring:message code="equip.ps08" /></th>
+				<th align="center"><spring:message code="equip.ps09" /></th>
+				<th align="center"><spring:message code="equip.ps10" /></th>
+				<th align="center"><spring:message code="equip.ps11" /></th>
+				<th align="center"><spring:message code="equip.ps12" /></th>
+				<th align="center"><spring:message code="equip.ps13" /></th>
+				<th align="center"><spring:message code="equip.ps14" /></th>
+				<th align="center"><spring:message code="equip.ps15" /></th>
+				<th align="center"><spring:message code="equip.ps16" /></th>
+				<th align="center"><spring:message code="equip.ps17" /></th>
+				<th align="center"><spring:message code="equip.ps18" /></th>
+				<th align="center"><spring:message code="equip.ps90" /></th>
+				<th align="center"><spring:message code="equip.ps91" /></th>
+				<th align="center"><spring:message code="equip.ps92" /></th>
+				<th align="center"><spring:message code="equip.ps93" /></th>
+				<th align="center"><spring:message code="equip.ps94" /></th>
 			</tr>
 		</thead>
 		<c:forEach var="equipStatus" items="${equipStatusList}" varStatus="status">
 			<tr>
-				<td align="center"><c:out value="${equipStatus.GUBUN}" /></td>
-				<td align="center"><c:out value="${equipStatus.TOTAL}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS00}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS01}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS02}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS03}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS04}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS05}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS06}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS07}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS08}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS09}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS10}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS11}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS12}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS13}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS14}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS15}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS16}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS17}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS18}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS90}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS91}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS92}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS93}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS94}" /></td>
+				<td align="center"><c:out value="${equipStatus.gubun}" /></td>
+				<td align="center"><c:out value="${equipStatus.total}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps00}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps01}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps02}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps03}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps04}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps05}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps06}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps07}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps08}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps09}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps10}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps11}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps12}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps13}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps14}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps15}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps16}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps17}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps18}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps90}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps91}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps92}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps93}" /></td>
+				<td align="center"><c:out value="${equipStatus.ps94}" /></td>
 			</tr>
 		</c:forEach>
 	</table>