From 12e5867ff9af6a6c2bd00cb54299804ef0ea6426 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: Wed, 20 Apr 2022 09:57:29 +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=EC=9E=AC=EB=93=B1?=
 =?UTF-8?q?=EB=A1=9D=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

---
 .../service/impl/EquipmentServiceImpl.java    |  2 +-
 .../resources/sqlmapper/mappers/fa/equip.xml  | 57 ++++++++-----------
 2 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/src/main/java/kcg/faics/equip/service/impl/EquipmentServiceImpl.java b/src/main/java/kcg/faics/equip/service/impl/EquipmentServiceImpl.java
index 07c81bd..41167cb 100644
--- a/src/main/java/kcg/faics/equip/service/impl/EquipmentServiceImpl.java
+++ b/src/main/java/kcg/faics/equip/service/impl/EquipmentServiceImpl.java
@@ -170,7 +170,7 @@ public class EquipmentServiceImpl implements EquipmentService {
 		while (it.hasNext()) {
 			HashMap<String, Object> value = paramMap.get(it.next());
 			HashMap<String, Object> record = equipmentMapper.getEquipUseStateInfoByCode(value);
-			boolean isInsert = (record == null) ? true : false;
+			boolean isInsert = record == null;
 			
 			if (isInsert) {
 				success = equipmentMapper.insertEquipUseState(value);
diff --git a/src/main/resources/sqlmapper/mappers/fa/equip.xml b/src/main/resources/sqlmapper/mappers/fa/equip.xml
index a6dc9cd..6b1ade2 100644
--- a/src/main/resources/sqlmapper/mappers/fa/equip.xml
+++ b/src/main/resources/sqlmapper/mappers/fa/equip.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="Equip">
 
-	<resultMap id="resultMap" type="hashmap">
-	    <result property="EU_DETAIL" column="EU_DETAIL" jdbcType="CLOB" javaType="java.lang.String" />
-	</resultMap>
-
 	<resultMap id="useStateResult" type="useStateVO">
 		<result property="police" column="EU_POLICE" />
 		<result property="policeStr" column="EU_POLICE_NM" />
@@ -175,27 +171,23 @@
 	]]>
 	</select>
 	
-	<select id="Equip.getEquipUseStateInfo" parameterType="equipSearchVO" resultMap="resultMap">
+	<select id="Equip.getEquipUseStateInfo" parameterType="equipSearchVO" resultType="hashmap">
 	<![CDATA[
-		SELECT
-		  B.CODENM, B.CODE2, A.*
-		FROM
-		(
-		  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
-		) B
-		ON A.EU_CODE = B.CODE2
+		SELECT B.CODENM,
+		       B.CODE2,
+		       A.*
+		FROM (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 ) B
+		        ON A.EU_CODE = B.CODE2
 		ORDER BY B.CODE2
 	]]>
 	</select>
@@ -223,14 +215,15 @@
 	</insert>
 	
 	<update id="Equip.updateEquipUseState" parameterType="hashmap">
-		UPDATE 
-			H3_EQUIP_USE_STATE 
-		SET 
-			EU_CNT = #{cnt}, EU_DETAIL = #{detail},
-			EU_STATE = #{state}, EU_CHECK = #{check}
-		WHERE
-			EU_POLICE = #{police} AND EU_YEAR = #{year} AND
-			EU_QUATER = #{quater} AND EU_CODE = #{code}
+		UPDATE H3_EQUIP_USE_STATE
+		SET EU_CNT = #{cnt},
+		    EU_DETAIL = #{detail},
+			  EU_STATE = #{state},
+		    EU_CHECK = #{check}
+		WHERE EU_POLICE = #{police}
+      AND EU_YEAR =  (#{year}||'')
+      AND EU_QUATER =  (#{quater}||'')
+		  AND EU_CODE = #{code}
 	</update>
 	
 	<!-- 사용실적 결재 -->