From 6de7268f18bc311f83b34ae22af97f3d6e1b4757 Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Wed, 13 Apr 2022 11:31:57 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=EC=9E=91=EC=84=B1,=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=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/report/report.xml | 15 +++++++++++----
 src/main/webapp/WEB-INF/jsp/report/myList.jsp     |  1 -
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/sqlmapper/mappers/report/report.xml b/src/main/resources/sqlmapper/mappers/report/report.xml
index d32f2c4..5f1a757 100644
--- a/src/main/resources/sqlmapper/mappers/report/report.xml
+++ b/src/main/resources/sqlmapper/mappers/report/report.xml
@@ -120,10 +120,17 @@
 		        (SELECT USE_YN FROM Rpt_Category WHERE TYPE = 4 AND CODE = T.IN_CATEGORY4) AS inUseCategory4,
                 
 		        (IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
-		        (CASE WHEN IN_REPORT = 0 AND IN_REPORT1 = 0 AND IN_REPORT2 = 0 THEN '-'
-		        	  WHEN IN_REPORT2 > 0 THEN '상보(' || (SELECT CODENM FROM TCODE WHERE CODE1 = 'DC05' AND CODE2 = IN_JUDGE3) || ')'
-		        	  ELSE '상보' END) AS fullReportStr,
-				T.*
+		        (CASE WHEN IN_REPORT = 0
+		                       AND IN_REPORT1 = 0
+		                       AND IN_REPORT2 = 0
+		              THEN '-'
+		        	  WHEN IN_REPORT2 > 0
+		        		THEN '상보(' ||
+		        	 	     (SELECT CODENM
+		        	 	     FROM TCODE
+		        	 	     WHERE CODE1 = 'DC05'
+						  	 AND cast(CODE2 as integer) = in_judge3)|| ')'
+		        	  	ELSE '상보' END) AS fullReportStr,T.*
 			FROM
 				RPT_INFO T
 			WHERE
diff --git a/src/main/webapp/WEB-INF/jsp/report/myList.jsp b/src/main/webapp/WEB-INF/jsp/report/myList.jsp
index e19fb07..cacd405 100644
--- a/src/main/webapp/WEB-INF/jsp/report/myList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/report/myList.jsp
@@ -161,7 +161,6 @@
 </div>
 
 <script type="text/javascript">
-<!--
 	$(document).ready(function(){
 		//날짜 설정
 		$('input[id^="date"]').datepicker({dateFormat: 'yy-mm-dd'});

From 66172bfc7479a6382f6ed6e31bce49961b9cf4e1 Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Wed, 13 Apr 2022 17:47:39 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=EA=B2=80=EC=83=89=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmapper/mappers/report/report.xml       | 887 ++++++++++--------
 1 file changed, 489 insertions(+), 398 deletions(-)

diff --git a/src/main/resources/sqlmapper/mappers/report/report.xml b/src/main/resources/sqlmapper/mappers/report/report.xml
index 5f1a757..7ef78fb 100644
--- a/src/main/resources/sqlmapper/mappers/report/report.xml
+++ b/src/main/resources/sqlmapper/mappers/report/report.xml
@@ -101,11 +101,11 @@
 	
 	<select id="Report.selectPlaceNum" parameterType="reportVO" resultType="int">
 			SELECT 
-			  COALESCE(MAX(in_place_num), 0) + 1 AS inPlaceNum
+			  	COALESCE(MAX(in_place_num), 0) + 1 AS inPlaceNum
 			FROM 
-			  RPT_INFO 
+			  	RPT_INFO
 			WHERE 
-			  IN_PLACE_CODE = #{inPlaceCode}
+			  	IN_PLACE_CODE = #{inPlaceCode}
 	</select>
 	
 	<select id="Report.select" parameterType="reportVO" resultMap="reportMap">
@@ -158,19 +158,19 @@
 		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''">
 					ORDER BY ${ordercol} ${orderasc}
 		</if>
-		<if test="orderCol == null or orderCol == '' or orderAsc == null or orderAsc == ''"><![CDATA[
+		<if test="orderCol == null or orderCol == '' or orderAsc == null or orderAsc == ''">
 					ORDER BY IN_SEQ DESC
-		]]></if>
-		<![CDATA[
+		</if>
+		 
        			)
 	  	WHERE  
-	  		RNUM > #{firstindex} AND
-	  		RNUM <= #{firstindex} + #{recordcountperPage}
-	  	]]>
+	  		RNUM &gt; #{firstindex} AND
+	  		RNUM &lt;= #{firstindex} + #{recordcountperPage}
+	  	 
 	</select>
 
 	<select id="Report.selectSaveListCnt" parameterType="reportSearchVO" resultType="int">
-	<![CDATA[
+	 
 		SELECT
 			COUNT(*)
 		FROM
@@ -178,48 +178,114 @@
 		WHERE
 			IN_STATE_CODE = '99' AND
        		IN_TYPE = #{type} AND
-	]]>
+	 
 	<choose>
-		<when test="type != null and type.equals(1)"><![CDATA[
+		<when test="type != null and type.equals(1)"> 
 			IN_USERID = #{userid}
-		]]></when>
-		<when test="type == null or type != 1"><![CDATA[
+		 </when>
+		<when test="type == null or type != 1"> 
 			IN_USERID IN (#{userid}, '''' || #{usegrade} || '''')
-		]]></when>
+		 </when>
 	</choose>
 	</select>
 
 	<insert id="Report.insert" parameterType="reportVO">
-		<![CDATA[
+		 
 			INSERT INTO RPT_INFO (
-				in_agency_code, in_place_code, in_place_name, in_place_num,
-				in_category1, in_category2, in_category3, in_category4,
-				in_memo, in_subject, in_type, in_place1, in_place2,
-				in_position, in_name, in_userid, in_ip, in_fsseq,
+				in_agency_code,
+			  	in_place_code,
+			    in_place_name,
+				in_place_num,
+				in_category1,
+			    in_category2,
+			    in_category3,
+			    in_category4,
+				in_memo,
+			    in_subject,
+			    in_type,
+			    in_place1,
+			    in_place2,
+				in_position,
+				in_name,
+				in_userid,
+				in_ip,
+				in_fsseq,
 				in_infodate,
-				in_info_year, in_info_month, in_info_day, in_regdate,
-				in_state_code, in_content, in_auto_remove, in_offline_type, in_offline_userid,
-				in_report, in_report1, in_report2, in_report3, in_report4, in_report5, in_report6,
-				in_judge, in_judge1, in_judge2, in_judge3, in_judge4, in_judge5, in_judge6
+				in_info_year,
+				in_info_month,
+				in_info_day,
+				in_regdate,
+				in_state_code,
+			    in_content,
+			  	in_auto_remove,
+			  	in_offline_type,
+			  	in_offline_userid,
+				in_report,
+				in_report1,
+				in_report2,
+				in_report3,
+				in_report4,
+				in_report5,
+				in_report6,
+				in_judge,
+				in_judge1,
+				in_judge2,
+				in_judge3,
+				in_judge4,
+				in_judge5,
+				in_judge6
 			) VALUES (
-				#{inAgencyCode}, #{inPlaceCode}, #{inPlaceName}, #{inPlaceNum},
-				#{inCategory1}, #{inCategory2}, #{inCategory3}, #{inCategory4},
-				#{inMemo}, #{inSubject}, #{inType}, #{inPlace1}, #{inPlace2},
-				#{inPosition}, #{inName}, #{inUserid}, #{inIp}, #{inFsseq},
+				#{inAgencyCode},
+				#{inPlaceCode},
+				#{inPlaceName},
+				#{inPlaceNum},
+				#{inCategory1},
+				#{inCategory2},
+				#{inCategory3},
+				#{inCategory4},
+				#{inMemo},
+				#{inSubject},
+				#{inType},
+				#{inPlace1},
+				#{inPlace2},
+				#{inPosition},
+				#{inName},
+				#{inUserid},
+				#{inIp},
+				#{inFsseq},
 				TO_DATE(#{inInfoYear} || '/' || #{inInfoMonth} || '/' || #{inInfoDay}, 'YY/MM/DD'),
-				#{inInfoYear}, #{inInfoMonth}, #{inInfoDay}, NOW(),
-				#{inStateCode}, #{inContent}, #{inAutoRemove}, #{inOfflineType}, #{inOfflineUserid},
-				#{inReport}, #{inReport1}, #{inReport2}, #{inReport3}, #{inReport4}, #{inReport5}, #{inReport6},
-				#{inJudge}, #{inJudge1}, #{inJudge2}, #{inJudge3}, #{inJudge4}, #{inJudge5}, #{inJudge6}
+				#{inInfoYear},
+				#{inInfoMonth},
+				#{inInfoDay},
+				NOW(),
+				#{inStateCode},
+				#{inContent},
+				#{inAutoRemove},
+				#{inOfflineType},
+				#{inOfflineUserid},
+				#{inReport},
+				#{inReport1},
+				#{inReport2},
+				#{inReport3},
+				#{inReport4},
+				#{inReport5},
+				#{inReport6},
+				#{inJudge},
+				#{inJudge1},
+				#{inJudge2},
+				#{inJudge3},
+				#{inJudge4},
+				#{inJudge5},
+				#{inJudge6}
 			)
-		]]>
+		 
 		<selectKey resultType="int" keyProperty="inSeq" order="AFTER">
 	        SELECT currval('rpt_info_in_seq') as inSeq
 		</selectKey>
 	</insert>
 
 	<update id="Report.update" parameterType="reportVO">
-	<![CDATA[
+	 
 		UPDATE
 			RPT_INFO
 		SET
@@ -271,36 +337,37 @@
 			in_juseq3_head = #{inJuseq3Head}
 		WHERE
 			in_seq = #{inSeq}
-	]]>
+	 
 	</update>
 
 	<delete id="Report.delete" parameterType="reportVO">
-	<![CDATA[
+	 
 		DELETE
 		FROM
 			RPT_INFO
 		WHERE
 			in_seq = #{inSeq}
-	]]>
+	 
 	</delete>
 
 	<!-- 자동삭제 -->
 	<select id="Report.selectAutoRemoveList" resultType="String">
-		<![CDATA[
+		 
 			SELECT
 				LISTAGG(IN_SEQ, ',') WITHIN GROUP (ORDER BY IN_SEQ) AS RESULT
 			FROM
 				RPT_INFO
 			WHERE
-				IN_REGDATE <= NOW() + interval '-3 month' AND
+				IN_REGDATE &lt;= NOW() + interval '-3 month'
+			AND
 				IN_AUTO_REMOVE = 1
-		]]>
+		 
 	</select>
 
 	<!-- 검색 -->
 
 	<select id="Report.selectListAll" parameterType="reportSearchVO" resultMap="reportMap">
-		<![CDATA[
+		 
 		/*Report.selectListAll*/
 		SELECT
 			ALL_LIST.*,
@@ -310,7 +377,7 @@
 	        (SELECT NAME FROM Rpt_Category WHERE TYPE = 4 AND CODE = ALL_LIST.IN_CATEGORY4) AS inCategory4Str,
 	        (ALL_LIST.IN_PLACE_NAME || '외사-' || ALL_LIST.IN_PLACE_NUM) AS docNo,
 	        (CASE WHEN IN_REPORT = 0 AND IN_REPORT1 = 0 AND IN_REPORT2 = 0 THEN '-'
-	        	  WHEN IN_REPORT2 > 0 THEN '상보(' || (SELECT CODENM FROM TCODE WHERE CODE1 = 'DC05' AND CODE2 = IN_JUDGE3) || ')'
+	        	  WHEN IN_REPORT2 > 0 THEN '상보(' || (SELECT CODENM FROM TCODE WHERE CODE1 = 'DC05' AND cast(CODE2 as integer) = in_judge3)|| ')'
 	        	  ELSE '상보' END) AS fullReportStr,
 	    	(CASE
 	    		WHEN judge = 1 THEN '특보' WHEN judge = 2 THEN '판단' WHEN judge = 3 THEN '중보' WHEN judge = 4 THEN '통보'
@@ -320,77 +387,82 @@
        		(
 				SELECT
 					RPT.*,
-			]]>
+			 
 		    <choose>
-				<when test="myGroupCode.equals(3)"><![CDATA[
+				<when test="myGroupCode.equals(3)"> 
 					(CASE
 						WHEN IN_JUDGE3 > 0 THEN IN_JUDGE3
 						WHEN IN_JUDGE2 > 0 THEN IN_JUDGE2
 						WHEN IN_JUDGE1 > 0 THEN IN_JUDGE1
 						ELSE NULL
 					END)
-				]]></when>
-				<when test="myGroupCode.equals(2)"><![CDATA[
+				 </when>
+				<when test="myGroupCode.equals(2)"> 
 					(CASE
 						WHEN IN_JUDGE2 > 0 THEN IN_JUDGE2
 						WHEN IN_JUDGE1 > 0 THEN IN_JUDGE1
 						ELSE NULL
 					END)
-				]]></when>
-				<when test="myGroupCode.equals(1)"><![CDATA[
+				 </when>
+				<when test="myGroupCode.equals(1)"> 
 					(CASE
 						WHEN IN_JUDGE1 > 0 THEN IN_JUDGE1
 						ELSE NULL
 					END)
-				]]></when>
-				<otherwise><![CDATA[
+				 </when>
+				<otherwise> 
 					NULL
-				]]></otherwise>
+				 </otherwise>
 			</choose>
-		    <![CDATA[
+		     
 		    		AS judge
 				FROM
 					RPT_INFO RPT
 				WHERE
 					IN_COMPLETE = '1' AND
-		       		IN_STATE_CODE <> '99'
+		       		IN_STATE_CODE &lt;&gt; '99'
 
-		]]>
+		 
 			<choose>
-				<when test="myGroupCode.equals(3)">AND 3 = 3</when>
+				<when test="myGroupCode.equals(3)">
+					AND 3 = 3
+				</when>
 
-				<when test="myGroupCode.equals(2)"><![CDATA[
-				AND 2 = 2
+				<when test="myGroupCode.equals(2)"> 
+					AND 2 = 2
 					AND IN_AGENCY_CODE = #{userPlace}
-				]]></when>
+				 </when>
 
-				<when test="myGroupCode.equals(1)"><![CDATA[
-				AND 1 = 1
+				<when test="myGroupCode.equals(1)"> 
+					AND 1 = 1
 					AND IN_PLACE_CODE = #{userPlace}
-				]]></when>
+				 </when>
 
 				<otherwise></otherwise>
 			</choose>
 
-				<if test="dateStart != null and dateStart != ''"><![CDATA[
-					AND IN_INFODATE >= #{dateStart}
-				]]></if>
-				<if test="dateEnd != null and dateEnd != ''"><![CDATA[
-					AND IN_INFODATE <= #{dateEnd}
-				]]></if>
-				<if test="writeName != null and writeName != ''"><![CDATA[
+				<if test="dateStart != null and dateStart != ''"> 
+					AND IN_INFODATE &gt;= #{dateStart}::date
+				</if>
+				<if test="dateEnd != null and dateEnd != ''"> 
+					AND IN_INFODATE &lt;= #{dateEnd}::date
+				</if>
+				<if test="writeName != null and writeName != ''"> 
 					AND IN_NAME = #{writeName}
-				]]></if>
-				<if test="writeId != null and writeId != ''"><![CDATA[
+				</if>
+				<if test="writeId != null and writeId != ''"> 
 					AND IN_USERID = #{writeId}
-				]]></if>
-				<if test="subject != null and subject != ''"><![CDATA[
+				</if>
+				<if test="subject != null and subject != ''"> 
 					AND IN_SUBJECT LIKE '%'||#{subject}||'%'
-				]]></if>
-				<if test="filename != null and filename != ''"><![CDATA[
-					AND (IN_FILE1 LIKE '%'||#{filename}||'%' OR IN_FILE3 LIKE '%'||#{filename}||'%' OR IN_FILE3 LIKE '%'||#{filename}||'%'
-							 OR IN_FILE4 LIKE '%'||#{filename}||'%' OR IN_FILE5 LIKE '%'||#{filename}||'%')
-				]]></if>
+				</if>
+				<if test="filename != null and filename != ''"> 
+					AND (IN_FILE1 LIKE '%'||#{filename}||'%'
+					OR IN_FILE3 LIKE '%'||#{filename}||'%'
+					OR IN_FILE3 LIKE '%'||#{filename}||'%'
+					OR IN_FILE4 LIKE '%'||#{filename}||'%'
+					OR IN_FILE5 LIKE '%'||#{filename}||'%')
+				</if>
 
 				<if test="policeType != null and policeType.length > 0">
 					AND IN_TYPE IN
@@ -440,132 +512,147 @@
 						#{category}
 					</foreach>
 				</if>
-		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
-				ORDER BY ${orderCol} ${orderAsc}
-		]]></if>
-		<![CDATA[
+		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"> 
+				ORDER BY
+				    ${orderCol} ${orderAsc}
+		</if>
+		 
 			) ALL_LIST
-		]]>
+		 
 
 	</select>
 
 	<select id="Report.selectTotalCnt" parameterType="reportSearchVO" resultType="int">
-	<![CDATA[
+	 
 		SELECT
 			COUNT(*)
 		FROM
 			RPT_INFO
 		WHERE
 			IN_COMPLETE = '1' AND
-       		IN_STATE_CODE <> '99'
-	]]>
+       		IN_STATE_CODE  &lt;&gt;	'99'
+	 
 	<choose>
 		<when test="myGroupCode.equals(3)"></when>
 
-		<when test="myGroupCode.equals(2)"><![CDATA[
+		<when test="myGroupCode.equals(2)"> 
 			AND IN_AGENCY_CODE = #{userPlace}
-		]]></when>
+		 </when>
 
-		<when test="myGroupCode.equals(1)"><![CDATA[
+		<when test="myGroupCode.equals(1)"> 
 			AND IN_PLACE_CODE = #{userPlace}
-		]]></when>
+		 </when>
 
 		<otherwise></otherwise>
 	</choose>
 	</select>
 
 	<select id="Report.selectList" parameterType="reportSearchVO" resultMap="reportMap">
-		<![CDATA[
+		 
 		/*Report.selectList*/
         SELECT 	*
         FROM 	(
 	    	SELECT
 				ALL_LIST.*,
-				ROWNUM RNUM,
+				(row_number() over()) as RNUM,
 				(SELECT NAME FROM Rpt_Category WHERE TYPE = 1 AND CODE = ALL_LIST.IN_CATEGORY1) AS inCategory1Str,
 		        (SELECT NAME FROM Rpt_Category WHERE TYPE = 2 AND CODE = ALL_LIST.IN_CATEGORY2) AS inCategory2Str,
 		        (SELECT NAME FROM Rpt_Category WHERE TYPE = 3 AND CODE = ALL_LIST.IN_CATEGORY3) AS inCategory3Str,
 		        (SELECT NAME FROM Rpt_Category WHERE TYPE = 4 AND CODE = ALL_LIST.IN_CATEGORY4) AS inCategory4Str,
 		        (ALL_LIST.IN_PLACE_NAME || '외사-' || ALL_LIST.IN_PLACE_NUM) AS docNo,
 		        (CASE WHEN IN_REPORT = 0 AND IN_REPORT1 = 0 AND IN_REPORT2 = 0 THEN '-'
-		        	  WHEN IN_REPORT2 > 0 THEN '상보(' || (SELECT CODENM FROM TCODE WHERE CODE1 = 'DC05' AND CODE2 = IN_JUDGE3) || ')'
+		        	  WHEN IN_REPORT2 > 0 THEN '상보(' || (SELECT CODENM
+		        	  										FROM TCODE
+		        	  										WHERE CODE1 = 'DC05'
+		        	  										  AND cast(CODE2 as integer) = in_judge3)|| ')'
 		        	  ELSE '상보' END) AS fullReportStr,
 			    (CASE
-	    		WHEN judge = 1 THEN '특보' WHEN judge = 2 THEN '판단' WHEN judge = 3 THEN '중보' WHEN judge = 4 THEN '통보'
-	    		WHEN judge = 5 THEN '기록' WHEN judge = 6 THEN '조사' WHEN judge = 7 THEN '참고'
+					WHEN judge = 1
+					    THEN '특보'
+			        WHEN judge = 2
+			            THEN '판단'
+			        WHEN judge = 3
+			            THEN '중보'
+			        WHEN judge = 4
+			            THEN '통보'
+					WHEN judge = 5
+					    THEN '기록'
+			        WHEN judge = 6
+			            THEN '조사'
+			        WHEN judge = 7
+			            THEN '참고'
 	    	END) AS judgeStr
        	FROM
-       		(
-				SELECT
-					RPT.*,
-			]]>
+       		(SELECT
+				RPT.*,
+			 
 		    <choose>
-				<when test="myGroupCode.equals(3)"><![CDATA[
+				<when test="myGroupCode.equals(3)"> 
 					(CASE
-						WHEN IN_JUDGE3 > 0 THEN IN_JUDGE3
-						WHEN IN_JUDGE2 > 0 THEN IN_JUDGE2
-						WHEN IN_JUDGE1 > 0 THEN IN_JUDGE1
+						WHEN IN_JUDGE3 &gt; 0 THEN IN_JUDGE3
+						WHEN IN_JUDGE2 &gt; 0 THEN IN_JUDGE2
+						WHEN IN_JUDGE1 &gt; 0 THEN IN_JUDGE1
 						ELSE NULL
 					END)
-				]]></when>
-				<when test="myGroupCode.equals(2)"><![CDATA[
+				 </when>
+				<when test="myGroupCode.equals(2)"> 
 					(CASE
-						WHEN IN_JUDGE2 > 0 THEN IN_JUDGE2
-						WHEN IN_JUDGE1 > 0 THEN IN_JUDGE1
+						WHEN IN_JUDGE2 &gt; 0 THEN IN_JUDGE2
+						WHEN IN_JUDGE1 &gt; 0 THEN IN_JUDGE1
 						ELSE NULL
 					END)
-				]]></when>
-				<when test="myGroupCode.equals(1)"><![CDATA[
+				 </when>
+				<when test="myGroupCode.equals(1)"> 
 					(CASE
-						WHEN IN_JUDGE1 > 0 THEN IN_JUDGE1
+						WHEN IN_JUDGE1 &gt; 0 THEN IN_JUDGE1
 						ELSE NULL
 					END)
-				]]></when>
-				<otherwise><![CDATA[
+				 </when>
+				<otherwise> 
 					NULL
-				]]></otherwise>
+				 </otherwise>
 			</choose>
-		    <![CDATA[
+		     
 		    		AS judge
 				FROM
 					RPT_INFO RPT
 					WHERE
 						IN_COMPLETE = '1' AND
-			       		IN_STATE_CODE <> '99'
-		]]>
+			       		IN_STATE_CODE &lt;&gt; '99'
+		 
 				<choose>
-					<when test="myGroupCode.equals(3)"></when>
-
-					<when test="myGroupCode.equals(2)"><![CDATA[
+					<when test="myGroupCode.equals(2)"> 
 						AND IN_AGENCY_CODE = #{userPlace}
-					]]></when>
+					</when>
 
-					<when test="myGroupCode.equals(1)"><![CDATA[
+					<when test="myGroupCode.equals(1)"> 
 						AND IN_PLACE_CODE = #{userPlace}
-					]]></when>
+					</when>
 
-					<otherwise></otherwise>
 				</choose>
 
-					<if test="dateStart != null and dateStart != ''"><![CDATA[
-						AND IN_INFODATE >= #{dateStart}
-					]]></if>
-					<if test="dateEnd != null and dateEnd != ''"><![CDATA[
-						AND IN_INFODATE <= #{dateEnd}
-					]]></if>
-					<if test="writeName != null and writeName != ''"><![CDATA[
+					<if test="dateStart != null and dateStart != ''"> 
+						AND IN_INFODATE &gt;= #{dateStart}::date
+					</if>
+					<if test="dateEnd != null and dateEnd != ''"> 
+						AND IN_INFODATE &lt;= #{dateEnd}::date
+					</if>
+					<if test="writeName != null and writeName != ''"> 
 						AND IN_NAME = #{writeName}
-					]]></if>
-					<if test="writeId != null and writeId != ''"><![CDATA[
+					</if>
+					<if test="writeId != null and writeId != ''"> 
 						AND IN_USERID = #{writeId}
-					]]></if>
-					<if test="subject != null and subject != ''"><![CDATA[
+					</if>
+					<if test="subject != null and subject != ''"> 
 						AND IN_SUBJECT LIKE '%'||#{subject}||'%'
-					]]></if>
-					<if test="filename != null and filename != ''"><![CDATA[
-						AND (IN_FILE1 LIKE '%'||#{filename}||'%' OR IN_FILE3 LIKE '%'||#{filename}||'%' OR IN_FILE3 LIKE '%'||#{filename}||'%'
-								 OR IN_FILE4 LIKE '%'||#{filename}||'%' OR IN_FILE5 LIKE '%'||#{filename}||'%')
-					]]></if>
+					</if>
+					<if test="filename != null and filename != ''"> 
+						AND (IN_FILE1 LIKE '%'||#{filename}||'%'
+							OR IN_FILE3 LIKE '%'||#{filename}||'%'
+							OR IN_FILE3 LIKE '%'||#{filename}||'%'
+							OR IN_FILE4 LIKE '%'||#{filename}||'%'
+							OR IN_FILE5 LIKE '%'||#{filename}||'%')
+					</if>
 
 					<if test="policeType != null and policeType.length > 0">
 						AND IN_TYPE IN
@@ -615,61 +702,63 @@
 							#{category}
 						</foreach>
 					</if>
-		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
+		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"> 
 					ORDER BY ${orderCol} ${orderAsc}
-		]]></if>
-		<![CDATA[
+		 </if>
+		 
 				) ALL_LIST
-			)
+			) as sl
 	  	WHERE
-	  		RNUM > #{firstIndex} AND
-	  		RNUM <= #{firstIndex} + #{recordCountPerPage}
-	  	]]>
+	  		RNUM &gt; #{firstIndex}
+	  	AND
+	  		RNUM &lt;= #{firstIndex} + #{recordCountPerPage}
+	  	 
 	</select>
 
 	<select id="Report.selectListCnt" parameterType="reportSearchVO" resultType="int">
-		<![CDATA[
+		 
 			SELECT
 				COUNT(*)
 			FROM
 				RPT_INFO
 			WHERE
 				IN_COMPLETE = '1' AND
-	       		IN_STATE_CODE <> '99'
-		]]>
+	       		IN_STATE_CODE &lt;&gt; '99'
+		 
 		<choose>
-			<when test="myGroupCode.equals(3)"></when>
 
-			<when test="myGroupCode.equals(2)"><![CDATA[
+			<when test="myGroupCode.equals(2)"> 
 				AND IN_AGENCY_CODE = #{userPlace}
-			]]></when>
+			</when>
 
-			<when test="myGroupCode.equals(1)"><![CDATA[
+			<when test="myGroupCode.equals(1)"> 
 				AND IN_PLACE_CODE = #{userPlace}
-			]]></when>
+			</when>
 
-			<otherwise></otherwise>
 		</choose>
 
-			<if test="dateStart != null and dateStart != ''"><![CDATA[
-				AND IN_INFODATE >= #{dateStart}
-			]]></if>
-			<if test="dateEnd != null and dateEnd != ''"><![CDATA[
-				AND IN_INFODATE <= #{dateEnd}
-			]]></if>
-			<if test="writeName != null and writeName != ''"><![CDATA[
+			<if test="dateStart != null and dateStart != ''"> 
+				AND IN_INFODATE &gt;= #{dateStart}::date
+			</if>
+			<if test="dateEnd != null and dateEnd != ''"> 
+				AND IN_INFODATE &lt;= #{dateEnd}::date
+			</if>
+			<if test="writeName != null and writeName != ''"> 
 				AND IN_NAME = #{writeName}
-			]]></if>
-			<if test="writeId != null and writeId != ''"><![CDATA[
+			</if>
+			<if test="writeId != null and writeId != ''"> 
 				AND IN_USERID = #{writeId}
-			]]></if>
-			<if test="subject != null and subject != ''"><![CDATA[
+			</if>
+			<if test="subject != null and subject != ''"> 
 				AND IN_SUBJECT LIKE '%'||#{subject}||'%'
-			]]></if>
-			<if test="filename != null and filename != ''"><![CDATA[
-				AND (IN_FILE1 LIKE '%'||#{filename}||'%' OR IN_FILE3 LIKE '%'||#{filename}||'%' OR IN_FILE3 LIKE '%'||#{filename}||'%'
-						 OR IN_FILE4 LIKE '%'||#{filename}||'%' OR IN_FILE5 LIKE '%'||#{filename}||'%')
-			]]></if>
+			</if>
+			<if test="filename != null and filename != ''"> 
+				AND (IN_FILE1 LIKE '%'||#{filename}||'%'
+					 OR IN_FILE3 LIKE '%'||#{filename}||'%'
+					 OR IN_FILE3 LIKE '%'||#{filename}||'%'
+					 OR IN_FILE4 LIKE '%'||#{filename}||'%'
+					 OR IN_FILE5 LIKE '%'||#{filename}||'%')
+			</if>
 
 			<if test="policeType != null and policeType.length > 0">
 				AND IN_TYPE IN
@@ -723,7 +812,7 @@
 
 	<!-- 결재 대기 목록 -->
 	<select id="Report.selectWaitList" parameterType="reportSearchVO"  resultMap="reportMap">
-		<![CDATA[
+		 
         SELECT 	*
         FROM 	(
 	    	SELECT
@@ -741,44 +830,44 @@
 					FROM
 						RPT_INFO
 					WHERE
-			       		IN_STATE_CODE <> '99'
-		]]>
+			       		IN_STATE_CODE &lt;&gt; '99'
+		 
 				<choose>
-					<when test="dutiesForApprove.equals(2)"><![CDATA[
+					<when test="dutiesForApprove.equals(2)"> 
 						AND (IN_STATE_CODE = #{myGroupCode}||'1' OR IN_STATE_CODE = #{myGroupCode}||'3')
-					]]></when>
-					<otherwise><![CDATA[
+					</when>
+					<otherwise> 
 						AND (IN_STATE_CODE = #{myGroupCode}||'1' OR IN_STATE_CODE = #{myGroupCode}||'2')
-					]]></otherwise>
+					</otherwise>
 				</choose>
 
 				<choose>
-					<when test="myGroupCode.equals(3)"></when>
 
-					<when test="myGroupCode.equals(2)"><![CDATA[
+					<when test="myGroupCode.equals(2)"> 
 						AND IN_AGENCY_CODE = #{userPlace}
-					]]></when>
+					</when>
 
-					<when test="myGroupCode.equals(1)"><![CDATA[
+					<when test="myGroupCode.equals(1)"> 
 						AND IN_PLACE_CODE = #{userPlace}
-					]]></when>
+					</when>
 
 					<otherwise></otherwise>
 				</choose>
 
-				<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
+				<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"> 
 					ORDER BY ${orderCol} ${orderAsc}
-				]]></if>
-		<![CDATA[
+				</if>
+		 
 				) ALL_LIST
 			)
 	  	WHERE
-	  		RNUM > #{firstIndex} AND
-	  		RNUM <= #{firstIndex} + #{recordCountPerPage}
-	  	]]>
+	  		RNUM &gt; #{firstIndex}
+	  	AND
+	  		RNUM &lt;= #{firstIndex} + #{recordCountPerPage}
+	  	 
 	</select>
 	<select id="Report.selectWaitListAll" parameterType="reportSearchVO"  resultMap="reportMap">
-		<![CDATA[
+		 
     	SELECT
 			ALL_LIST.*,
 			ROWNUM RNUM,
@@ -794,68 +883,72 @@
 				FROM
 					RPT_INFO
 				WHERE
-		       		IN_STATE_CODE <> '99'
-		       		AND (IN_STATE_CODE = #{myGroupCode}||'1' OR IN_STATE_CODE = (CASE WHEN #{duties} = '계장' THEN #{myGroupCode}||'3' ELSE #{myGroupCode}||'2' END))
-		]]>
+		       		IN_STATE_CODE &lt;&gt; '99'
+				AND (IN_STATE_CODE = #{myGroupCode}||'1'
+						 OR IN_STATE_CODE =
+							(CASE WHEN #{duties} = '계장'
+								  THEN #{myGroupCode}||'3'
+								  ELSE #{myGroupCode}||'2' END))
+
 			<choose>
-				<when test="dutiesForApprove.equals(2)"><![CDATA[
+				<when test="dutiesForApprove.equals(2)"> 
 					AND (IN_STATE_CODE = #{myGroupCode}||'1' OR IN_STATE_CODE = #{myGroupCode}||'3')
-				]]></when>
-				<otherwise><![CDATA[
+				</when>
+				<otherwise> 
 					AND (IN_STATE_CODE = #{myGroupCode}||'1' OR IN_STATE_CODE = #{myGroupCode}||'2')
-				]]></otherwise>
+				</otherwise>
 			</choose>
 
 			<choose>
 				<when test="myGroupCode.equals(3)"></when>
 
-				<when test="myGroupCode.equals(2)"><![CDATA[
+				<when test="myGroupCode.equals(2)"> 
 					AND IN_AGENCY_CODE = #{userPlace}
-				]]></when>
+				</when>
 
-				<when test="myGroupCode.equals(1)"><![CDATA[
+				<when test="myGroupCode.equals(1)"> 
 					AND IN_PLACE_CODE = #{userPlace}
-				]]></when>
+				</when>
 
-				<otherwise></otherwise>
 			</choose>
 
-			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
+			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"> 
 				ORDER BY ${orderCol} ${orderAsc}
-			]]></if>
-		<![CDATA[
+			</if>
+		 
 			) ALL_LIST
-	  	]]>
+	  	 
 	</select>
 	<select id="Report.selectWaitListCnt" parameterType="reportSearchVO"  resultType="int">
-		<![CDATA[
+		 
 		SELECT
 			Count(*)
 		FROM
 			RPT_INFO
 		WHERE
-       		IN_STATE_CODE <> '99'
-       		AND (IN_STATE_CODE = #{myGroupCode}||'1' OR IN_STATE_CODE = (CASE WHEN #{duties} = '계장' THEN #{myGroupCode}||'3' ELSE #{myGroupCode}||'2' END))
-		]]>
+       		IN_STATE_CODE &lt;&gt; '99'
+       		AND (IN_STATE_CODE = #{myGroupCode}||'1'
+       		         OR IN_STATE_CODE = (CASE WHEN #{duties} = '계장'
+											  THEN #{myGroupCode}||'3'
+											  ELSE #{myGroupCode}||'2' END))
+		 
 		<choose>
-			<when test="myGroupCode.equals(3)"></when>
 
-			<when test="myGroupCode.equals(2)"><![CDATA[
+			<when test="myGroupCode.equals(2)"> 
 				AND IN_AGENCY_CODE = #{userPlace}
-			]]></when>
+			</when>
 
-			<when test="myGroupCode.equals(1)"><![CDATA[
+			<when test="myGroupCode.equals(1)"> 
 				AND IN_PLACE_CODE = #{userPlace}
-			]]></when>
+			</when>
 
-			<otherwise></otherwise>
 		</choose>
 	</select>
 
 
 	<!-- 견문 결재 처리 목록 -->
 	<select id="Report.selectAprList" parameterType="reportSearchVO" resultMap="reportMap">
-		<![CDATA[
+		 
         SELECT 	*
         FROM 	(
 	    	SELECT
@@ -865,35 +958,38 @@
 					(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
 					I.*
 				FROM
-					RPT_INFO I INNER JOIN RPT_JUDGE_HISTORY J ON I.IN_SEQ = J.JU_INSEQ
+					RPT_INFO I
+					    INNER JOIN RPT_JUDGE_HISTORY J
+					    	ON I.IN_SEQ = J.JU_INSEQ
 				WHERE
 					IN_STATE_CODE != '99'
 					AND IN_TYPE = #{type}
 					AND JU_USERID = #{userid}
-		]]>
-			<if test="dateStart != null and dateStart != ''"><![CDATA[
-					AND IN_INFODATE >= #{dateStart}
-			]]></if>
-			<if test="dateEnd != null and dateEnd != ''"><![CDATA[
-					AND IN_INFODATE <= #{dateEnd}
-			]]></if>
-			<if test="subject != null and subject != ''"><![CDATA[
+		 
+			<if test="dateStart != null and dateStart != ''">
+					AND IN_INFODATE &gt;= #{dateStart}::date
+			</if>
+			<if test="dateEnd != null and dateEnd != ''"> 
+					AND IN_INFODATE &lt;= #{dateEnd}::date
+			</if>
+			<if test="subject != null and subject != ''"> 
 					AND IN_SUBJECT LIKE '%'||#{subject}||'%'
-			]]></if>
+			</if>
 
-			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
+			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"> 
 				ORDER BY ${orderCol} ${orderAsc}
-			]]></if>
-		<![CDATA[
+			</if>
+		 
 				) T
 			)
 	  	WHERE
-	  		RNUM > #{firstIndex} AND
-	  		RNUM <= #{firstIndex} + #{recordCountPerPage}
-	  	]]>
+	  		RNUM &gt; #{firstIndex}
+	  	  AND
+	  		RNUM &lt;= #{firstIndex} + #{recordCountPerPage}
+	  	 
 	</select>
 	<select id="Report.selectAprListCnt" parameterType="reportSearchVO" resultType="int">
-		<![CDATA[
+		 
         SELECT
 			COUNT(*)
 		FROM
@@ -902,19 +998,19 @@
 			IN_STATE_CODE != '99'
 			AND IN_TYPE = #{type}
 			AND JU_USERID = #{userid}
-		]]>
-		<if test="dateStart != null and dateStart != ''"><![CDATA[
-				AND IN_INFODATE >= #{dateStart}
-		]]></if>
-		<if test="dateEnd != null and dateEnd != ''"><![CDATA[
-				AND IN_INFODATE <= #{dateEnd}
-		]]></if>
-		<if test="subject != null and subject != ''"><![CDATA[
+		 
+		<if test="dateStart != null and dateStart != ''"> 
+				AND IN_INFODATE &gt;= #{dateStart}::date
+		</if>
+		<if test="dateEnd != null and dateEnd != ''"> 
+				AND IN_INFODATE &lt;= #{dateEnd}::date
+		</if>
+		<if test="subject != null and subject != ''"> 
 				AND IN_SUBJECT LIKE '%'||#{subject}||'%'
-		]]></if>
+		</if>
 	</select>
 	<select id="Report.selectAprListAll" parameterType="reportSearchVO" resultMap="reportMap">
-		<![CDATA[
+		 
        	SELECT
     		(ROW_NUMBER() OVER()) AS RNUM, T.*
 		FROM
@@ -927,23 +1023,23 @@
 				IN_STATE_CODE != '99'
 				AND IN_TYPE = #{type}
 				AND JU_USERID = #{userid}
-		]]>
-			<if test="dateStart != null and dateStart != ''"><![CDATA[
-				AND IN_INFODATE >= #{dateStart}
-			]]></if>
-			<if test="dateEnd != null and dateEnd != ''"><![CDATA[
-				AND IN_INFODATE <= #{dateEnd}
-			]]></if>
-			<if test="subject != null and subject != ''"><![CDATA[
+		 
+			<if test="dateStart != null and dateStart != ''"> 
+				AND IN_INFODATE &gt;= #{dateStart}::date
+			</if>
+			<if test="dateEnd != null and dateEnd != ''"> 
+				AND IN_INFODATE &lt;= #{dateEnd}::date
+			</if>
+			<if test="subject != null and subject != ''"> 
 				AND IN_SUBJECT LIKE '%'||#{subject}||'%'
-			]]></if>
+			</if>
 
-		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
+		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"> 
 			ORDER BY ${orderCol} ${orderAsc}
-		]]></if>
-		<![CDATA[
+		</if>
+		 
 				) T
-	  	]]>
+	  	 
 	</select>
 
 
@@ -956,6 +1052,7 @@
             cat4.name AS inCategory4Str,
             a.*
     from (
+
       select
         (IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
         RPT.*
@@ -971,10 +1068,10 @@
           <when test="type == null or type != '1'">
             AND IN_USERID IN (#{userid}, '''' || #{usegrade} || '''')
           </when>
-        </choose>
+	</choose>
 
         <if test="dateStart != null and dateStart != ''">
-            AND IN_INFODATE >= #{dateStart}::date
+            AND IN_INFODATE &gt;= #{dateStart}::date
         </if>
         <if test="dateEnd != null and dateEnd != ''">
             AND IN_INFODATE &lt;= #{dateEnd}::date
@@ -994,7 +1091,7 @@
       inner join Rpt_Category CAT4 on CAT4.type = 4 and cat4.code =  a.IN_CATEGORY4
   </select>
 	<select id="Report.selectMyListCnt" parameterType="reportSearchVO" resultType="int">
-		<![CDATA[
+		 
         SELECT
 			COUNT(*)
 		FROM
@@ -1002,28 +1099,28 @@
 		WHERE
 			IN_STATE_CODE != '99'
 			AND IN_TYPE = #{type}
-		]]>
+		 
 		<choose>
-			<when test="type != null and type.equals(1)"><![CDATA[
+			<when test="type != null and type.equals(1)"> 
 				AND IN_USERID = #{userid}
-			]]></when>
-			<when test="type == null or type != 1"><![CDATA[
+			</when>
+			<when test="type == null or type != 1"> 
 				AND IN_USERID IN (#{userid}, '''' || #{usegrade} || '''')
-			]]></when>
+			</when>
 		</choose>
 
-		<if test="dateStart != null and dateStart != ''"><![CDATA[
-				AND IN_INFODATE >=  #{dateStart}
-		]]></if>
-		<if test="dateEnd != null and dateEnd != ''"><![CDATA[
-				AND IN_INFODATE <= #{dateEnd}
-		]]></if>
-		<if test="subject != null and subject != ''"><![CDATA[
+		<if test="dateStart != null and dateStart != ''">
+				AND IN_INFODATE &gt;=  #{dateStart}::date
+		</if>
+		<if test="dateEnd != null and dateEnd != ''">
+				AND IN_INFODATE &lt;= #{dateEnd}::date
+		</if>
+		<if test="subject != null and subject != ''"> 
 				AND IN_SUBJECT LIKE '%'||#{subject}||'%'
-		]]></if>
+		</if>
 	</select>
 	<select id="Report.selectMyListAll" parameterType="reportSearchVO" resultMap="reportMap">
-		<![CDATA[
+		 
        	SELECT
     		(ROW_NUMBER() OVER()) AS RNUM, T.*
 		FROM
@@ -1039,37 +1136,37 @@
 			WHERE
 				IN_STATE_CODE != '99'
 				AND IN_TYPE = #{type}
-		]]>
+		 
 			<choose>
-				<when test="type != null and type.equals(1)"><![CDATA[
+				<when test="type != null and type.equals(1)"> 
 					AND IN_USERID = #{userid}
-				]]></when>
-				<when test="type == null or type != 1"><![CDATA[
+				</when>
+				<when test="type == null or type != 1"> 
 					AND IN_USERID IN (#{userid}, '''' || #{usegrade} || '''')
-				]]></when>
+				</when>
 			</choose>
 
-			<if test="dateStart != null and dateStart != ''"><![CDATA[
-				AND IN_INFODATE >= #{dateStart}
-			]]></if>
-			<if test="dateEnd != null and dateEnd != ''"><![CDATA[
-				AND IN_INFODATE <= #{dateEnd}
-			]]></if>
-			<if test="subject != null and subject != ''"><![CDATA[
+			<if test="dateStart != null and dateStart != ''"> 
+				AND IN_INFODATE &gt;= #{dateStart}::date
+			</if>
+			<if test="dateEnd != null and dateEnd != ''"> 
+				AND IN_INFODATE &lt;= #{dateEnd}::date
+			</if>
+			<if test="subject != null and subject != ''"> 
 				AND IN_SUBJECT LIKE '%'||#{subject}||'%'
-			]]></if>
+			</if>
 
-		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
+		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"> 
 			ORDER BY ${orderCol} ${orderAsc}
-		]]></if>
-		<![CDATA[
+		</if>
+		 
 				) T
-	  	]]>
+	  	 
 	</select>
 
 	<!-- 견문 제출 현황 -->
 	<select id="Report.selectPresentList" parameterType="reportSearchVO" resultMap="reportMap">
-		<![CDATA[
+		 
         SELECT 	*
         FROM 	(
 	    	SELECT
@@ -1086,77 +1183,73 @@
 					RPT_INFO I
 				WHERE
 					IN_STATE_CODE != '99'
-		]]>
+		 
 			<choose>
-				<when test="myGroupCode.equals(3)"></when>
-				<when test="myGroupCode.equals(2)"><![CDATA[
+				<when test="myGroupCode.equals(2)">
 					AND IN_AGENCY_CODE = #{userPlace}
-				]]></when>
-				<when test="myGroupCode.equals(1)"><![CDATA[
+				</when>
+				<when test="myGroupCode.equals(1)"> 
 					AND IN_PLACE_CODE = #{userPlace}
-				]]></when>
-				<otherwise></otherwise>
+				</when>
 			</choose>
 
-			<if test="dateStart != null and dateStart != ''"><![CDATA[
-					AND IN_INFODATE >= #{dateStart}
-			]]></if>
-			<if test="dateEnd != null and dateEnd != ''"><![CDATA[
-					AND IN_INFODATE <= #{dateEnd}
-			]]></if>
-			<if test="subject != null and subject != ''"><![CDATA[
+			<if test="dateStart != null and dateStart != ''"> 
+					AND IN_INFODATE &gt;= #{dateStart}::date
+			</if>
+			<if test="dateEnd != null and dateEnd != ''"> 
+					AND IN_INFODATE &lt;= #{dateEnd}::date
+			</if>
+			<if test="subject != null and subject != ''"> 
 					AND IN_SUBJECT LIKE '%'||#{subject}||'%'
-			]]></if>
-			<if test="writeName != null and writeName != ''"><![CDATA[
+			</if>
+			<if test="writeName != null and writeName != ''"> 
 				AND IN_NAME LIKE '%'||#{writeName}||'%'
-			]]></if>
+			</if>
 
-			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
+			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"> 
 				ORDER BY ${orderCol} ${orderAsc}
-			]]></if>
-		<![CDATA[
+			</if>
+		 
 				) T
 			)
 	  	WHERE
 	  		RNUM > #{firstIndex} AND
-	  		RNUM <= #{firstIndex} + #{recordCountPerPage}
-	  	]]>
+	  		RNUM &lt;= #{firstIndex} + #{recordCountPerPage}
+	  	 
 	</select>
 	<select id="Report.selectPresentListCnt" parameterType="reportSearchVO" resultType="int">
-		<![CDATA[
+		 
 		SELECT
 			COUNT(*)
 		FROM
 			RPT_INFO I
 		WHERE
 			IN_STATE_CODE != '99'
-		]]>
+		 
 		<choose>
-			<when test="myGroupCode.equals(3)"></when>
-			<when test="myGroupCode.equals(2)"><![CDATA[
+			<when test="myGroupCode.equals(2)">
 				AND IN_AGENCY_CODE = #{userPlace}
-			]]></when>
-			<when test="myGroupCode.equals(1)"><![CDATA[
+			</when>
+			<when test="myGroupCode.equals(1)"> 
 				AND IN_PLACE_CODE = #{userPlace}
-			]]></when>
-			<otherwise></otherwise>
+			</when>
 		</choose>
 
-		<if test="dateStart != null and dateStart != ''"><![CDATA[
-			AND IN_INFODATE >= #{dateStart}
-		]]></if>
-		<if test="dateEnd != null and dateEnd != ''"><![CDATA[
-			AND IN_INFODATE <= #{dateEnd}
-		]]></if>
-		<if test="subject != null and subject != ''"><![CDATA[
+		<if test="dateStart != null and dateStart != ''"> 
+			AND IN_INFODATE &gt;= #{dateStart}::date
+		</if>
+		<if test="dateEnd != null and dateEnd != ''"> 
+			AND IN_INFODATE &lt;= #{dateEnd}::date
+		</if>
+		<if test="subject != null and subject != ''"> 
 			AND IN_SUBJECT LIKE '%'||#{subject}||'%'
-		]]></if>
-		<if test="writeName != null and writeName != ''"><![CDATA[
+		</if>
+		<if test="writeName != null and writeName != ''"> 
 			AND IN_NAME LIKE '%'||#{writeName}||'%'
-		]]></if>
+		</if>
 	</select>
 	<select id="Report.selectPresentListAll" parameterType="reportSearchVO" resultMap="reportMap">
-		<![CDATA[
+		 
 
     	SELECT
     		*
@@ -1172,43 +1265,41 @@
 				RPT_INFO I
 			WHERE
 				IN_STATE_CODE != '99'
-		]]>
+		 
 			<choose>
-				<when test="myGroupCode.equals(3)"></when>
-				<when test="myGroupCode.equals(2)"><![CDATA[
+				<when test="myGroupCode.equals(2)">
 					AND IN_AGENCY_CODE = #{userPlace}
-				]]></when>
-				<when test="myGroupCode.equals(1)"><![CDATA[
+				</when>
+				<when test="myGroupCode.equals(1)"> 
 					AND IN_PLACE_CODE = #{userPlace}
-				]]></when>
-				<otherwise></otherwise>
+				</when>
 			</choose>
 
-			<if test="dateStart != null and dateStart != ''"><![CDATA[
-				AND IN_INFODATE >= #{dateStart}
-			]]></if>
-			<if test="dateEnd != null and dateEnd != ''"><![CDATA[
-				AND IN_INFODATE <= #{dateEnd}
-			]]></if>
-			<if test="subject != null and subject != ''"><![CDATA[
+			<if test="dateStart != null and dateStart != ''"> 
+				AND IN_INFODATE &gt;= #{dateStart}::date
+			</if>
+			<if test="dateEnd != null and dateEnd != ''"> 
+				AND IN_INFODATE &lt;= #{dateEnd}::date
+			 </if>
+			<if test="subject != null and subject != ''"> 
 				AND IN_SUBJECT LIKE '%'||#{subject}||'%'
-			]]></if>
-			<if test="writeName != null and writeName != ''"><![CDATA[
+			</if>
+			<if test="writeName != null and writeName != ''"> 
 				AND IN_NAME LIKE '%'||#{writeName}||'%'
-			]]></if>
+			</if>
 
-			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
+			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"> 
 				ORDER BY ${orderCol} ${orderAsc}
-			]]></if>
-		<![CDATA[
+			</if>
+		 
 			)
-	  	]]>
+	  	 
 	</select>
 
 
 	<!-- 평가기록부 -->
 	<select id="Report.selectRecordList" parameterType="reportSearchVO" resultMap="reportMap">
-		<![CDATA[
+		 
         SELECT 	*
         FROM 	(
 	    	SELECT
@@ -1222,33 +1313,33 @@
 				WHERE
 					IN_STATE_CODE != '99'
 					AND IN_COMPLETE = 1
-		]]>
-			<if test="dateStart != null and dateStart != ''"><![CDATA[
-					AND IN_INFODATE >= #{dateStart}
-			]]></if>
-			<if test="dateEnd != null and dateEnd != ''"><![CDATA[
-					AND IN_INFODATE <= #{dateEnd}
-			]]></if>
-			<if test="placeGroup != null and placeGroup != ''"><![CDATA[
+		 
+			<if test="dateStart != null and dateStart != ''"> 
+					AND IN_INFODATE &gt;= #{dateStart}::date
+			</if>
+			<if test="dateEnd != null and dateEnd != ''"> 
+					AND IN_INFODATE &lt;= #{dateEnd}::date
+			</if>
+			<if test="placeGroup != null and placeGroup != ''"> 
 					AND IN_PLACE_CODE = #{placeGroup}
-			]]></if>
-			<if test="placeGroup == null or placeGroup == ''"><![CDATA[
+			</if>
+			<if test="placeGroup == null or placeGroup == ''"> 
 					AND IN_PLACE_CODE = #{userPlace}
-			]]></if>
+			</if>
 
-			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
+			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"> 
 				ORDER BY ${orderCol} ${orderAsc}
-			]]></if>
-		<![CDATA[
+			</if>
+		 
 				) T
 			)
 	  	WHERE
 	  		RNUM > #{firstIndex} AND
-	  		RNUM <= #{firstIndex} + #{recordCountPerPage}
-	  	]]>
+	  		RNUM &lt;= #{firstIndex} + #{recordCountPerPage}
+	  	 
 	</select>
 	<select id="Report.selectRecordListCnt" parameterType="reportSearchVO" resultType="int">
-		<![CDATA[
+		 
        SELECT
 			COUNT(*)
 		FROM
@@ -1256,22 +1347,22 @@
 		WHERE
 			IN_STATE_CODE != '99'
 			AND IN_COMPLETE = 1
-		]]>
-		<if test="dateStart != null and dateStart != ''"><![CDATA[
-			AND IN_INFODATE >= #{dateStart}
-		]]></if>
-		<if test="dateEnd != null and dateEnd != ''"><![CDATA[
-			AND IN_INFODATE <= #{dateEnd}
-		]]></if>
-		<if test="placeGroup != null and placeGroup != ''"><![CDATA[
+		 
+		<if test="dateStart != null and dateStart != ''"> 
+			AND IN_INFODATE &gt;= #{dateStart}::date
+		</if>
+		<if test="dateEnd != null and dateEnd != ''"> 
+			AND IN_INFODATE &lt;= #{dateEnd}::date
+		</if>
+		<if test="placeGroup != null and placeGroup != ''"> 
 			AND IN_PLACE_CODE = #{placeGroup}
-		]]></if>
-		<if test="placeGroup == null or placeGroup == ''"><![CDATA[
+		</if>
+		<if test="placeGroup == null or placeGroup == ''"> 
 			AND IN_PLACE_CODE = #{userPlace}
-		]]></if>
+		</if>
 	</select>
 	<select id="Report.selectRecordListAll" parameterType="reportSearchVO" resultMap="reportMap">
-		<![CDATA[
+		 
 
     	SELECT
     		(ROW_NUMBER() OVER()) AS RNUM, T.*
@@ -1284,26 +1375,26 @@
 			WHERE
 				IN_STATE_CODE != '99'
 				AND IN_COMPLETE = 1
-		]]>
-			<if test="dateStart != null and dateStart != ''"><![CDATA[
-				AND IN_INFODATE >= #{dateStart}
-			]]></if>
-			<if test="dateEnd != null and dateEnd != ''"><![CDATA[
-				AND IN_INFODATE <= #{dateEnd}
-			]]></if>
-			<if test="placeGroup != null and placeGroup != ''"><![CDATA[
+		 
+			<if test="dateStart != null and dateStart != ''"> 
+				AND IN_INFODATE &gt;= #{dateStart}::date
+			</if>
+			<if test="dateEnd != null and dateEnd != ''"> 
+				AND IN_INFODATE &lt;= #{dateEnd}::date
+			</if>
+			<if test="placeGroup != null and placeGroup != ''"> 
 				AND IN_PLACE_CODE = #{placeGroup}
-			]]></if>
-			<if test="placeGroup == null or placeGroup == ''"><![CDATA[
+			</if>
+			<if test="placeGroup == null or placeGroup == ''"> 
 				AND IN_PLACE_CODE = #{userPlace}
-			]]></if>
+			</if>
 
-		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
+		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"> 
 			ORDER BY ${orderCol} ${orderAsc}
-		]]></if>
-		<![CDATA[
+		</if>
+		 
 			) T
-	  	]]>
+	  	 
 	</select>