diff --git a/src/main/resources/message/message-common_ko.properties b/src/main/resources/message/message-common_ko.properties
index 25054b3..381ebb3 100644
--- a/src/main/resources/message/message-common_ko.properties
+++ b/src/main/resources/message/message-common_ko.properties
@@ -579,32 +579,32 @@ fa.edu.place1=\uc18c\uc18d
 ########---equip--#########
 equip.name=\uad6c\ubd84
 equip.total=\uacc4
-equip.PS00=\uBCF8\uCCAD
-equip.PS01=\ubd80\uc0b0
-equip.PS02=\uc778\ucc9c
-equip.PS03=\uc18d\ucd08
-equip.PS04=\ub3d9\ud574
-equip.PS05=\ud0dc\uc548
-equip.PS06=\uad70\uc0b0
-equip.PS07=\ubaa9\ud3ec
-equip.PS08=\uc644\ub3c4
-equip.PS09=\uc5ec\uc218
-equip.PS10=\ud3ec\ud56d
-equip.PS11=\uc6b8\uc0b0
-equip.PS12=\ud1b5\uc601
-equip.PS13=\uc81c\uc8fc
-equip.PS14=\ud3c9\ud0dd
-equip.PS15=\ucc3d\uc6d0
-equip.PS16=\ubcf4\ub839
-equip.PS17=\uc11c\uadc0\ud3ec
-equip.PS18=\ubd80\uc548
-equip.PS19=\uc6b8\uc9c4
-equip.PS50=\uc11c\ud5745\ub3c4
-equip.PS90=\uC911\uBD80\uC9C0\uBC29\uCCAD
-equip.PS91=\uc81c\uc8fc\ubcf8\ubd80
-equip.PS92=\uc11c\ud574\ubcf8\ubd80
-equip.PS93=\ub0a8\ud574\ubcf8\ubd80
-equip.PS94=\ub3d9\ud574\ubcf8\ubd80
+equip.ps00=\uBCF8\uCCAD
+equip.ps01=\ubd80\uc0b0
+equip.ps02=\uc778\ucc9c
+equip.ps03=\uc18d\ucd08
+equip.ps04=\ub3d9\ud574
+equip.ps05=\ud0dc\uc548
+equip.ps06=\uad70\uc0b0
+equip.ps07=\ubaa9\ud3ec
+equip.ps08=\uc644\ub3c4
+equip.ps09=\uc5ec\uc218
+equip.ps10=\ud3ec\ud56d
+equip.ps11=\uc6b8\uc0b0
+equip.ps12=\ud1b5\uc601
+equip.ps13=\uc81c\uc8fc
+equip.ps14=\ud3c9\ud0dd
+equip.ps15=\ucc3d\uc6d0
+equip.ps16=\ubcf4\ub839
+equip.ps17=\uc11c\uadc0\ud3ec
+equip.ps18=\ubd80\uc548
+equip.ps19=\uc6b8\uc9c4
+equip.ps50=\uc11c\ud5745\ub3c4
+equip.ps90=\uC911\uBD80\uC9C0\uBC29\uCCAD
+equip.ps91=\uc81c\uc8fc\ubcf8\ubd80
+equip.ps92=\uc11c\ud574\ubcf8\ubd80
+equip.ps93=\ub0a8\ud574\ubcf8\ubd80
+equip.ps94=\ub3d9\ud574\ubcf8\ubd80
 
 equip.stateWaiting.year=\ub144\ub3c4
 equip.stateWaiting.division=\uad6c\ubd84
@@ -728,7 +728,7 @@ target.divmng.gubun=\uadfc\ubb34\ud615\ud0dc
 target.divmng.staffNum=\uadfc\ubb34\uc778\uc6d0
 target.divmng.tel=\uc804\ud654\ubc88\ud638
 target.divmng.condition=\ud604\ud669
-target.divmng.equipStat=\uc7a5\ube44\ud604\ud669
+target.divmng.equipstat=\uc7a5\ube44\ud604\ud669
 target.divmng.fileImg=\uc0ac\uc9c4
 target.divmng.file=\ucca8\ubd80\ud30c\uc77c
 
diff --git a/src/main/resources/sqlmapper/mappers/board/board.xml b/src/main/resources/sqlmapper/mappers/board/board.xml
index 038027f..b1d87be 100644
--- a/src/main/resources/sqlmapper/mappers/board/board.xml
+++ b/src/main/resources/sqlmapper/mappers/board/board.xml
@@ -48,22 +48,18 @@
 	</select>
 	
 	<select id="Board.selectBoardTotalCnt" parameterType="boardSearchVO" resultType="int">
-	<![CDATA[	
 		SELECT
 			COUNT(*)
 		FROM 
 			H3_BD_${id}_LIST
-	]]>
 	</select>
 	
 	<select id="Board.selectBoardListTotCnt" parameterType="boardSearchVO" resultType="int">
-	<![CDATA[	
 		SELECT
 			COUNT(*)
 		FROM 
 			H3_BD_${id}_LIST
 		WHERE 1=1
-	]]>
 			<choose>
 	            <when test='category == " " and id == "stat_bbs"'>
 				</when>
@@ -87,7 +83,6 @@
 	</select>
 	
 	<select id="Board.selectBoard" parameterType="boardVO" resultType="boardVO">
-	<![CDATA[	
 		SELECT
 			BBS.BD_SEQ AS SEQ, BBS.BD_MB_ID AS USERID, BBS.BD_GROUP_SEQ AS GROUPSEQ,
 			BBS.BD_CATEGORY AS CATEGORY, BBS.BD_NAME AS USERNAME, BBS.BD_CONTENT AS CONTENT,
@@ -101,7 +96,6 @@
 			H3_BD_${id}_LIST BBS
 		WHERE
 			BBS.BD_SEQ = #{seq}
-	]]>
 	</select>
 	
 	<insert id="Board.insertBoard" parameterType="boardVO">
@@ -135,19 +129,16 @@
 	</insert>
 	
 	<update id="Board.updateGrpSeq" parameterType="boardVO">
-	<![CDATA[
-		UPDATE 
+		UPDATE
 			H3_BD_${id}_LIST
 		SET 
 			BD_GROUP_SEQ = #{seq}
 		WHERE 
 			BD_SEQ = #{seq}
-	]]>
 	</update>
 	
 	<select id="Board.selectPrevBoard" parameterType="boardVO" resultType="boardVO">
-	<![CDATA[
-		SELECT 
+		SELECT
 			ALL_LIST.BD_SEQ AS SEQ, ALL_LIST.BD_MB_ID AS USERID, ALL_LIST.BD_GROUP_SEQ AS GROUPSEQ,
 			ALL_LIST.BD_CATEGORY AS CATEGORY, ALL_LIST.BD_NAME AS USERNAME, ALL_LIST.BD_CONTENT AS CONTENT,
 			ALL_LIST.BD_SUBJECT AS SUBJECT, ALL_LIST.BD_PARENT_SEQ AS PARENTSEQ, ALL_LIST.BD_PREV_SEQ AS PREVSEQ,
@@ -164,7 +155,6 @@
 		              *
 		        FROM H3_BD_${id}_LIST
 		        WHERE  1 = 1
-	]]>
 		        <choose>
 		            <when test='category == " " and id == "stat_bbs"'>
 					</when>
@@ -172,8 +162,7 @@
 						AND	BD_CATEGORY = #{category}
 					</otherwise>
 				</choose>
-	<![CDATA[
-		        ORDER BY 
+		        ORDER BY
 		        	BD_GROUP_SEQ DESC,
 		            BD_STEP	ASC
 		    ) ALL_LIST
@@ -188,7 +177,6 @@
 			              *
 			        FROM H3_BD_${id}_LIST BBS
 			        WHERE  1 = 1
-	]]>
 		        <choose>
 		            <when test='category == " " and id == "stat_bbs"'>
 					</when>
@@ -196,8 +184,7 @@
 						AND	BD_CATEGORY = #{category}
 					</otherwise>
 				</choose>
-	<![CDATA[
-			        ORDER BY 
+			        ORDER BY
 			        	BBS.BD_GROUP_SEQ DESC,
 			            BBS.BD_STEP	ASC
 			    ) BBS
@@ -206,36 +193,30 @@
 		)BBS
 		ON
 		  BBS.RNUM + 1 = ALL_LIST.RNUM
-	]]>
 	</select>
 	
 	<update id="Board.updateGrpStep" parameterType="boardVO">
-	<![CDATA[
-		UPDATE 
+		UPDATE
 			H3_BD_${id}_LIST
 		SET 
 			BD_STEP = BD_STEP + 1
 		WHERE 
 			BD_GROUP_SEQ = #{seq} AND
 			BD_STEP > #{step}
-	]]>
 	</update>
 	
 	<update id="Board.updatePrevNextSeq" parameterType="boardVO">
-	<![CDATA[
-		UPDATE 
+		UPDATE
 			H3_BD_${id}_LIST
 		SET 
 			BD_PREV_SEQ = #{prevSeq},
 			BD_NEXT_SEQ = #{nextSeq}
 		WHERE 
 			BD_SEQ = #{seq}
-	]]>
 	</update>
 	
 	<update id="Board.updateBoard" parameterType="boardVO">
-	<![CDATA[
-		UPDATE 
+		UPDATE
 			H3_BD_${id}_LIST
 		SET 
 			BD_SUBJECT = #{subject},
@@ -244,16 +225,13 @@
 			BD_HIT = #{hit}
 		WHERE 
 			BD_SEQ = #{seq}
-	]]>
 	</update>
 	
 	<delete id="Board.deleteBoard" parameterType="boardVO">
-	<![CDATA[
-		DELETE 
+		DELETE
 		FROM
 			H3_BD_${id}_LIST 
 		WHERE 
 			BD_SEQ = #{seq}
-	]]>
 	</delete>
 </mapper>
diff --git a/src/main/resources/sqlmapper/mappers/cmmn/menu.xml b/src/main/resources/sqlmapper/mappers/cmmn/menu.xml
index 79f0792..767be21 100644
--- a/src/main/resources/sqlmapper/mappers/cmmn/menu.xml
+++ b/src/main/resources/sqlmapper/mappers/cmmn/menu.xml
@@ -19,7 +19,6 @@
 	</resultMap>
 
 	<select id="selectListWithHigher" parameterType="menuVO" resultMap="menuResult">
-	<![CDATA[
         with recursive subject (
                                 id,
                                 name,
@@ -73,7 +72,6 @@
         )
         select * from subject
         ORDER BY depth, ID;
-	]]>	
 	</select>
 
 	<select id="selectListWithConnectBy" parameterType="menuVO" resultMap="menuResult">
@@ -155,18 +153,15 @@
 	</select>
 	
 	<select id="Menu.getMenuInfoById" parameterType="map" resultType="map">
-	<![CDATA[
 		SELECT
 		  *
 		FROM
 		  T_MENU
 		WHERE
 			ID = #{id}
-	]]>
 	</select>
 	
 	<select id="Menu.getSubmenu" parameterType="hashmap" resultType="hashmap">
-	<![CDATA[
 		SELECT
 			A.*
 		FROM
@@ -177,13 +172,11 @@
 		    FROM
 		      T_MENU
 		    WHERE
-		      URL_GROUP = #{URL_GROUP} AND
-		      URL = #{URL}
-	]]>
-			<if test="BOARD_ID != null and BOARD_ID != ''"><![CDATA[
-			  AND BOARD_ID = #{BOARD_ID}
-			]]></if>
-	<![CDATA[		       
+		      URL_GROUP = #{url_group} AND
+		      URL = #{url}
+			<if test="BOARD_ID != null and BOARD_ID != ''">
+			  AND BOARD_ID = #{board_id}
+			</if>
 		  ) B
 		  ON 
 		    B.MENU_POSITION = A.MENU_POSITION AND
@@ -194,6 +187,5 @@
      		AND A.ROLE_LEVEL >= COALESCE((SELECT ROLE_LEVEL FROM T_SSO_AUTH_CODE AC, TAGENT A WHERE AC.CODE_ID = A.USEGRADE AND A.USERID = #{userId}), 17)
 		ORDER BY 
   			A.ID
-	]]>
 	</select>
 </mapper>
diff --git a/src/main/resources/sqlmapper/mappers/fa/equip.xml b/src/main/resources/sqlmapper/mappers/fa/equip.xml
index f3e9983..c9d0067 100644
--- a/src/main/resources/sqlmapper/mappers/fa/equip.xml
+++ b/src/main/resources/sqlmapper/mappers/fa/equip.xml
@@ -53,16 +53,13 @@
 	</resultMap>
 
 	<select id="Equip.getEquipmentList" parameterType="hashmap" resultType="hashmap">
-	<![CDATA[
 		SELECT
 			'계' AS EQUIP_NM, COUNT(EQ.POLICE) AS TOTAL, CAST('00' AS INT) AS ORDER_VALUE, '00' AS EQUIP,
-	]]>
 		<foreach collection="place1" item="item" separator=",">
 	    	SUM(CASE POLICE WHEN #{item.code2} THEN 1 ELSE 0 END) AS ${item.code2},
 	    	SUM(CASE POLICE WHEN 'ps18' THEN 1 ELSE 0 END) AS ps18,
 			SUM(CASE POLICE WHEN 'ps90' THEN 1 ELSE 0 END) AS ps90
 	 	</foreach>	 
-	<![CDATA[ 
 		FROM
 		  TEQUIPMENT EQ
 		  RIGHT JOIN
@@ -81,13 +78,11 @@
 		UNION
 			SELECT
 		   		TD.CODENM AS EQUIP_NM, COUNT(EQ.POLICE) AS TOTAL, CAST(TD.CODE2 AS INT) AS ORDER_VALUE, TD.CODE2 AS EQUIP,
-		]]>
 			<foreach collection="place1" item="item" separator=",">
 	    	SUM(CASE POLICE WHEN #{item.code2} THEN 1 ELSE 0 END) AS ${item.code2},
 	    	SUM(CASE POLICE WHEN 'ps18' THEN 1 ELSE 0 END) AS ps18,
 			SUM(CASE POLICE WHEN 'ps90' THEN 1 ELSE 0 END) AS ps90
 		 	</foreach>	 
-	 	<![CDATA[
 			FROM
 		  		TEQUIPMENT EQ 
 			  RIGHT JOIN
@@ -107,7 +102,6 @@
 				EQ.EQUIPGUBUN, TD.CODENM, TD.CODE2
 			ORDER BY 
 				ORDER_VALUE
-	]]>
 	</select>
 	
 	
diff --git a/src/main/resources/sqlmapper/mappers/report/report.xml b/src/main/resources/sqlmapper/mappers/report/report.xml
index 11e64ff..25cb388 100644
--- a/src/main/resources/sqlmapper/mappers/report/report.xml
+++ b/src/main/resources/sqlmapper/mappers/report/report.xml
@@ -75,7 +75,6 @@
 	</resultMap>
 		
 	<select id="Report.selectCategory" parameterType="int" resultType="reportCategoryVO" >
-		<![CDATA[
 		SELECT 
 			code, name 
 		FROM 
@@ -84,13 +83,11 @@
 			type = #{type}
 		ORDER BY
 			code
-		]]>
 	</select>
 	
 	
 	
 	<select id="Report.selectUseCategory" parameterType="int" resultType="reportCategoryVO" >
-		<![CDATA[
 		SELECT 
 			code, name 
 		FROM 
@@ -100,22 +97,18 @@
 			USE_YN = 'Y'
 		ORDER BY
 			code
-		]]>
 	</select>
 	
 	<select id="Report.selectPlaceNum" parameterType="reportVO" resultType="int">
-		<![CDATA[
 			SELECT 
 			  COALESCE(MAX(in_place_num), 0) + 1 AS inPlaceNum
 			FROM 
 			  RPT_INFO 
 			WHERE 
 			  IN_PLACE_CODE = #{inPlaceCode}
-		]]>
 	</select>
 	
 	<select id="Report.select" parameterType="reportVO" resultMap="reportMap">
-		<![CDATA[
 			SELECT
 				(SELECT NAME FROM Rpt_Category WHERE TYPE = 1 AND CODE = T.IN_CATEGORY1) AS inCategory1Str,
 		        (SELECT NAME FROM Rpt_Category WHERE TYPE = 2 AND CODE = T.IN_CATEGORY2) AS inCategory2Str,
@@ -135,11 +128,9 @@
 				RPT_INFO T
 			WHERE
 				in_seq = #{inSeq}
-		]]>
 	</select>
 	
 	<select id="Report.selectSaveList" parameterType="reportSearchVO" resultMap="reportMap">
-		<![CDATA[
         SELECT 	* 
         FROM 	(
         			SELECT	
@@ -149,19 +140,18 @@
        				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>
 		<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 == ''"><![CDATA[
 					ORDER BY IN_SEQ DESC
 		]]></if>
 		<![CDATA[
@@ -173,17 +163,17 @@
 	</select>
 
 	<select id="Report.selectSaveListCnt" parameterType="reportSearchVO" resultType="int">
-	<![CDATA[	
+	<![CDATA[
 		SELECT
 			COUNT(*)
-		FROM 
+		FROM
 			RPT_INFO
 		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)"><![CDATA[
 			IN_USERID = #{userid}
 		]]></when>
 		<when test="type == null or type != 1"><![CDATA[
@@ -192,24 +182,24 @@
 	</choose>
 	</select>
 
-	<insert id="Report.insert" parameterType="reportVO"> 
+	<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_infodate, 
-				in_info_year, in_info_month, in_info_day, in_regdate, 
+				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
 			) VALUES (
 				#{inAgencyCode}, #{inPlaceCode}, #{inPlaceName}, #{inPlaceNum},
 				#{inCategory1}, #{inCategory2}, #{inCategory3}, #{inCategory4},
-				#{inMemo}, #{inSubject}, #{inType}, #{inPlace1}, #{inPlace2}, 
+				#{inMemo}, #{inSubject}, #{inType}, #{inPlace1}, #{inPlace2},
 				#{inPosition}, #{inName}, #{inUserid}, #{inIp}, #{inFsseq},
-				TO_DATE(#{inInfoYear} || '/' || #{inInfoMonth} || '/' || #{inInfoDay}, 'YY/MM/DD'), 
+				TO_DATE(#{inInfoYear} || '/' || #{inInfoMonth} || '/' || #{inInfoDay}, 'YY/MM/DD'),
 				#{inInfoYear}, #{inInfoMonth}, #{inInfoDay}, NOW(),
 				#{inStateCode}, #{inContent}, #{inAutoRemove}, #{inOfflineType}, #{inOfflineUserid},
 				#{inReport}, #{inReport1}, #{inReport2}, #{inReport3}, #{inReport4}, #{inReport5}, #{inReport6},
@@ -223,9 +213,9 @@
 
 	<update id="Report.update" parameterType="reportVO">
 	<![CDATA[
-		UPDATE 
+		UPDATE
 			RPT_INFO
-		SET 
+		SET
 			in_agency_code = #{inAgencyCode},
 			in_place_code = #{inPlaceCode},
 			in_place_name = #{inPlaceName},
@@ -244,7 +234,7 @@
 			in_userid = #{inUserid},
 			in_ip = #{inIp},
 			in_fsseq = #{inFsseq},
-			in_infodate = TO_DATE(#{inInfoYear} || '/' || #{inInfoMonth} || '/' || #{inInfoDay}, 'YY/MM/DD'), 
+			in_infodate = TO_DATE(#{inInfoYear} || '/' || #{inInfoMonth} || '/' || #{inInfoDay}, 'YY/MM/DD'),
 			in_info_year = #{inInfoYear},
 			in_info_month = #{inInfoMonth},
 			in_info_day = #{inInfoDay},
@@ -252,19 +242,19 @@
 			in_content = #{inContent},
 			in_auto_remove = #{inAutoRemove},
 			in_complete = #{inComplete},
-			in_report = #{inReport}, 
-			in_report1 = #{inReport1}, 
-			in_report2 = #{inReport2}, 
-			in_report3 = #{inReport3}, 
-			in_report4 = #{inReport4}, 
-			in_report5 = #{inReport5}, 
+			in_report = #{inReport},
+			in_report1 = #{inReport1},
+			in_report2 = #{inReport2},
+			in_report3 = #{inReport3},
+			in_report4 = #{inReport4},
+			in_report5 = #{inReport5},
 			in_report6 = #{inReport6},
-			in_judge = #{inJudge}, 
-			in_judge1 = #{inJudge1}, 
-			in_judge2 = #{inJudge2}, 
-			in_judge3 = #{inJudge3}, 
-			in_judge4 = #{inJudge4}, 
-			in_judge5 = #{inJudge5}, 
+			in_judge = #{inJudge},
+			in_judge1 = #{inJudge1},
+			in_judge2 = #{inJudge2},
+			in_judge3 = #{inJudge3},
+			in_judge4 = #{inJudge4},
+			in_judge5 = #{inJudge5},
 			in_judge6 = #{inJudge6},
 			in_juseq1_section = #{inJuseq1Section},
 			in_juseq1_head = #{inJuseq1Head},
@@ -272,21 +262,21 @@
 			in_juseq2_head = #{inJuseq2Head},
 			in_juseq3_section = #{inJuseq3Section},
 			in_juseq3_head = #{inJuseq3Head}
-		WHERE 
+		WHERE
 			in_seq = #{inSeq}
 	]]>
 	</update>
 
 	<delete id="Report.delete" parameterType="reportVO">
 	<![CDATA[
-		DELETE 
+		DELETE
 		FROM
 			RPT_INFO
-		WHERE 
+		WHERE
 			in_seq = #{inSeq}
 	]]>
 	</delete>
-	
+
 	<!-- 자동삭제 -->
 	<select id="Report.selectAutoRemoveList" resultType="String">
 		<![CDATA[
@@ -299,14 +289,14 @@
 				IN_AUTO_REMOVE = 1
 		]]>
 	</select>
-	
+
 	<!-- 검색 -->
-	
+
 	<select id="Report.selectListAll" parameterType="reportSearchVO" resultMap="reportMap">
-		<![CDATA[	
+		<![CDATA[
 		/*Report.selectListAll*/
 		SELECT
-			ALL_LIST.*, 
+			ALL_LIST.*,
 			(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,
@@ -314,8 +304,8 @@
 	        (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) || ')'
-	        	  ELSE '상보' END) AS fullReportStr, 
-	    	(CASE 
+	        	  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 '참고'
 	    	END) AS judgeStr
@@ -324,9 +314,9 @@
 				SELECT
 					RPT.*,
 			]]>
-		    <choose> 
-				<when test="myGroupCode.equals(3)"><![CDATA[ 
-					(CASE 
+		    <choose>
+				<when test="myGroupCode.equals(3)"><![CDATA[
+					(CASE
 						WHEN IN_JUDGE3 > 0 THEN IN_JUDGE3
 						WHEN IN_JUDGE2 > 0 THEN IN_JUDGE2
 						WHEN IN_JUDGE1 > 0 THEN IN_JUDGE1
@@ -334,17 +324,17 @@
 					END)
 				]]></when>
 				<when test="myGroupCode.equals(2)"><![CDATA[
-					(CASE 
+					(CASE
 						WHEN IN_JUDGE2 > 0 THEN IN_JUDGE2
 						WHEN IN_JUDGE1 > 0 THEN IN_JUDGE1
 						ELSE NULL
-					END) 
+					END)
 				]]></when>
 				<when test="myGroupCode.equals(1)"><![CDATA[
-					(CASE 
+					(CASE
 						WHEN IN_JUDGE1 > 0 THEN IN_JUDGE1
 						ELSE NULL
-					END) 
+					END)
 				]]></when>
 				<otherwise><![CDATA[
 					NULL
@@ -352,29 +342,29 @@
 			</choose>
 		    <![CDATA[
 		    		AS judge
-				FROM 
+				FROM
 					RPT_INFO RPT
 				WHERE
 					IN_COMPLETE = '1' AND
 		       		IN_STATE_CODE <> '99'
-       		
+
 		]]>
 			<choose>
 				<when test="myGroupCode.equals(3)">AND 3 = 3</when>
-				 
+
 				<when test="myGroupCode.equals(2)"><![CDATA[
-				AND 2 = 2 
+				AND 2 = 2
 					AND IN_AGENCY_CODE = #{userPlace}
 				]]></when>
-				
+
 				<when test="myGroupCode.equals(1)"><![CDATA[
-				AND 1 = 1 
+				AND 1 = 1
 					AND IN_PLACE_CODE = #{userPlace}
 				]]></when>
-				
+
 				<otherwise></otherwise>
 			</choose>
-				
+
 				<if test="dateStart != null and dateStart != ''"><![CDATA[
 					AND IN_INFODATE >= #{dateStart}
 				]]></if>
@@ -394,7 +384,7 @@
 					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
 					<foreach collection="policeType" item="type" open="(" close=")" separator=",">
@@ -414,7 +404,7 @@
 					</foreach>
 				</if>
 				<if test="fullReport != null and fullReport.length > 0">
-					AND 
+					AND
 					<foreach collection="fullReport" item="report" open="(" close=")" separator=" OR ">
 						IN_REPORT${report} = 1
 					</foreach>
@@ -449,14 +439,14 @@
 		<![CDATA[
 			) ALL_LIST
 		]]>
-		
+
 	</select>
-	
+
 	<select id="Report.selectTotalCnt" parameterType="reportSearchVO" resultType="int">
-	<![CDATA[	
+	<![CDATA[
 		SELECT
 			COUNT(*)
-		FROM 
+		FROM
 			RPT_INFO
 		WHERE
 			IN_COMPLETE = '1' AND
@@ -464,26 +454,26 @@
 	]]>
 	<choose>
 		<when test="myGroupCode.equals(3)"></when>
-		
-		<when test="myGroupCode.equals(2)"><![CDATA[ 
+
+		<when test="myGroupCode.equals(2)"><![CDATA[
 			AND IN_AGENCY_CODE = #{userPlace}
 		]]></when>
-		
-		<when test="myGroupCode.equals(1)"><![CDATA[ 
+
+		<when test="myGroupCode.equals(1)"><![CDATA[
 			AND IN_PLACE_CODE = #{userPlace}
 		]]></when>
-		
+
 		<otherwise></otherwise>
 	</choose>
 	</select>
-	
+
 	<select id="Report.selectList" parameterType="reportSearchVO" resultMap="reportMap">
 		<![CDATA[
 		/*Report.selectList*/
-        SELECT 	* 
+        SELECT 	*
         FROM 	(
 	    	SELECT
-				ALL_LIST.*, 
+				ALL_LIST.*,
 				ROWNUM 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,
@@ -493,7 +483,7 @@
 		        (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,
-			    (CASE 
+			    (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 '참고'
 	    	END) AS judgeStr
@@ -502,9 +492,9 @@
 				SELECT
 					RPT.*,
 			]]>
-		    <choose> 
-				<when test="myGroupCode.equals(3)"><![CDATA[ 
-					(CASE 
+		    <choose>
+				<when test="myGroupCode.equals(3)"><![CDATA[
+					(CASE
 						WHEN IN_JUDGE3 > 0 THEN IN_JUDGE3
 						WHEN IN_JUDGE2 > 0 THEN IN_JUDGE2
 						WHEN IN_JUDGE1 > 0 THEN IN_JUDGE1
@@ -512,17 +502,17 @@
 					END)
 				]]></when>
 				<when test="myGroupCode.equals(2)"><![CDATA[
-					(CASE 
+					(CASE
 						WHEN IN_JUDGE2 > 0 THEN IN_JUDGE2
 						WHEN IN_JUDGE1 > 0 THEN IN_JUDGE1
 						ELSE NULL
-					END) 
+					END)
 				]]></when>
 				<when test="myGroupCode.equals(1)"><![CDATA[
-					(CASE 
+					(CASE
 						WHEN IN_JUDGE1 > 0 THEN IN_JUDGE1
 						ELSE NULL
-					END) 
+					END)
 				]]></when>
 				<otherwise><![CDATA[
 					NULL
@@ -530,7 +520,7 @@
 			</choose>
 		    <![CDATA[
 		    		AS judge
-				FROM 
+				FROM
 					RPT_INFO RPT
 					WHERE
 						IN_COMPLETE = '1' AND
@@ -538,18 +528,18 @@
 		]]>
 				<choose>
 					<when test="myGroupCode.equals(3)"></when>
-					
+
 					<when test="myGroupCode.equals(2)"><![CDATA[
 						AND IN_AGENCY_CODE = #{userPlace}
 					]]></when>
-					
+
 					<when test="myGroupCode.equals(1)"><![CDATA[
 						AND IN_PLACE_CODE = #{userPlace}
 					]]></when>
-					
+
 					<otherwise></otherwise>
 				</choose>
-					
+
 					<if test="dateStart != null and dateStart != ''"><![CDATA[
 						AND IN_INFODATE >= #{dateStart}
 					]]></if>
@@ -569,7 +559,7 @@
 						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
 						<foreach collection="policeType" item="type" open="(" close=")" separator=",">
@@ -589,7 +579,7 @@
 						</foreach>
 					</if>
 					<if test="fullReport != null and fullReport.length > 0">
-						AND 
+						AND
 						<foreach collection="fullReport" item="report" open="(" close=")" separator=" OR ">
 							IN_REPORT${report} = 1
 						</foreach>
@@ -618,23 +608,23 @@
 							#{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 != ''"><![CDATA[
 					ORDER BY ${orderCol} ${orderAsc}
 		]]></if>
 		<![CDATA[
 				) ALL_LIST
 			)
-	  	WHERE  
-	  		RNUM > #{firstIndex} AND  
-	  		RNUM <= #{firstIndex} + #{recordCountPerPage} 
+	  	WHERE
+	  		RNUM > #{firstIndex} AND
+	  		RNUM <= #{firstIndex} + #{recordCountPerPage}
 	  	]]>
 	</select>
-	
+
 	<select id="Report.selectListCnt" parameterType="reportSearchVO" resultType="int">
 		<![CDATA[
 			SELECT
 				COUNT(*)
-			FROM 
+			FROM
 				RPT_INFO
 			WHERE
 				IN_COMPLETE = '1' AND
@@ -642,18 +632,18 @@
 		]]>
 		<choose>
 			<when test="myGroupCode.equals(3)"></when>
-			
-			<when test="myGroupCode.equals(2)"><![CDATA[ 
+
+			<when test="myGroupCode.equals(2)"><![CDATA[
 				AND IN_AGENCY_CODE = #{userPlace}
 			]]></when>
-			
-			<when test="myGroupCode.equals(1)"><![CDATA[ 
+
+			<when test="myGroupCode.equals(1)"><![CDATA[
 				AND IN_PLACE_CODE = #{userPlace}
 			]]></when>
-			
+
 			<otherwise></otherwise>
 		</choose>
-			
+
 			<if test="dateStart != null and dateStart != ''"><![CDATA[
 				AND IN_INFODATE >= #{dateStart}
 			]]></if>
@@ -673,7 +663,7 @@
 				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
 				<foreach collection="policeType" item="type" open="(" close=")" separator=",">
@@ -693,7 +683,7 @@
 				</foreach>
 			</if>
 			<if test="fullReport != null and fullReport.length > 0">
-				AND 
+				AND
 				<foreach collection="fullReport" item="report" open="(" close=")" separator=" OR ">
 					IN_REPORT${report} = 1
 				</foreach>
@@ -723,78 +713,78 @@
 				</foreach>
 			</if>
 	</select>
-	
+
 	<!-- 결재 대기 목록 -->
 	<select id="Report.selectWaitList" parameterType="reportSearchVO"  resultMap="reportMap">
 		<![CDATA[
-        SELECT 	* 
+        SELECT 	*
         FROM 	(
 	    	SELECT
-				ALL_LIST.*, 
+				ALL_LIST.*,
 				ROWNUM 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 
+		        (ALL_LIST.IN_PLACE_NAME || '외사-' || ALL_LIST.IN_PLACE_NUM) AS docNo
 	       	FROM
 	       		(
 					SELECT
 						*
-					FROM 
+					FROM
 						RPT_INFO
 					WHERE
 			       		IN_STATE_CODE <> '99'
-		]]>			     
+		]]>
 				<choose>
 					<when test="dutiesForApprove.equals(2)"><![CDATA[
 						AND (IN_STATE_CODE = #{myGroupCode}||'1' OR IN_STATE_CODE = #{myGroupCode}||'3')
 					]]></when>
-					<otherwise><![CDATA[ 
+					<otherwise><![CDATA[
 						AND (IN_STATE_CODE = #{myGroupCode}||'1' OR IN_STATE_CODE = #{myGroupCode}||'2')
 					]]></otherwise>
-				</choose>  		
-			       		
+				</choose>
+
 				<choose>
 					<when test="myGroupCode.equals(3)"></when>
-					
-					<when test="myGroupCode.equals(2)"><![CDATA[ 
+
+					<when test="myGroupCode.equals(2)"><![CDATA[
 						AND IN_AGENCY_CODE = #{userPlace}
 					]]></when>
-					
-					<when test="myGroupCode.equals(1)"><![CDATA[ 
+
+					<when test="myGroupCode.equals(1)"><![CDATA[
 						AND IN_PLACE_CODE = #{userPlace}
 					]]></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 != ''"><![CDATA[
 					ORDER BY ${orderCol} ${orderAsc}
 				]]></if>
 		<![CDATA[
 				) ALL_LIST
 			)
-	  	WHERE  
-	  		RNUM > #{firstIndex} AND  
-	  		RNUM <= #{firstIndex} + #{recordCountPerPage} 
+	  	WHERE
+	  		RNUM > #{firstIndex} AND
+	  		RNUM <= #{firstIndex} + #{recordCountPerPage}
 	  	]]>
 	</select>
 	<select id="Report.selectWaitListAll" parameterType="reportSearchVO"  resultMap="reportMap">
 		<![CDATA[
     	SELECT
-			ALL_LIST.*, 
+			ALL_LIST.*,
 			ROWNUM 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 
+	        (ALL_LIST.IN_PLACE_NAME || '외사-' || ALL_LIST.IN_PLACE_NUM) AS docNo
        	FROM
        		(
 				SELECT
 					*
-				FROM 
+				FROM
 					RPT_INFO
 				WHERE
 		       		IN_STATE_CODE <> '99'
@@ -804,37 +794,37 @@
 				<when test="dutiesForApprove.equals(2)"><![CDATA[
 					AND (IN_STATE_CODE = #{myGroupCode}||'1' OR IN_STATE_CODE = #{myGroupCode}||'3')
 				]]></when>
-				<otherwise><![CDATA[ 
+				<otherwise><![CDATA[
 					AND (IN_STATE_CODE = #{myGroupCode}||'1' OR IN_STATE_CODE = #{myGroupCode}||'2')
 				]]></otherwise>
-			</choose>  		
-		       
+			</choose>
+
 			<choose>
 				<when test="myGroupCode.equals(3)"></when>
-				
-				<when test="myGroupCode.equals(2)"><![CDATA[ 
+
+				<when test="myGroupCode.equals(2)"><![CDATA[
 					AND IN_AGENCY_CODE = #{userPlace}
 				]]></when>
-				
-				<when test="myGroupCode.equals(1)"><![CDATA[ 
+
+				<when test="myGroupCode.equals(1)"><![CDATA[
 					AND IN_PLACE_CODE = #{userPlace}
 				]]></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 != ''"><![CDATA[
 				ORDER BY ${orderCol} ${orderAsc}
 			]]></if>
 		<![CDATA[
-			) ALL_LIST 
+			) ALL_LIST
 	  	]]>
 	</select>
 	<select id="Report.selectWaitListCnt" parameterType="reportSearchVO"  resultType="int">
 		<![CDATA[
 		SELECT
 			Count(*)
-		FROM 
+		FROM
 			RPT_INFO
 		WHERE
        		IN_STATE_CODE <> '99'
@@ -842,24 +832,24 @@
 		]]>
 		<choose>
 			<when test="myGroupCode.equals(3)"></when>
-			
-			<when test="myGroupCode.equals(2)"><![CDATA[ 
+
+			<when test="myGroupCode.equals(2)"><![CDATA[
 				AND IN_AGENCY_CODE = #{userPlace}
 			]]></when>
-			
-			<when test="myGroupCode.equals(1)"><![CDATA[ 
+
+			<when test="myGroupCode.equals(1)"><![CDATA[
 				AND IN_PLACE_CODE = #{userPlace}
 			]]></when>
-			
+
 			<otherwise></otherwise>
 		</choose>
 	</select>
-	
-	
+
+
 	<!-- 견문 결재 처리 목록 -->
 	<select id="Report.selectAprList" parameterType="reportSearchVO" resultMap="reportMap">
 		<![CDATA[
-        SELECT 	* 
+        SELECT 	*
         FROM 	(
 	    	SELECT
 	    		(ROW_NUMBER() OVER()) AS RNUM, T.*
@@ -867,9 +857,9 @@
 				(SELECT
 					(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
 					I.*
-				FROM 
+				FROM
 					RPT_INFO I INNER JOIN RPT_JUDGE_HISTORY J ON I.IN_SEQ = J.JU_INSEQ
-				WHERE 
+				WHERE
 					IN_STATE_CODE != '99'
 					AND IN_TYPE = #{type}
 					AND JU_USERID = #{userid}
@@ -883,25 +873,25 @@
 			<if test="subject != null and subject != ''"><![CDATA[
 					AND IN_SUBJECT LIKE '%'||#{subject}||'%'
 			]]></if>
-					
-			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[ 
+
+			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
 				ORDER BY ${orderCol} ${orderAsc}
 			]]></if>
 		<![CDATA[
 				) T
 			)
-	  	WHERE  
-	  		RNUM > #{firstIndex} AND  
-	  		RNUM <= #{firstIndex} + #{recordCountPerPage} 
+	  	WHERE
+	  		RNUM > #{firstIndex} AND
+	  		RNUM <= #{firstIndex} + #{recordCountPerPage}
 	  	]]>
 	</select>
 	<select id="Report.selectAprListCnt" parameterType="reportSearchVO" resultType="int">
 		<![CDATA[
-        SELECT 
+        SELECT
 			COUNT(*)
-		FROM 
+		FROM
 			RPT_INFO I INNER JOIN RPT_JUDGE_HISTORY J ON I.IN_SEQ = J.JU_INSEQ
-		WHERE 
+		WHERE
 			IN_STATE_CODE != '99'
 			AND IN_TYPE = #{type}
 			AND JU_USERID = #{userid}
@@ -922,11 +912,11 @@
     		(ROW_NUMBER() OVER()) AS RNUM, T.*
 		FROM
 			(SELECT
-				(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo, 
+				(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
 				I.*
-			FROM 
+			FROM
 				RPT_INFO I INNER JOIN RPT_JUDGE_HISTORY J ON I.IN_SEQ = J.JU_INSEQ
-			WHERE 
+			WHERE
 				IN_STATE_CODE != '99'
 				AND IN_TYPE = #{type}
 				AND JU_USERID = #{userid}
@@ -940,16 +930,16 @@
 			<if test="subject != null and subject != ''"><![CDATA[
 				AND IN_SUBJECT LIKE '%'||#{subject}||'%'
 			]]></if>
-					
-		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[ 
+
+		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
 			ORDER BY ${orderCol} ${orderAsc}
 		]]></if>
 		<![CDATA[
-				) T 
+				) T
 	  	]]>
 	</select>
-	
-	
+
+
 	<!-- 내 실적 목록 -->
 	<select id="Report.selectMyList" parameterType="reportSearchVO" resultMap="reportMap">
     select (ROW_NUMBER() OVER()) AS RNUM, a.*
@@ -997,25 +987,25 @@
   </select>
 	<select id="Report.selectMyListCnt" parameterType="reportSearchVO" resultType="int">
 		<![CDATA[
-        SELECT 
+        SELECT
 			COUNT(*)
-		FROM 
+		FROM
 			RPT_INFO
-		WHERE 
+		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)"><![CDATA[
 				AND IN_USERID = #{userid}
 			]]></when>
 			<when test="type == null or type != 1"><![CDATA[
 				AND IN_USERID IN (#{userid}, '''' || #{usegrade} || '''')
 			]]></when>
 		</choose>
-		
+
 		<if test="dateStart != null and dateStart != ''"><![CDATA[
-				AND IN_INFODATE >= #{dateStart}
+				AND IN_INFODATE >=  #{dateStart}
 		]]></if>
 		<if test="dateEnd != null and dateEnd != ''"><![CDATA[
 				AND IN_INFODATE <= #{dateEnd}
@@ -1034,23 +1024,23 @@
 				(SELECT NAME FROM Rpt_Category WHERE TYPE = 1 AND CODE = RPT.IN_CATEGORY1) AS inCategory1Str,
 		        (SELECT NAME FROM Rpt_Category WHERE TYPE = 2 AND CODE = RPT.IN_CATEGORY2) AS inCategory2Str,
 		        (SELECT NAME FROM Rpt_Category WHERE TYPE = 3 AND CODE = RPT.IN_CATEGORY3) AS inCategory3Str,
-		        (SELECT NAME FROM Rpt_Category WHERE TYPE = 4 AND CODE = RPT.IN_CATEGORY4) AS inCategory4Str, 
+		        (SELECT NAME FROM Rpt_Category WHERE TYPE = 4 AND CODE = RPT.IN_CATEGORY4) AS inCategory4Str,
 				RPT.*
-			FROM 
+			FROM
 				RPT_INFO RPT
-			WHERE 
+			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)"><![CDATA[
 					AND IN_USERID = #{userid}
 				]]></when>
 				<when test="type == null or type != 1"><![CDATA[
 					AND IN_USERID IN (#{userid}, '''' || #{usegrade} || '''')
 				]]></when>
 			</choose>
-		
+
 			<if test="dateStart != null and dateStart != ''"><![CDATA[
 				AND IN_INFODATE >= #{dateStart}
 			]]></if>
@@ -1060,19 +1050,19 @@
 			<if test="subject != null and subject != ''"><![CDATA[
 				AND IN_SUBJECT LIKE '%'||#{subject}||'%'
 			]]></if>
-					
-		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[ 
+
+		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
 			ORDER BY ${orderCol} ${orderAsc}
 		]]></if>
 		<![CDATA[
-				) T 
+				) T
 	  	]]>
 	</select>
-	
+
 	<!-- 견문 제출 현황 -->
 	<select id="Report.selectPresentList" parameterType="reportSearchVO" resultMap="reportMap">
 		<![CDATA[
-        SELECT 	* 
+        SELECT 	*
         FROM 	(
 	    	SELECT
 	    		(ROW_NUMBER() OVER()) AS RNUM, T.*
@@ -1084,22 +1074,22 @@
 			        (SELECT NAME FROM Rpt_Category WHERE TYPE = 3 AND CODE = IN_CATEGORY3) || ' > ' ||
 			        (SELECT NAME FROM Rpt_Category WHERE TYPE = 4 AND CODE = IN_CATEGORY4) AS cateStrOrder,
 					I.*
-				FROM 
+				FROM
 					RPT_INFO I
-				WHERE 
+				WHERE
 					IN_STATE_CODE != '99'
 		]]>
 			<choose>
 				<when test="myGroupCode.equals(3)"></when>
-				<when test="myGroupCode.equals(2)"><![CDATA[ 
+				<when test="myGroupCode.equals(2)"><![CDATA[
 					AND IN_AGENCY_CODE = #{userPlace}
 				]]></when>
-				<when test="myGroupCode.equals(1)"><![CDATA[ 
+				<when test="myGroupCode.equals(1)"><![CDATA[
 					AND IN_PLACE_CODE = #{userPlace}
 				]]></when>
 				<otherwise></otherwise>
 			</choose>
-			
+
 			<if test="dateStart != null and dateStart != ''"><![CDATA[
 					AND IN_INFODATE >= #{dateStart}
 			]]></if>
@@ -1112,38 +1102,38 @@
 			<if test="writeName != null and writeName != ''"><![CDATA[
 				AND IN_NAME LIKE '%'||#{writeName}||'%'
 			]]></if>
-					
-			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[ 
+
+			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
 				ORDER BY ${orderCol} ${orderAsc}
 			]]></if>
 		<![CDATA[
 				) T
 			)
-	  	WHERE  
+	  	WHERE
 	  		RNUM > #{firstIndex} AND
-	  		RNUM <= #{firstIndex} + #{recordCountPerPage} 
+	  		RNUM <= #{firstIndex} + #{recordCountPerPage}
 	  	]]>
 	</select>
 	<select id="Report.selectPresentListCnt" parameterType="reportSearchVO" resultType="int">
 		<![CDATA[
 		SELECT
 			COUNT(*)
-		FROM 
+		FROM
 			RPT_INFO I
-		WHERE 
+		WHERE
 			IN_STATE_CODE != '99'
 		]]>
 		<choose>
 			<when test="myGroupCode.equals(3)"></when>
-			<when test="myGroupCode.equals(2)"><![CDATA[ 
+			<when test="myGroupCode.equals(2)"><![CDATA[
 				AND IN_AGENCY_CODE = #{userPlace}
 			]]></when>
-			<when test="myGroupCode.equals(1)"><![CDATA[ 
+			<when test="myGroupCode.equals(1)"><![CDATA[
 				AND IN_PLACE_CODE = #{userPlace}
 			]]></when>
 			<otherwise></otherwise>
 		</choose>
-		
+
 		<if test="dateStart != null and dateStart != ''"><![CDATA[
 			AND IN_INFODATE >= #{dateStart}
 		]]></if>
@@ -1159,7 +1149,7 @@
 	</select>
 	<select id="Report.selectPresentListAll" parameterType="reportSearchVO" resultMap="reportMap">
 		<![CDATA[
-        
+
     	SELECT
     		*
 		FROM
@@ -1170,22 +1160,22 @@
 		        (SELECT NAME FROM Rpt_Category WHERE TYPE = 3 AND CODE = IN_CATEGORY3) || ' > ' ||
 		        (SELECT NAME FROM Rpt_Category WHERE TYPE = 4 AND CODE = IN_CATEGORY4) AS cateStrOrder,
 				I.*
-			FROM 
+			FROM
 				RPT_INFO I
-			WHERE 
+			WHERE
 				IN_STATE_CODE != '99'
 		]]>
 			<choose>
 				<when test="myGroupCode.equals(3)"></when>
-				<when test="myGroupCode.equals(2)"><![CDATA[ 
+				<when test="myGroupCode.equals(2)"><![CDATA[
 					AND IN_AGENCY_CODE = #{userPlace}
 				]]></when>
-				<when test="myGroupCode.equals(1)"><![CDATA[ 
+				<when test="myGroupCode.equals(1)"><![CDATA[
 					AND IN_PLACE_CODE = #{userPlace}
 				]]></when>
 				<otherwise></otherwise>
 			</choose>
-			
+
 			<if test="dateStart != null and dateStart != ''"><![CDATA[
 				AND IN_INFODATE >= #{dateStart}
 			]]></if>
@@ -1198,20 +1188,20 @@
 			<if test="writeName != null and writeName != ''"><![CDATA[
 				AND IN_NAME LIKE '%'||#{writeName}||'%'
 			]]></if>
-					
-			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[ 
+
+			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
 				ORDER BY ${orderCol} ${orderAsc}
 			]]></if>
 		<![CDATA[
 			)
 	  	]]>
 	</select>
-	
-	
+
+
 	<!-- 평가기록부 -->
 	<select id="Report.selectRecordList" parameterType="reportSearchVO" resultMap="reportMap">
 		<![CDATA[
-        SELECT 	* 
+        SELECT 	*
         FROM 	(
 	    	SELECT
 	    		(ROW_NUMBER() OVER()) AS RNUM, T.*
@@ -1219,10 +1209,10 @@
 				(SELECT
 					(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
 					R.*
-				FROM 
+				FROM
 					RPT_INFO R
-				WHERE 
-					IN_STATE_CODE != '99' 
+				WHERE
+					IN_STATE_CODE != '99'
 					AND IN_COMPLETE = 1
 		]]>
 			<if test="dateStart != null and dateStart != ''"><![CDATA[
@@ -1237,26 +1227,26 @@
 			<if test="placeGroup == null or placeGroup == ''"><![CDATA[
 					AND IN_PLACE_CODE = #{userPlace}
 			]]></if>
-					
-			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[ 
+
+			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
 				ORDER BY ${orderCol} ${orderAsc}
 			]]></if>
 		<![CDATA[
 				) T
 			)
-	  	WHERE  
+	  	WHERE
 	  		RNUM > #{firstIndex} AND
-	  		RNUM <= #{firstIndex} + #{recordCountPerPage} 
+	  		RNUM <= #{firstIndex} + #{recordCountPerPage}
 	  	]]>
 	</select>
 	<select id="Report.selectRecordListCnt" parameterType="reportSearchVO" resultType="int">
 		<![CDATA[
        SELECT
 			COUNT(*)
-		FROM 
+		FROM
 			RPT_INFO
-		WHERE 
-			IN_STATE_CODE != '99' 
+		WHERE
+			IN_STATE_CODE != '99'
 			AND IN_COMPLETE = 1
 		]]>
 		<if test="dateStart != null and dateStart != ''"><![CDATA[
@@ -1274,17 +1264,17 @@
 	</select>
 	<select id="Report.selectRecordListAll" parameterType="reportSearchVO" resultMap="reportMap">
 		<![CDATA[
-        
+
     	SELECT
     		(ROW_NUMBER() OVER()) AS RNUM, T.*
 		FROM
 			(SELECT
 				(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
 				R.*
-			FROM 
+			FROM
 				RPT_INFO R
-			WHERE 
-				IN_STATE_CODE != '99' 
+			WHERE
+				IN_STATE_CODE != '99'
 				AND IN_COMPLETE = 1
 		]]>
 			<if test="dateStart != null and dateStart != ''"><![CDATA[
@@ -1299,8 +1289,8 @@
 			<if test="placeGroup == null or placeGroup == ''"><![CDATA[
 				AND IN_PLACE_CODE = #{userPlace}
 			]]></if>
-					
-		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[ 
+
+		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''"><![CDATA[
 			ORDER BY ${orderCol} ${orderAsc}
 		]]></if>
 		<![CDATA[
diff --git a/src/main/webapp/WEB-INF/jsp/common/submenu.jsp b/src/main/webapp/WEB-INF/jsp/common/submenu.jsp
index 1840dce..18097ea 100644
--- a/src/main/webapp/WEB-INF/jsp/common/submenu.jsp
+++ b/src/main/webapp/WEB-INF/jsp/common/submenu.jsp
@@ -6,7 +6,8 @@
 <div id="title" class="title-area">
 	<ul class="page-title">
 		<li>
-			<c:out value="${menu.NAME}" /> <span><c:out value="${menu.ENG_NAME}" /></span>
+			<c:out value="${menu.name}" /> <span><c:out value="${menu.eng_name}" /></span>
+
 		</li>
 	</ul>
 </div>
@@ -19,13 +20,13 @@
 			<c:forEach var="sub" items="${subMenu}" varStatus="status">
 				<li>
 					<c:choose>
-						<c:when test="${sub.URL_GROUP == 'bbs'}">
-							<c:set var="id" value="${fn:split(sub.URL, '/')[0]}"/>
-							<c:set var="category" value="${fn:split(sub.URL, '/')[1]}"/>
-							<a <c:if test="${sub.ID == menu.ID}">${current}</c:if> href="/<c:out value="${sub.URL_GROUP}"/>/list.do?id=${id}">${sub.NAME}</a>
+						<c:when test="${sub.url_group == 'bbs'}">
+							<c:set var="id" value="${fn:split(sub.url, '/')[0]}"/>
+							<c:set var="category" value="${fn:split(sub.url, '/')[1]}"/>
+							<a <c:if test="${sub.id == menu.id}">${current}</c:if> href="/<c:out value="${sub.url_group}"/>/list.do?id=${id}">${sub.name}</a>
 						</c:when>
 						<c:otherwise>
-							<a <c:if test="${sub.ID == menu.ID}">${current}</c:if> href="/<c:out value="${sub.URL_GROUP}"/><c:out value="${sub.URL}"/>">${sub.NAME}</a>
+							<a <c:if test="${sub.id == menu.id}">${current}</c:if> href="/<c:out value="${sub.url_group}"/><c:out value="${sub.url}"/>">${sub.name}</a>
 						</c:otherwise>
 					</c:choose>
 					<c:if test="${!status.last}">${isEnd}</c:if>
diff --git a/src/main/webapp/WEB-INF/jsp/equip/status.jsp b/src/main/webapp/WEB-INF/jsp/equip/status.jsp
index 8f78b3e..211b9d2 100644
--- a/src/main/webapp/WEB-INF/jsp/equip/status.jsp
+++ b/src/main/webapp/WEB-INF/jsp/equip/status.jsp
@@ -3,7 +3,7 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <script type="text/javaScript" language="javascript" defer="defer">
-	<!--
+	<!-- -->
 	/* 화면 출력 function */
     function fn_goPrint() {
     	var printThis = document.getElementById("table").innerHTML;
@@ -36,64 +36,64 @@
 			<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.PS19" /></th>
-				<th align="center"><spring:message code="equip.PS50" /></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.ps19" /></th>
+				<th align="center"><spring:message code="equip.ps50" /></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">
+		<c:forEach var="equipstatus" items="${equipstatusList}" varStatus="status">
 			<tr>
-				<td align="center"><a href="javascript:fnEquipList('<c:out value="${equipStatus.EQUIP }"/>')" style="color:#0000ff;"><c:out value="${equipStatus.EQUIP_NM}" /></a></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.PS19}" /></td>
-				<td align="center"><c:out value="${equipStatus.PS50}" /></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"><a href="javascript:fnEquipList('<c:out value="${equipstatus.equip }"/>')" style="color:#0000ff;"><c:out value="${equipstatus.equip_nm}" /></a></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.ps19}" /></td>
+				<td align="center"><c:out value="${equipstatus.ps50}" /></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>
diff --git a/src/main/webapp/WEB-INF/jsp/report/presentList.jsp b/src/main/webapp/WEB-INF/jsp/report/presentList.jsp
index dbc8bdb..3c2652e 100644
--- a/src/main/webapp/WEB-INF/jsp/report/presentList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/report/presentList.jsp
@@ -187,7 +187,7 @@
 </div>
 
 <script type="text/javascript">
-<!--
+
 	$(document).ready(function(){
 		//날짜 설정
 		$('input[id^="date"]').datepicker({dateFormat: 'yy-mm-dd'});
@@ -264,5 +264,4 @@
 		document.searchForm.action = "<c:url value='/report/presentList.do'/>";
 		document.searchForm.submit();
 	}
--->
 </script>
diff --git a/src/main/webapp/WEB-INF/jsp/stats/statsList.jsp b/src/main/webapp/WEB-INF/jsp/stats/statsList.jsp
index 260a36c..51e0a99 100644
--- a/src/main/webapp/WEB-INF/jsp/stats/statsList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/stats/statsList.jsp
@@ -8,7 +8,7 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 
 <script type="text/javaScript" language="javascript" defer="defer">
-	<!--
+
 	
 	/* 글 상세 화면 function */
 	function fn_select(id) {
@@ -49,7 +49,6 @@
 	function fn_reload() {
 		location.reload();
 	}
-	//-->
 </script>
 <form:form commandName="searchVO" name="searchForm" method="get">
 	<div id="search">