ojdbc-14.jar 추가

.gitignore

@@ -185,3 +185,4 @@ fabric.properties
 hs_err_pid*
 replay_pid*
 
+!ojdbc-14.jar

src/main/java/kcg/faics/equip/web/EquipmentController.java

@@ -36,8 +36,6 @@ import kcg.faics.member.vo.MemberVO;
 import kcg.faics.sec.AuthType;
 import kcg.faics.sec.LoginUserVO;
 import kcg.faics.sec.UserUtil;
-import kcg.faics.target.service.impl.DivMngServiceImpl;
-import kcg.faics.target.vo.DivMngVO;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/kcg/faics/fa/web/EduController.java

@@ -17,8 +17,6 @@ import kcg.faics.fa.vo.EduSearchVO;
 import kcg.faics.fa.vo.EduVO;
 import kcg.faics.sec.LoginUserVO;
 import kcg.faics.sec.UserUtil;
-import kcg.faics.target.vo.DivMngSearchVO;
-import kcg.faics.target.vo.DivMngVO;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/resources/sqlmapper/mappers/report/report.xml

@@ -953,24 +953,23 @@
 	<!-- 내 실적 목록 -->
 	<select id="Report.selectMyList" parameterType="reportSearchVO" resultMap="reportMap">
 		<![CDATA[
-        SELECT 	* 
+      SELECT 	*
-        FROM 	(
+      FROM 	(
 	    	SELECT
 	    		ROWNUM AS RNUM, T.*
-			FROM
+			  FROM  (SELECT
-				(SELECT
+                (IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
-					(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
+                (SELECT NAME FROM Rpt_Category WHERE TYPE = 1 AND CODE = RPT.IN_CATEGORY1) AS inCategory1Str,
-					(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 = 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 = 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.*
-					RPT.*
+              FROM
-				FROM 
+                RPT_INFO RPT
-					RPT_INFO RPT
+              WHERE
-				WHERE 
+                IN_STATE_CODE != '99'
-					IN_STATE_CODE != '99'
+                AND IN_TYPE = #{type}
-					AND IN_TYPE = #{type}
+          ]]>
-		]]>
 			<choose>
 				<when test="type != null and type.equals(1)"><![CDATA[ 
 					AND IN_USERID = #{userid}