From 8123b512e98957d59ba0f88c9d85608027f6b495 Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Wed, 13 Apr 2022 10:10:32 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=EC=9E=91=EC=84=B1=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=951?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/sqlmapper/mappers/report/report.xml | 10 +++++-----
 .../resources/sqlmapper/mappers/report/reportFile.xml  |  2 --
 src/main/webapp/WEB-INF/jsp/report/reportAdd.jsp       |  4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/sqlmapper/mappers/report/report.xml b/src/main/resources/sqlmapper/mappers/report/report.xml
index 25cb388..8236bbb 100644
--- a/src/main/resources/sqlmapper/mappers/report/report.xml
+++ b/src/main/resources/sqlmapper/mappers/report/report.xml
@@ -149,7 +149,7 @@
 			</when>
 		</choose>
 		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''">
-					ORDER BY ${orderCol} ${orderAsc}
+					ORDER BY ${ordercol} ${orderasc}
 		</if>
 		<if test="orderCol == null or orderCol == '' or orderAsc == null or orderAsc == ''"><![CDATA[
 					ORDER BY IN_SEQ DESC
@@ -157,8 +157,8 @@
 		<![CDATA[
        			)
 	  	WHERE  
-	  		RNUM > #{firstIndex} AND  
-	  		RNUM <= #{firstIndex} + #{recordCountPerPage} 
+	  		RNUM > #{firstindex} AND
+	  		RNUM <= #{firstindex} + #{recordcountperPage}
 	  	]]>
 	</select>
 
@@ -207,8 +207,8 @@
 			)
 		]]>
 		<selectKey resultType="int" keyProperty="inSeq" order="AFTER">
-	        SELECT RPT_INFO_IN_SEQ_SEQ.CURRVAL FROM DUAL
-	    </selectKey>
+	        SELECT currval('rpt_info_in_seq') as inSeq
+		</selectKey>
 	</insert>
 
 	<update id="Report.update" parameterType="reportVO">
diff --git a/src/main/resources/sqlmapper/mappers/report/reportFile.xml b/src/main/resources/sqlmapper/mappers/report/reportFile.xml
index 03e969f..364b6fe 100644
--- a/src/main/resources/sqlmapper/mappers/report/reportFile.xml
+++ b/src/main/resources/sqlmapper/mappers/report/reportFile.xml
@@ -19,9 +19,7 @@
 	</select>
 	
 	<insert id="ReportFile.insertFileSeq">
-		<![CDATA[
 			INSERT INTO RPT_FILE_STORAGE (FS_FILE_COUNT) VALUES (1)
-		]]>
 		<selectKey resultType="int" keyProperty="fsSeq" order="AFTER">
 	        SELECT RPT_FILE_STORAGE_FS_SEQ_SEQ.CURRVAL FROM DUAL
 	    </selectKey>
diff --git a/src/main/webapp/WEB-INF/jsp/report/reportAdd.jsp b/src/main/webapp/WEB-INF/jsp/report/reportAdd.jsp
index 07af467..71187b8 100644
--- a/src/main/webapp/WEB-INF/jsp/report/reportAdd.jsp
+++ b/src/main/webapp/WEB-INF/jsp/report/reportAdd.jsp
@@ -137,8 +137,8 @@
 <script type="text/javascript" src="<c:url value='/validator.do'/>"></script>
 <validator:javascript formName="reportVO" staticJavascript="false" xhtml="true" cdata="false"/>
 <script type="text/javaScript" defer="defer">
-<!--
-$(function(){
+
+	$(function(){
 	$('#strInfodate').datepicker({ dateFormat: 'yy-mm-dd' });
 	
 	var result = "<c:out value="${submitResultMsg}"/>";