Merge branch 'master' of http://192.168.0.157:3000/DBNT/FAICS

src/main/java/kcg/faics/arrest/vo/ArrestVO.java

@@ -267,7 +267,7 @@ public class ArrestVO {
 	/**
 	 * 선박제원-선원수
 	 */
-	private String shipCrewCnt = "";
+	private int shipCrewCnt = 0;
 	/**
 	 * 선박제원-선질
 	 */
@@ -895,11 +895,11 @@ public class ArrestVO {
 		this.shipTonnage = shipTonnage;
 	}
 
-	public String getShipCrewCnt() {
+	public int getShipCrewCnt() {
 		return shipCrewCnt;
 	}
 
-	public void setShipCrewCnt(String shipCrewCnt) {
+	public void setShipCrewCnt(int shipCrewCnt) {
 		this.shipCrewCnt = shipCrewCnt;
 	}
 

src/main/java/kcg/faics/board/service/impl/BoardMapper.java

@@ -115,6 +115,7 @@ public class BoardMapper extends EgovAbstractMapper {
 		return map;
 	};
 
+	
 	/**
 	 * 선택한 게시물의 내용을 반환한다.
 	 * 

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

@@ -512,19 +512,31 @@
 			A.ADDR_DTL	,
 			A.VLTN_TYPE	,
       		B.CODENM  || ' (' || A.VLTN_DTL || ')'	VLTN_DTL,
-			DECODE(A.IVSN_TYPE, 'YRB2', '1', '') IVSN_TYPE1,
+			case A.IVSN_TYPE
-			DECODE(A.IVSN_TYPE, 'YRD1', '1', '') IVSN_TYPE2,
+			    when 'YRB2' then '1'
-			DECODE(A.IVSN_TYPE, 'YRA1', '1', '') IVSN_TYPE3,
+			    else '' end IVSN_TYPE1,
-			DECODE(A.IVSN_TYPE, 'YRB1', '1', '') IVSN_TYPE4,
+			case A.IVSN_TYPE
-
+			    when 'YRD1' then '1'
-
+			    else '' end IVSN_TYPE2,
-
+			case A.IVSN_TYPE
-			DECODE(A.SPEC_BATL_YN, 'Y', '1' , '') SPEC_BATL_YN,
+			    when 'YRA1' then '1'
-			DECODE(A.NLL_YN, 'Y', '1' , '') NLL_YN,
+			    else '' end IVSN_TYPE3,
+			case A.IVSN_TYPE
+			    when 'YRB1' then '1'
+			    else '' end IVSN_TYPE4,
+			case A.SPEC_BATL_YN
+			    when 'Y' then '1'
+			    else '' end SPEC_BATL_YN,
+			case A.NLL_YN
+			    when 'Y' then '1'
+			    else '' end NLL_YN,
 			A.AGENCY_TYPE	,
 			A.AGENCY_GUARD	,
-			DECODE(A.AGENCY_TYPE, '01', '해경', '02', '해수부', '해군') || ' ' || G.CODENM AGENCY_GUARD_STR,
+			case A.AGENCY_TYPE
-			A.AGENCY_VESSEL	,
+				when '01' then '해경'
+				when '02' then '해수부'
+				else '해군' end  || ' ' || G.CODENM AGENCY_GUARD_STR,
+		    A.AGENCY_VESSEL	,
 			A.SHIP_NAME	,
 			A.SHIP_TONNAGE	,
 			A.SHIP_CREW_CNT	,
@@ -542,21 +554,48 @@
 			A.VIO_CNT	,
 			A.VIO_PRTD_AMT	,
 			A.PROC_COND	,
-			DECODE(A.PROC_COND, '02', '1', '') PROC_COND_Y,
+			case A.PROC_COND
-			DECODE(A.PROC_COND, '01', '1', '') PROC_COND_N,
+				when '02' then '1'
+				else '' end PROC_COND_Y,
+			case A.PROC_COND
+				when '01' then '1'
+				else '' end PROC_COND_N,
 			A.MRGN_PYMT_YN	,
 					
-			DECODE(A.MRGN_PYMT_YN, 'Y', A.MRGN_PYMT_AMT, '' ) MRGN_PYMT_AMT,
+			case A.MRGN_PYMT_YN
-			DECODE(A.MRGN_PYMT_YN, 'N', A.MRGN_PYMT_AMT, '' ) NO_MRGN_PYMT_AMT,
+				when 'Y' then A.MRGN_PYMT_AMT
+				else null
+				end MRGN_PYMT_AMT,
+			case A.MRGN_PYMT_YN
+				when 'N' then A.MRGN_PYMT_AMT
+				else null
+				end NO_MRGN_PYMT_AMT,
 			TO_CHAR(MRGN_PYMT_DATE, 'YYYY-MM-DD hh24:mi') MRGN_PYMT_DATE	,
-			DECODE(A.MRGN_PYMT_YN, 'N', '1', '') NOT_PAYMENT,
+			case A.MRGN_PYMT_YN
+				when 'N'
+				then '1'
+				else '' end NOT_PAYMENT,
 			A.SHIP_PROC_TYPE	,
-			DECODE(A.SHIP_PROC_TYPE, '01', '1', '') SHIP_PROC_TYPE_A,
+			case A.SHIP_PROC_TYPE
-			DECODE(A.SHIP_PROC_TYPE, '02', '1', '') SHIP_PROC_TYPE_B,
+				when '01' then '1'
-			DECODE(A.SHIP_PROC_TYPE, '03', '1', '') SHIP_PROC_TYPE_C,
+				else ''
-			DECODE(A.SHIP_PROC_TYPE, '04', '1', '') SHIP_PROC_TYPE_D,
+				end SHIP_PROC_TYPE_A,
-			DECODE(A.SHIP_PROC_TYPE, '05', '1', '') SHIP_PROC_TYPE_E,
+			case A.SHIP_PROC_TYPE
-			
+				when '02' then '1'
+				else ''
+				end SHIP_PROC_TYPE_B,
+			case A.SHIP_PROC_TYPE
+				when '03' then '1'
+				else ''
+				end SHIP_PROC_TYPE_C,
+			case A.SHIP_PROC_TYPE
+				when '04' then '1'
+				else ''
+				end SHIP_PROC_TYPE_D,
+			case A.SHIP_PROC_TYPE
+				when '05' then '1'
+				else ''
+				end SHIP_PROC_TYPE_E,
 			A.SHIP_CMSN_COST,
 			A.DTTN_CAP_CNT	,
 			A.DTTN_MATE_CNT	,
@@ -567,7 +606,10 @@
       		F.CODENM WO_DTTN_STR,
 			TO_CHAR(A.FIELD_ARST_DATE, 'YYYY-MM-DD hh24:mi') FIELD_ARST_DATE,
 			TO_CHAR(A.FIELD_RLS_DATE, 'YYYY-MM-DD hh24:mi') FIELD_RLS_DATE	,
-			DECODE(A.FIELD_ARST_DATE, NULL, '', '1') FIELD_CNT,
+			case A.FIELD_ARST_DATE
+				when null then ''
+				else '1'
+				end FIELD_CNT,
 			A.LEAD_DISTANCE	,
 			A.LEAD_HOUR	,
 			A.LEAD_MINUTE	,
@@ -579,13 +621,22 @@
 			A.REG_DATE	,
 			A.REG_USER	,
 			A.REG_AGENCY	 
-		  FROM T_CHN_ARREST_INFO A,
+		  FROM T_CHN_ARREST_INFO A
-           TCODE B ,  -- 위반내용
+		  	right outer join
+		      (select
+					CODE1,
+					CODE2,
+					CODENM
+				from
+					TCODE
+				where
+					CODE1 = 'C001' ) G
+					on G.CODE2 = A.AGENCY_GUARD,
+           TCODE B ,
            (SELECT CODE, UP_CODE, CODE_NM FROM CD_CODE C WHERE GP_CODE = 'A001' ) C,  -- 시군구
-           TCODE D ,  -- 선적
+           TCODE D ,
-           TCODE E ,  -- 선종
+           TCODE E ,
            (SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'T005' ) F , -- 무혐의불구속
-           (SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'C001' ) G ,   --
 	   (SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'T004' ) H ,    -- 선질
 	   (SELECT CODE, UP_CODE, CODE_NM FROM CD_CODE C WHERE GP_CODE = 'A001' AND UP_CODE ='0000' ) I  -- 특별광역시도
       WHERE A.DEL_YN = 'N'
@@ -594,7 +645,6 @@
        AND (A.SHIP_MENT = D.CODE2 AND D.CODE1 = 'SSRR')
        AND (A.SHIP_TYPE = E.CODE2 AND E.CODE1 = 'FA81')
        AND A.WO_DTTN_TYPE = F.CODE2 
-       AND G.CODE2(+) = A.AGENCY_GUARD
        AND A.SHIP_QLTY = H.CODE2
        AND A.ADDR_AREA = I.CODE
 		]]>

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

@@ -165,7 +165,8 @@
 		WHERE 
 			BD_SEQ = #{seq}
 	</update>
-	
+
+
 	<select id="Board.selectPrevBoard" parameterType="boardVO" resultType="boardVO">
 		SELECT BD_SEQ AS SEQ,
 		       BD_MB_ID AS USERID,

src/main/resources/sqlmapper/mappers/fa/equip.xml

@@ -352,7 +352,7 @@
       values (
            (CASE
               WHEN (SELECT MAX(NUM) FROM TEQUIPMENT WHERE POLICE = #{police}) IS NULL THEN 1
-              ELSE (SELECT MAX(NUM) + 1 FROM TEQUIPMENT WHERE POLICE = #{police})
+              ELSE (SELECT MAX(NUM)::int + 1 FROM TEQUIPMENT WHERE POLICE = #{police})
            END),
            #{police},
            #{equipType},

src/main/resources/sqlmapper/mappers/tg/weakplace.xml

@@ -82,8 +82,8 @@
 
 	<select id="selectMaxWpNo" parameterType="String" resultType="int">
 	<![CDATA[
-		SELECT 
+		SELECT
-			COALESCE(WP_NO, 0) 
+			COALESCE(WP_NO, 0)
 		FROM 
 		(
 	        SELECT 
@@ -91,13 +91,11 @@
 	        FROM 
 	        	TWEAKPLACE
 	        WHERE
-	        	1=1
+				PLACE1 = #{_parameter}
-				AND PLACE1 = #{_parameter}
 	        ORDER BY WP_NO DESC
-		)
+		) add
-        WHERE
+        limit 1
-        	ROWNUM = 1
+]]>
-  	]]>
 	</select>
 
 	<insert id="insert" parameterType="weakPlaceVO">