From f5f757a94cb97e0005730e4c3ee3b5b0b8316163 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 18:01:42 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84=20>=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=8B=A4=EC=A0=81=20>=20=EC=82=AC=EC=9A=A9?=
 =?UTF-8?q?=EC=8B=A4=EC=A0=81=20=EC=B6=94=EA=B0=80=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=20=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

---
 .../resources/sqlmapper/mappers/fa/equip.xml  | 45 +++++++------------
 .../webapp/WEB-INF/jsp/equip/useStateAdd.jsp  | 10 ++---
 .../WEB-INF/jsp/equip/useStateApprove.jsp     | 10 ++---
 3 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/src/main/resources/sqlmapper/mappers/fa/equip.xml b/src/main/resources/sqlmapper/mappers/fa/equip.xml
index fdda63d..a6dc9cd 100644
--- a/src/main/resources/sqlmapper/mappers/fa/equip.xml
+++ b/src/main/resources/sqlmapper/mappers/fa/equip.xml
@@ -181,43 +181,32 @@
 		  B.CODENM, B.CODE2, A.*
 		FROM
 		(
-		  SELECT
-		    *
-		  FROM
-		    H3_EQUIP_USE_STATE
-		  WHERE
-		    EU_YEAR =  #{year} AND
-		    EU_QUATER =  #{quater} AND
-		    EU_POLICE =  #{police}
+		  SELECT *
+		  FROM H3_EQUIP_USE_STATE
+		  WHERE EU_YEAR =  (#{year}||'')
+		    AND EU_QUATER =  (#{quater}||'')
+		    AND EU_POLICE =  #{police}
 		) 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
-		ORDER BY
-		  B.CODE2
+		ORDER BY B.CODE2
 	]]>
 	</select>
 	
 	<select id="Equip.getEquipUseStateInfoByCode" parameterType="hashmap" resultType="hashmap">
-		SELECT
-		    *
-		  FROM
-		    H3_EQUIP_USE_STATE
-		  WHERE
-		    EU_YEAR =  #{year} AND
-		    EU_QUATER =  #{quater} AND
-		    EU_POLICE =  #{police} AND
-		    EU_CODE = #{code}
+		SELECT *
+    FROM H3_EQUIP_USE_STATE
+    WHERE EU_YEAR =  (#{year}||'')
+      AND EU_QUATER =  (#{quater}||'')
+      AND EU_POLICE =  #{police}
+		  AND EU_CODE = #{code}
 	</select>
 	
 	<insert id="Equip.insertEquipUseState" parameterType="hashmap">
diff --git a/src/main/webapp/WEB-INF/jsp/equip/useStateAdd.jsp b/src/main/webapp/WEB-INF/jsp/equip/useStateAdd.jsp
index aa222bd..dd8c431 100644
--- a/src/main/webapp/WEB-INF/jsp/equip/useStateAdd.jsp
+++ b/src/main/webapp/WEB-INF/jsp/equip/useStateAdd.jsp
@@ -62,11 +62,11 @@
 			<tbody>
 				<c:forEach var="equip" items="${equipList}" varStatus="status">
 					<tr>
-						<td class="title text" ><c:out value="${equip.CODENM}" /></td>
-						<td class="number"><input type="text" name="<c:out value="${equip.CODE2}" />_cnt" value="<c:out value="${equip.EU_CNT}" />"></td>
-						<td class="text"><textarea rows="" cols="" name="<c:out value="${equip.CODE2}" />_detail"><c:out value="${equip.EU_DETAIL}" /></textarea></td>
-						<td class="number"><input type="text" name="<c:out value="${equip.CODE2}" />_check" value="<c:out value="${equip.EU_CHECK}" />"></td>
-						<td class="data"><input type="text" name="<c:out value="${equip.CODE2}" />_state" value="<c:out value="${equip.EU_STATE}" />"></td>
+						<td class="title text" ><c:out value="${equip.codenm}" /></td>
+						<td class="number"><input type="text" name="<c:out value="${equip.code2}" />_cnt" value="<c:out value="${equip.eu_cnt}" />"></td>
+						<td class="text"><textarea rows="" cols="" name="<c:out value="${equip.code2}" />_detail"><c:out value="${equip.eu_detail}" /></textarea></td>
+						<td class="number"><input type="text" name="<c:out value="${equip.code2}" />_check" value="<c:out value="${equip.eu_check}" />"></td>
+						<td class="data"><input type="text" name="<c:out value="${equip.code2}" />_state" value="<c:out value="${equip.eu_state}" />"></td>
 					</tr>
 				</c:forEach>
 			</tbody>
diff --git a/src/main/webapp/WEB-INF/jsp/equip/useStateApprove.jsp b/src/main/webapp/WEB-INF/jsp/equip/useStateApprove.jsp
index e131cdf..590a1c1 100644
--- a/src/main/webapp/WEB-INF/jsp/equip/useStateApprove.jsp
+++ b/src/main/webapp/WEB-INF/jsp/equip/useStateApprove.jsp
@@ -43,11 +43,11 @@
 			<c:when test="${fn:length(useStateList) > 0}">
 			<c:forEach var="result" items="${useStateList}" varStatus="status">
 				<tr>
-					<td align="center"><c:out value="${result.CODENM}" /></td>
-					<td align="center"><c:out value="${result.EU_CNT}" /></td>
-					<td align="center"><c:out value="${empty fn:trim(result.EU_DETAIL) ? '해당사항 없음.' : result.EU_DETAIL}" /></td>
-					<td align="center"><c:out value="${result.EU_CHECK}" /></td>
-					<td align="center"><c:out value="${empty fn:trim(result.EU_STATE) ? '-' : result.EU_STATE}" /></td>
+					<td align="center"><c:out value="${result.codenm}" /></td>
+					<td align="center"><c:out value="${result.eu_cnt}" /></td>
+					<td align="center"><c:out value="${empty fn:trim(result.eu_detail) ? '해당사항 없음.' : result.eu_detail}" /></td>
+					<td align="center"><c:out value="${result.eu_check}" /></td>
+					<td align="center"><c:out value="${empty fn:trim(result.eu_state) ? '-' : result.eu_state}" /></td>
 				</tr>
 			</c:forEach>
 			</c:when>