From 2939d541a8cb04af23cef46907af03c3651a4d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Thu, 21 Apr 2022 16:30:32 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=ED=86=B5=EA=B3=84=20>=20?=
 =?UTF-8?q?=EA=B5=AD=EC=A0=9C=EB=B2=94=EC=A3=84=20=EB=8B=A8=EC=86=8D?=
 =?UTF-8?q?=EC=8B=9C=EC=8A=A4=ED=85=9C=20>=20=EA=B5=AD=EC=A0=9C=EB=B2=94?=
 =?UTF-8?q?=EC=A3=84=20=EA=B2=80=EA=B1=B0=ED=98=84=ED=99=A9=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=A1=B0=ED=9A=8C=20=EC=98=A4=EB=A5=98,?=
 =?UTF-8?q?=20=EC=97=91=EC=85=80=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inter/web/InternationalController.java    |   8 +-
 .../sqlmapper/mappers/inter/international.xml | 842 ++++++++----------
 2 files changed, 383 insertions(+), 467 deletions(-)

diff --git a/src/main/java/kcg/faics/inter/web/InternationalController.java b/src/main/java/kcg/faics/inter/web/InternationalController.java
index 02253c7..d596bcc 100644
--- a/src/main/java/kcg/faics/inter/web/InternationalController.java
+++ b/src/main/java/kcg/faics/inter/web/InternationalController.java
@@ -561,10 +561,10 @@ public class InternationalController {
 	header.put("speciallaw", "기타(외국인관련범죄)_특별법범");
 	header.put("commissionCost", "비고");
 	
-	arrestCntList.setDetentionTotalCnt(String.valueOf(arrestCntList.getCaptainCount()
-	+ arrestCntList.getMateCount()
-	+ arrestCntList.getEngineerCount()
-	+ arrestCntList.getCrewCount()));
+	arrestCntList.setDetentionTotalCnt(
+      String.valueOf(
+          arrestCntList.getCaptainCount() + arrestCntList.getMateCount()
+              + arrestCntList.getEngineerCount() + arrestCntList.getCrewCount()));
 	arrestCntList.setSpecBatlYn(String.valueOf(arrestCntList.getSpecBatlCnt()));
 	arrestCntList.setNllYn(String.valueOf(arrestCntList.getNllCnt()));
 	arrestCntList.setNoPaymentCnt(String.valueOf(arrestCntList.getNotPayment()));
diff --git a/src/main/resources/sqlmapper/mappers/inter/international.xml b/src/main/resources/sqlmapper/mappers/inter/international.xml
index 83244f1..3ec78fe 100644
--- a/src/main/resources/sqlmapper/mappers/inter/international.xml
+++ b/src/main/resources/sqlmapper/mappers/inter/international.xml
@@ -939,17 +939,15 @@
 		]]>
 	</select>
 	
-	<select id="getArrestListCount" parameterType="arrestSearchVO"
-		resultMap="arrestResult">
-	<![CDATA[
-	SELECT /*+IDX_T_ITN_ARREST_INFO*/
-	       SUM(IVSN_TYPE1) IVSN_TYPE1,	 
+	<select id="getArrestListCount" parameterType="arrestSearchVO" resultMap="arrestResult">
+	SELECT
+	     SUM(IVSN_TYPE1) IVSN_TYPE1,
 		   SUM(IVSN_TYPE2) IVSN_TYPE2,
 		   SUM(IVSN_TYPE3) IVSN_TYPE3,
 		   SUM(IVSN_TYPE4) IVSN_TYPE4,
 		   SUM(SPEC_BATL) SPEC_BATL_CNT,
 		   SUM(NLL) NLL_CNT,
-		   SUM(SHIP_CREW_CNT) SHIP_CREW_CNT,
+		   SUM(SHIP_CREW_CNT::int) SHIP_CREW_CNT,
 		   SUM(VIO_CNT) VIO_CNT,
 		   SUM(VIO_PRTD_AMT) VIO_PRTD_AMT,
 		   
@@ -977,465 +975,383 @@
 		   SUM(GEAR_WIDTH) GEAR_WIDTH,
 		   SUM(FIELD_CNT) FIELD_CNT,
 		   COUNT(*) TOTAL_CNT
-	 FROM	   
-	   (
-		SELECT
-		    A.ID	,
-			TO_CHAR(A.ARST_DATE, 'YYYY-MM-DD hh24:mi') ARST_DATE,
-			A.LAT_D	,
-			A.LAT_M	,
-			A.LAT_S	,
-			A.LON_D	,
-			A.LON_M	,
-			A.LON_S	,
-			A.ADDR_AREA	,
-			A.ADDR_CITY	,
-      		C.CODE_NM ADDR_STR,
-			A.ADDR_DTL	,
-			A.VLTN_TYPE	,
-      		A.VLTN_DTL,
-			A.IVSN_TYPE	,
-			DECODE(A.IVSN_TYPE, 'YRB2', 1, 0) IVSN_TYPE1,
-			DECODE(A.IVSN_TYPE, 'YRD1', 1, 0) IVSN_TYPE2,
-			DECODE(A.IVSN_TYPE, 'YRA1', 1, 0) IVSN_TYPE3,
-			DECODE(A.IVSN_TYPE, 'YRB1', 1, 0) IVSN_TYPE4,
-			
-			DECODE(A.SPEC_BATL_YN , 'Y', 1, 0) SPEC_BATL,
-			DECODE(A.NLL_YN	, 'Y', 1, 0) NLL,
-			A.AGENCY_TYPE	,
-			A.AGENCY_GUARD	,
-			G.CODENM AGENCY_GUARD_STR ,
-			A.AGENCY_VESSEL	,
-			A.SHIP_NAME	,
-			A.SHIP_TONNAGE	,
-			A.SHIP_CREW_CNT	,
-			A.SHIP_QLTY	,
-			A.SHIP_MENT	,      
-      		D.CODENM SHIP_MENT_STR,        
-			A.SHIP_PORT_NAME	,
-			A.CAP_NAME	,
-			A.CAP_CHN_NAME	,
-			A.CAP_AGE	,
-			A.SHIP_TYPE	,
-      		E.CODENM SHIP_TYPE_STR,
-			A.VIO_FISH	,
-			A.VIO_CNT	,
-			A.VIO_PRTD_AMT	,
-			A.PROC_COND	,
-			DECODE(A.PROC_COND, '01', 1, 0) PROC_COND1,
-			DECODE(A.PROC_COND, '02', 1, 0) PROC_COND2,
-			A.MRGN_PYMT_YN	,
-			DECODE(A.MRGN_PYMT_YN, 'N', 1, 0) PYMT_N_CNT,
-			--A.MRGN_PYMT_AMT	,
-			DECODE(MRGN_PYMT_YN, 'Y', MRGN_PYMT_AMT, 0) MRGN_PYMT_AMT,
-			DECODE(MRGN_PYMT_YN, 'N', MRGN_PYMT_AMT, 0) NO_MRGN_PYMT_AMT,
-			
-			TO_CHAR(MRGN_PYMT_DATE, 'YYYY-MM-DD') MRGN_PYMT_DATE	,
-			A.SHIP_PROC_TYPE	,
-			DECODE(A.SHIP_PROC_TYPE, '01', 1, 0) SHIP_PROC_TYPE_A,
-			DECODE(A.SHIP_PROC_TYPE, '02', 1, 0) SHIP_PROC_TYPE_B,
-			DECODE(A.SHIP_PROC_TYPE, '03', 1, 0) SHIP_PROC_TYPE_C,
-			DECODE(A.SHIP_PROC_TYPE, '04', 1, 0) SHIP_PROC_TYPE_D,
-			DECODE(A.SHIP_PROC_TYPE, '05', 1, 0) SHIP_PROC_TYPE_E,
-			
-			A.SHIP_CMSN_COST	,
-			A.DTTN_CAP_CNT	,
-			A.DTTN_MATE_CNT	,
-			A.DTTN_ENG_CNT	,
-			A.DTTN_CREW_CNT	,
-			A.WO_DTTN_TYPE	,
-      		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, 0, 1) FIELD_CNT,
-			A.LEAD_DISTANCE	,
-			A.LEAD_HOUR	,
-			A.LEAD_NUMBER	,
-			A.LEAD_MINUTE	,
-			A.GEAR_CAST	,
-			A.GEAR_WIDTH	,
-			A.GEAR_ETC	,
-			A.STATUS	,
-			A.DEL_YN	,
-			A.REG_DATE	,
-			A.REG_USER	,
-			A.REG_AGENCY,
-			A.TRAMSPOR_TATION,
-			A.FOREIGN_CREW,
-			A.ITEM_TEST,
-			A.REMARKS_LIST,
-			A.AVIOLENT_CRIME,
-			A.VIOLENT_CRIME,
-			A.INTELLIGENT_CRIME,
-			A.THEFT_CRIME,
-			A.SPECIAL_LAW,
-			A.ARRANGE_TRANSPORT,
-			A.ILLENGAL_MOVE,
-			A.TRAN_SPORTATION,
-			A.QUANTITY_CAP,
-			A.PRICE_MONEY,
-			A.TARGET_COUNTRY,
-			A.ESCAPE_CHINA,
-			A.EMPLOYMENT_CHINA,
-			A.ETC_CHINA,
-			A.ESCAPE_JAPAN,
-			A.EMPLYMENT_JAPAN,
-			A.ETC_JAPAN,
-			A.ESCAPE_COUNTRIES,
-			A.EMPLOYMENT_COUNTRIES,
-			A.ETC_COUNTRIES,
-			A.SMUGGLING_NAME,
-			A.SMUGGLING_CHN,
-			A.SMUGGLING_AGE,
-			A.SMUGGLING_WORLD,
-			A.SPILL_TARGET,
-			A.AMOUNTOF_COMPENSATION,
-			A.INTEL_PROPERTY,
-			A.QUEN_CHING,
-			A.FOREIGN_CURRENCY,
-			A.FOREIGNCURRENCYA_MOUNT,
-			A.NOIN_SURANCE,
-			A.ALLEN_DAMAGE,
-			A.ORIGIN_VIOLATION,
-			A.INHIBITION_SOCIALSAFETY,
-			A.SAIL_PEOPLE,
-			A.SAIL_OUTSIDE,
-			A.DRUG_ADMINISTRATION,
-			A.CARRYON_OFDRUGS,
-			A.DRUG_SALE,
-			A.DRUG_ITEM,
-			A.DRUG_GUANTITY,
-			A.DRUG_AMOUNT,
-			A.OMOF_TRANSPORT,
-			A.DIRECT_SMUGGLING,
-			A.OTHERMENSOF_DIRECT
-		  FROM T_ITN_ARREST_INFO A,
-           (SELECT CODE, UP_CODE, CODE_NM FROM CD_CODE C WHERE GP_CODE = 'A001' ) C,  -- 시군구
-           TCODE D ,  -- 선적
-           TCODE E ,  -- 선종
-           (SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'T005' ) F, -- 무혐의 불구속
-           (SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'C001' ) G
-		 WHERE A.DEL_YN = 'N'
-       AND (A.ADDR_CITY = C.CODE AND A.ADDR_AREA = C.UP_CODE)
-       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
-		]]>
-		<if test="startDate != null and startDate != ''"><![CDATA[
-			AND A.ARST_DATE >= TO_DATE( #{startDate} || ' 00:00', 'YYYY-MM-DD hh24:mi')
-		]]></if>
-		<if test="endDate != null and endDate != ''"><![CDATA[
-			AND A.ARST_DATE <= TO_DATE( #{endDate} || ' 23:59', 'YYYY-MM-DD hh24:mi')
-		]]></if>
-		<if test="agencyType != null and agencyType != ''"><![CDATA[
-			AND A.AGENCY_TYPE = #{agencyType}
-		]]></if>
-		<if test="agencyGuard != null and agencyGuard != ''"><![CDATA[
-			AND A.AGENCY_GUARD = #{agencyGuard}
-		]]></if>
-		<if test="agencyVessel != null and agencyVessel != ''"><![CDATA[
-			AND A.AGENCY_VESSEL like '%' ||  #{agencyVessel} || '%'
-		]]></if>
-		<if test="addrArea != null and addrArea != ''"><![CDATA[
-			AND A.ADDR_AREA = #{addrArea}
-		]]></if>
-		<if test="addrCity != null and addrCity != ''"><![CDATA[
-			AND A.ADDR_CITY = #{addrCity}
-		]]></if>
-		<if test="violateType != null and violateType != ''"><![CDATA[
-			AND A.VLTN_TYPE = #{violateType}
-		]]></if>
-		<if test="shipName != null and shipName != ''"><![CDATA[
-			AND A.SHIP_NAME LIKE '%' ||  #{shipName} || '%'
-		]]>
-		</if>
-		<if test="invasionType == null or invasionType.length == 0">
-			AND 1 = 0
-		</if>
-		
-		
-		
-		<if test="shipType != null and shipType.length > 0">
-			AND A.SHIP_TYPE IN
-			<foreach collection="shipType" item="type" open="(" close=")"
-				separator=",">
-				#{type}
-			</foreach>
-		</if>		
-		<if test="shipType == null or shipType.length == 0">
-			AND 1 = 0
-		</if>
-		
-		<if test="procCondition != null and procCondition.length > 0">
-			AND A.PROC_COND IN
-			<foreach collection="procCondition" item="type" open="("
-				close=")" separator=",">
-				#{type}
-			</foreach>
-		</if>
-		<if test="procCondition == null or procCondition.length == 0">
-			AND 1 = 0
-		</if>
-		
-		<if test="arrShipTonnage != null and arrShipTonnage.length > 0">
-			<choose>
-				<when test="arrShipTonnage.length == 1 and arrShipTonnage[0] == '01'"><![CDATA[
-					AND A.SHIP_TONNAGE < 50
-				]]></when>
-				<when test="arrShipTonnage.length.equals(1) and arrShipTonnage[0].equals('02')"><![CDATA[
-					AND A.SHIP_TONNAGE >= 50 AND A.SHIP_TONNAGE < 100
-				]]></when>
-				<when test="arrShipTonnage.length.equals(1) and arrShipTonnage[0].equals('03')"><![CDATA[
-					AND A.SHIP_TONNAGE >= 100
-				]]></when>
-				<when
-					test="arrShipTonnage.length.equals(2) and arrShipTonnage[0].equals('01') and arrShipTonnage[1].equals('02')"><![CDATA[
-					AND ( A.SHIP_TONNAGE < 50 OR ( A.SHIP_TONNAGE  >= 50 AND A.SHIP_TONNAGE < 100 ) )
-				]]></when>
-				<when
-					test="arrShipTonnage.length.equals(2) and arrShipTonnage[0].equals('01') and arrShipTonnage[1].equals('03')"><![CDATA[
-					AND ( A.SHIP_TONNAGE < 50 OR A.SHIP_TONNAGE >= 100 )
-				]]></when>
-				<when
-					test="arrShipTonnage.length.equals(2) and arrShipTonnage[0].equals('02') and arrShipTonnage[1].equals('03')"><![CDATA[
-					AND ( A.SHIP_TONNAGE >= 100 OR ( A.SHIP_TONNAGE  >= 50 AND A.SHIP_TONNAGE < 100 ) )
-				]]></when>
-				<otherwise>
-					AND 1 = 1
-				</otherwise>
-			</choose>
-		</if>
-		<if test="arrShipTonnage == null or arrShipTonnage.length == 0">
-			AND 1 = 0
-		</if>
-		
-		<if test="marginPayment != null and marginPayment.length > 0">
-			AND A.MRGN_PYMT_YN LIKE '%'
-		</if>
-		<if test="marginPayment == null or marginPayment.length == 0">
-			AND 1 = 0
-		</if>
-		
-		<if test="shipProcType != null and shipProcType.length > 0">
-			AND A.SHIP_PROC_TYPE IN
-			<foreach collection="shipProcType" item="type" open="("
-				close=")" separator=",">
-				#{type}
-			</foreach>
-		</if>
-		<if test="shipProcType == null or shipProcType.length == 0">
-			AND 1 = 0
-		</if>
-		
-		<if test="shipQuality != null and shipQuality.length > 0">
-			AND A.SHIP_QLTY IN
-			<foreach collection="shipQuality" item="type" open="(" close=")"
-				separator=",">
-				#{type}
-			</foreach>
-		</if>
-		<if test="shipQuality == null or shipQuality.length == 0">
-			AND 1 = 0
-		</if>
-		
-		<if test="shipMent != null and shipMent.length > 0">
-			AND A.SHIP_MENT IN
-			<foreach collection="shipMent" item="type" open="(" close=")"
-				separator=",">
-				#{type}
-			</foreach>
-		</if>
-		<if test="shipMent == null or shipMent.length == 0">
-			AND 1 = 0
-		</if>		
-		<![CDATA[
-		)
-		]]>
+    FROM (SELECT
+            A.ID    ,
+            TO_CHAR(A.ARST_DATE, 'YYYY-MM-DD hh24:mi') ARST_DATE,
+            A.LAT_D    ,
+            A.LAT_M    ,
+            A.LAT_S    ,
+            A.LON_D    ,
+            A.LON_M    ,
+            A.LON_S    ,
+            A.ADDR_AREA    ,
+            A.ADDR_CITY    ,
+            A.SHIP_CREW_CNT,
+            A.VIO_CNT,
+            A.VIO_PRTD_AMT,
+            A.DTTN_CAP_CNT::int,
+            A.DTTN_ENG_CNT::INT,
+            A.DTTN_MATE_CNT::INT,
+            A.DTTN_CREW_CNT::INT,
+            A.gear_cast,
+            A.gear_width,
+            C.CODE_NM ADDR_STR,
+            A.ADDR_DTL    ,
+            A.VLTN_TYPE    ,
+            A.VLTN_DTL,
+            A.IVSN_TYPE,
+            (A.DTTN_CAP_CNT::int + A.DTTN_MATE_CNT::int + A.DTTN_ENG_CNT::int + A.DTTN_CREW_CNT::int) DTTN_TOTAL_CNT,
+            TO_CHAR(A.ARST_DATE, 'YYYY-MM-DD hh24:mi') ARST_DATE,
+            TO_CHAR(MRGN_PYMT_DATE, 'YYYY-MM-DD hh24:mi') MRGN_PYMT_DATE	,
+            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	,
+            C.CODE_NM ADDR_STR,
+            D.CODENM SHIP_MENT_STR,
+            E.CODENM SHIP_TYPE_STR,
+            F.CODENM WO_DTTN_STR,
+            G.CODENM AGENCY_GUARD_STR ,
+            H.CODENM SHIP_QLTY_STR,
+            I.CODE_NM ADDR_AREA_STR,
+            case A.PROC_COND
+              when '01' then 1
+              else  0
+            end PROC_COND1,
+            case A.PROC_COND
+              when '02' then 1
+              else  0
+            end PROC_COND2,
+            case A.NLL_YN
+              when 'Y' then 1
+              else  0
+            end NLL,
+            case A.IVSN_TYPE
+              when 'YRB2' then 1
+              else  0
+            end IVSN_TYPE1,
+            case A.IVSN_TYPE
+              when 'YRD1' then 1
+              else  0
+            end IVSN_TYPE2,
+            case A.IVSN_TYPE
+              when 'YRA1' then 1
+              else  0
+            end IVSN_TYPE3,
+            case A.IVSN_TYPE
+              when 'YRB1' then 1
+              else  0
+            end IVSN_TYPE4,
+            case A.SPEC_BATL_YN
+              when 'Y' then 1
+              else  0
+            end SPEC_BATL,
+            case A.PROC_COND
+              when '02' then 1
+              else  0
+            end PROC_COND_Y,
+            case A.PROC_COND
+              when '01' then 1
+              else  0
+            end PROC_COND_N,
+            case A.MRGN_PYMT_YN
+              when 'Y' then A.MRGN_PYMT_AMT
+              else  0
+            end MRGN_PYMT_AMT,
+            case A.MRGN_PYMT_YN
+              when 'N' then A.MRGN_PYMT_AMT
+              else  0
+            end NO_MRGN_PYMT_AMT,
+            case A.MRGN_PYMT_YN
+              when 'N' then 1
+              else  0
+            end PYMT_N_CNT,
+            case A.MRGN_PYMT_YN
+              when 'N' then 1
+              else  0
+            end NOT_PAYMENT,
+            case A.SHIP_PROC_TYPE
+              when '01' then 1
+              else  0
+            end SHIP_PROC_TYPE_A,
+            case A.SHIP_PROC_TYPE
+              when '02' then 1
+              else  0
+            end SHIP_PROC_TYPE_B,
+            case A.SHIP_PROC_TYPE
+              when '03' then 1
+              else  0
+            end SHIP_PROC_TYPE_C,
+            case A.SHIP_PROC_TYPE
+              when '04' then 1
+              else  0
+            end SHIP_PROC_TYPE_D,
+            case A.SHIP_PROC_TYPE
+              when '05' then 1
+              else  0
+            end SHIP_PROC_TYPE_E,
+            case A.FIELD_ARST_DATE
+              when null then 0
+              else  1
+            end FIELD_CNT
+        FROM T_ITN_ARREST_INFO A
+            inner join CD_CODE C on C.GP_CODE = 'A001' AND A.ADDR_CITY = C.CODE AND A.ADDR_AREA = C.UP_CODE  -- 시군구
+            inner join TCODE D on A.SHIP_MENT = D.CODE2 AND D.CODE1 = 'SSRR'  -- 선적
+            inner join TCODE E on A.SHIP_TYPE = E.CODE2 AND E.CODE1 = 'FA81'  -- 선종
+            inner join TCODE F on F.CODE1 = 'T005' AND A.WO_DTTN_TYPE = F.CODE2 -- 무혐의불구속
+            left outer join TCODE G on G.CODE1 = 'C001' and G.CODE2 = A.AGENCY_GUARD --
+            inner join TCODE H on H.CODE1 = 'T004' AND A.SHIP_QLTY = H.CODE2 -- 선질
+            inner join CD_CODE I on I.GP_CODE = 'A001' AND I.UP_CODE ='0000' AND A.ADDR_AREA = I.CODE -- 특별광역시도
+        WHERE A.DEL_YN = 'N'
+        <if test="startDate != null and startDate != ''">
+          AND A.ARST_DATE >= TO_DATE( #{startDate} || ' 00:00', 'YYYY-MM-DD hh24:mi')
+        </if>
+        <if test="endDate != null and endDate != ''">
+          AND A.ARST_DATE &lt;= TO_DATE( #{endDate} || ' 23:59', 'YYYY-MM-DD hh24:mi')
+        </if>
+        <if test="agencyType != null and agencyType != ''">
+          AND A.AGENCY_TYPE = #{agencyType}
+        </if>
+        <if test="agencyGuard != null and agencyGuard != ''">
+          AND A.AGENCY_GUARD = #{agencyGuard}
+        </if>
+        <if test="agencyVessel != null and agencyVessel != ''">
+          AND A.AGENCY_VESSEL like '%' ||  #{agencyVessel} || '%'
+        </if>
+        <if test="addrArea != null and addrArea != ''">
+          AND A.ADDR_AREA = #{addrArea}
+        </if>
+        <if test="addrCity != null and addrCity != ''">
+          AND A.ADDR_CITY = #{addrCity}
+        </if>
+        <if test="violateType != null and violateType != ''">
+          AND A.VLTN_TYPE = #{violateType}
+        </if>
+        <if test="shipName != null and shipName != ''">
+          AND A.SHIP_NAME LIKE '%' ||  #{shipName} || '%'
+        
+        </if>
+        <if test="shipType != null and shipType.length > 0">
+          AND A.SHIP_TYPE IN
+          <foreach collection="shipType" item="type" open="(" close=")"
+            separator=",">
+            #{type}
+          </foreach>
+        </if>
+        <if test="procCondition != null and procCondition.length > 0">
+          AND A.PROC_COND IN
+          <foreach collection="procCondition" item="type" open="("
+            close=")" separator=",">
+            #{type}
+          </foreach>
+        </if>
+        <if test="arrShipTonnage != null and arrShipTonnage.length > 0">
+          <choose>
+            <when test="arrShipTonnage.length == 1 and arrShipTonnage[0] == '01'">
+              AND A.SHIP_TONNAGE &lt;50
+            </when>
+            <when test="arrShipTonnage.length.equals(1) and arrShipTonnage[0].equals('02')">
+              AND A.SHIP_TONNAGE >= 50 AND A.SHIP_TONNAGE &lt;100
+            </when>
+            <when test="arrShipTonnage.length.equals(1) and arrShipTonnage[0].equals('03')">
+              AND A.SHIP_TONNAGE >= 100
+            </when>
+            <when
+              test="arrShipTonnage.length.equals(2) and arrShipTonnage[0].equals('01') and arrShipTonnage[1].equals('02')">
+              AND ( A.SHIP_TONNAGE &lt;50 OR ( A.SHIP_TONNAGE  >= 50 AND A.SHIP_TONNAGE &lt;100 ) )
+            </when>
+            <when
+              test="arrShipTonnage.length.equals(2) and arrShipTonnage[0].equals('01') and arrShipTonnage[1].equals('03')">
+              AND ( A.SHIP_TONNAGE &lt;50 OR A.SHIP_TONNAGE >= 100 )
+            </when>
+            <when
+              test="arrShipTonnage.length.equals(2) and arrShipTonnage[0].equals('02') and arrShipTonnage[1].equals('03')">
+              AND ( A.SHIP_TONNAGE >= 100 OR ( A.SHIP_TONNAGE  >= 50 AND A.SHIP_TONNAGE &lt;100 ) )
+            </when>
+          </choose>
+        </if>
+        <if test="marginPayment != null and marginPayment.length > 0">
+          AND A.MRGN_PYMT_YN LIKE '%'
+        </if>
+        <if test="shipProcType != null and shipProcType.length > 0">
+          AND A.SHIP_PROC_TYPE IN
+          <foreach collection="shipProcType" item="type" open="("
+            close=")" separator=",">
+            #{type}
+          </foreach>
+        </if>
+        <if test="shipQuality != null and shipQuality.length > 0">
+          AND A.SHIP_QLTY IN
+          <foreach collection="shipQuality" item="type" open="(" close=")"
+            separator=",">
+            #{type}
+          </foreach>
+        </if>
+        <if test="shipMent != null and shipMent.length > 0">
+          AND A.SHIP_MENT IN
+          <foreach collection="shipMent" item="type" open="(" close=")"
+            separator=",">
+            #{type}
+          </foreach>
+        </if>
+		) a
 	</select>
 	
-	<select id="getArrestListCountExcel" parameterType="arrestSearchVO"
-		resultMap="arrestResult">
-	<![CDATA[
-	SELECT /*+IDX_T_ITN_ARREST_INFO*/
-	       SUM(IVSN_TYPE1) IVSN_TYPE1,	 
-		   SUM(IVSN_TYPE2) IVSN_TYPE2,
-		   SUM(IVSN_TYPE3) IVSN_TYPE3,
-		   SUM(IVSN_TYPE4) IVSN_TYPE4,
-		   SUM(SPEC_BATL) SPEC_BATL_YN,
-		   SUM(NLL) NLL_YN,
-		   SUM(SHIP_CREW_CNT) SHIP_CREW_CNT,
-		   SUM(VIO_CNT) VIO_CNT,
-		   SUM(VIO_PRTD_AMT) VIO_PRTD_AMT,
-		   
-		   SUM(PROC_COND1) PROC_COND_N,
-		   SUM(PROC_COND2) PROC_COND_Y,
-		   '' LEAD_DISTANCE,
-		   '' SHIP_TONNAGE,
-		   SUM(PYMT_Y_AMT) MRGN_PYMT_AMT,
-		   SUM(PYMT_N_AMT) NO_MRGN_PYMT_AMT, 
-		   SUM(PYMT_N_CNT) PYMT_N_CNT,
-		   
-		   SUM(SHIP_PROC_TYPE_A) SHIP_PROC_TYPE_A,
-		   SUM(SHIP_PROC_TYPE_B) SHIP_PROC_TYPE_B,
-		   SUM(SHIP_PROC_TYPE_C) SHIP_PROC_TYPE_C,
-		   SUM(SHIP_PROC_TYPE_D) SHIP_PROC_TYPE_D,
-		   SUM(SHIP_PROC_TYPE_E) SHIP_PROC_TYPE_E,
-		   
-		   SUM(DTTN_CAP_CNT) DTTN_CAP_CNT,
-		   SUM(DTTN_ENG_CNT) DTTN_ENG_CNT,
-		   SUM(DTTN_MATE_CNT) DTTN_MATE_CNT,
-		   SUM(DTTN_CREW_CNT) DTTN_CREW_CNT,
-		   SUM(DTTN_CAP_CNT) + SUM(DTTN_ENG_CNT) + SUM(DTTN_MATE_CNT) + SUM(DTTN_CREW_CNT) DTTN_TOTAL_CNT,
-		   
-		   SUM(GEAR_CAST) GEAR_CAST,
-		   SUM(GEAR_WIDTH) GEAR_WIDTH,
-		   SUM(FIELD_CNT) FIELD_CNT,
-		   COUNT(*) TOTAL_CNT
-	 FROM	   
-	   (
-		SELECT
-		    A.ID	,
-			TO_CHAR(A.ARST_DATE, 'YYYY-MM-DD hh24:mi') ARST_DATE,
-			A.LAT_D	,
-			A.LAT_M	,
-			A.LAT_S	,
-			A.LON_D	,
-			A.LON_M	,
-			A.LON_S	,
-			A.ADDR_AREA	,
-			A.ADDR_CITY	,
-      		C.CODE_NM ADDR_STR,
-			A.ADDR_DTL	,
-			A.VLTN_TYPE	,
-      		A.VLTN_DTL,
-			A.IVSN_TYPE	,
-			DECODE(A.IVSN_TYPE, 'YRB2', 1, 0) IVSN_TYPE1,
-			DECODE(A.IVSN_TYPE, 'YRD1', 1, 0) IVSN_TYPE2,
-			DECODE(A.IVSN_TYPE, 'YRA1', 1, 0) IVSN_TYPE3,
-			DECODE(A.IVSN_TYPE, 'YRB1', 1, 0) IVSN_TYPE4,
-			
-			DECODE(A.SPEC_BATL_YN , 'Y', 1, 0) SPEC_BATL,
-			A.NLL_YN NLL,
-			A.AGENCY_TYPE	,
-			A.AGENCY_GUARD	,
-			G.CODENM AGENCY_GUARD_STR ,
-			A.AGENCY_VESSEL	,
-			A.SHIP_NAME	,
-			A.SHIP_TONNAGE	,
-			A.SHIP_CREW_CNT	,
-			A.SHIP_QLTY	,
-			A.SHIP_MENT	,      
-      		D.CODENM SHIP_MENT_STR,        
-			A.SHIP_PORT_NAME	,
-			A.CAP_NAME	,
-			A.CAP_CHN_NAME	,
-			A.CAP_AGE	,
-			A.SHIP_TYPE	,
-      		E.CODENM SHIP_TYPE_STR,
-			A.VIO_FISH	,
-			A.VIO_CNT	,
-			A.VIO_PRTD_AMT	,
-			A.PROC_COND	,
-			DECODE(A.PROC_COND, '01', 1, 0) PROC_COND1,
-			DECODE(A.PROC_COND, '02', 1, 0) PROC_COND2,
-			A.MRGN_PYMT_YN	,
-			DECODE(A.MRGN_PYMT_YN, 'N', 1, 0) PYMT_N_CNT,
-			A.MRGN_PYMT_AMT	,
-			DECODE(MRGN_PYMT_YN, 'Y', MRGN_PYMT_AMT, 0) PYMT_Y_AMT,
-			DECODE(MRGN_PYMT_YN, 'N', MRGN_PYMT_AMT, 0) PYMT_N_AMT,
-			
-			TO_CHAR(MRGN_PYMT_DATE, 'YYYY-MM-DD') MRGN_PYMT_DATE	,
-			A.SHIP_PROC_TYPE	,
-			DECODE(A.SHIP_PROC_TYPE, '01', 1, 0) SHIP_PROC_TYPE_A,
-			DECODE(A.SHIP_PROC_TYPE, '02', 1, 0) SHIP_PROC_TYPE_B,
-			DECODE(A.SHIP_PROC_TYPE, '03', 1, 0) SHIP_PROC_TYPE_C,
-			DECODE(A.SHIP_PROC_TYPE, '04', 1, 0) SHIP_PROC_TYPE_D,
-			DECODE(A.SHIP_PROC_TYPE, '05', 1, 0) SHIP_PROC_TYPE_E,
-			
-			A.DTTN_CAP_CNT	,
-			A.DTTN_MATE_CNT	,
-			A.DTTN_ENG_CNT	,
-			A.DTTN_CREW_CNT	,
-			A.WO_DTTN_TYPE	,
-      		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, 0, 1) FIELD_CNT,
-			A.LEAD_DISTANCE	,
-			A.LEAD_HOUR	,
-			A.LEAD_NUMBER	,
-			A.LEAD_MINUTE	,
-			A.GEAR_CAST	,
-			A.GEAR_WIDTH	,
-			A.GEAR_ETC	,
-			A.STATUS	,
-			A.DEL_YN	,
-			A.REG_DATE	,
-			A.REG_USER	,
-			A.REG_AGENCY,
-			A.TRAMSPOR_TATION,
-			A.FOREIGN_CREW,
-			A.ITEM_TEST,
-			A.REMARKS_LIST,
-			A.AVIOLENT_CRIME,
-			A.VIOLENT_CRIME,
-			A.INTELLIGENT_CRIME,
-			A.THEFT_CRIME,
-			A.SPECIAL_LAW,
-			A.ARRANGE_TRANSPORT,
-			A.ILLENGAL_MOVE,
-			A.TRAN_SPORTATION,
-			A.QUANTITY_CAP,
-			A.PRICE_MONEY,
-			A.TARGET_COUNTRY,
-			A.ESCAPE_CHINA,
-			A.EMPLOYMENT_CHINA,
-			A.ETC_CHINA,
-			A.ESCAPE_JAPAN,
-			A.EMPLYMENT_JAPAN,
-			A.ETC_JAPAN,
-			A.ESCAPE_COUNTRIES,
-			A.EMPLOYMENT_COUNTRIES,
-			A.ETC_COUNTRIES,
-			A.SMUGGLING_NAME,
-			A.SMUGGLING_CHN,
-			A.SMUGGLING_AGE,
-			A.SMUGGLING_WORLD,
-			A.SPILL_TARGET,
-			A.AMOUNTOF_COMPENSATION,
-			A.INTEL_PROPERTY,
-			A.QUEN_CHING,
-			A.FOREIGN_CURRENCY,
-			A.FOREIGNCURRENCYA_MOUNT,
-			A.NOIN_SURANCE,
-			A.ALLEN_DAMAGE,
-			A.ORIGIN_VIOLATION,
-			A.INHIBITION_SOCIALSAFETY,
-			A.SAIL_PEOPLE,
-			A.SAIL_OUTSIDE,
-			A.DRUG_ADMINISTRATION,
-			A.CARRYON_OFDRUGS,
-			A.DRUG_SALE,
-			A.DRUG_ITEM,
-			A.DRUG_GUANTITY,
-			A.DRUG_AMOUNT,
-			A.OMOF_TRANSPORT,
-			A.DIRECT_SMUGGLING,
-			A.OTHERMENSOF_DIRECT
-		  FROM T_ITN_ARREST_INFO A,
-           (SELECT CODE, UP_CODE, CODE_NM FROM CD_CODE C WHERE GP_CODE = 'A001' ) C,  -- 시군구
-           TCODE D ,  -- 선적
-           TCODE E ,  -- 선종
-           TCODE F ,  -- 무혐의불구속
-           (SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'C001' ) G
-		 WHERE DEL_YN = 'N'
-       AND (A.ADDR_CITY = C.CODE AND A.ADDR_AREA = C.UP_CODE)
-       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 F.CODE1 = 'T005')
-       AND G.CODE2(+) = A.AGENCY_GUARD
-		]]>
+	<select id="getArrestListCountExcel" parameterType="arrestSearchVO" resultMap="arrestResult">
+    SELECT
+        SUM(IVSN_TYPE1) IVSN_TYPE1,
+        SUM(IVSN_TYPE2) IVSN_TYPE2,
+        SUM(IVSN_TYPE3) IVSN_TYPE3,
+        SUM(IVSN_TYPE4) IVSN_TYPE4,
+        SUM(SPEC_BATL) SPEC_BATL_YN,
+        SUM(NLL) NLL_YN,
+        SUM(SHIP_CREW_CNT::int) SHIP_CREW_CNT,
+        SUM(VIO_CNT) VIO_CNT,
+        SUM(VIO_PRTD_AMT) VIO_PRTD_AMT,
+        SUM(PROC_COND1) PROC_COND_N,
+        SUM(PROC_COND2) PROC_COND_Y,
+        '' LEAD_DISTANCE,
+        '' SHIP_TONNAGE,
+        SUM(PYMT_Y_AMT) MRGN_PYMT_AMT,
+        SUM(PYMT_N_AMT) NO_MRGN_PYMT_AMT,
+        SUM(PYMT_N_CNT) PYMT_N_CNT,
+        SUM(SHIP_PROC_TYPE_A) SHIP_PROC_TYPE_A,
+        SUM(SHIP_PROC_TYPE_B) SHIP_PROC_TYPE_B,
+        SUM(SHIP_PROC_TYPE_C) SHIP_PROC_TYPE_C,
+        SUM(SHIP_PROC_TYPE_D) SHIP_PROC_TYPE_D,
+        SUM(DTTN_CAP_CNT) DTTN_CAP_CNT,
+        SUM(DTTN_ENG_CNT) DTTN_ENG_CNT,
+        SUM(DTTN_MATE_CNT) DTTN_MATE_CNT,
+        SUM(DTTN_CREW_CNT) DTTN_CREW_CNT,
+        SUM(DTTN_CAP_CNT) + SUM(DTTN_ENG_CNT) + SUM(DTTN_MATE_CNT) + SUM(DTTN_CREW_CNT) DTTN_TOTAL_CNT,
+        SUM(GEAR_CAST) GEAR_CAST,
+        SUM(GEAR_WIDTH) GEAR_WIDTH,
+        SUM(FIELD_CNT) FIELD_CNT,
+        COUNT(*) TOTAL_CNT
+    FROM (SELECT
+            A.ID    ,
+            TO_CHAR(A.ARST_DATE, 'YYYY-MM-DD hh24:mi') ARST_DATE,
+            A.LAT_D    ,
+            A.LAT_M    ,
+            A.LAT_S    ,
+            A.LON_D    ,
+            A.LON_M    ,
+            A.LON_S    ,
+            A.ADDR_AREA    ,
+            A.ADDR_CITY    ,
+            A.SHIP_CREW_CNT,
+            A.VIO_CNT,
+            A.VIO_PRTD_AMT,
+            A.DTTN_CAP_CNT::int,
+            A.DTTN_ENG_CNT::INT,
+            A.DTTN_MATE_CNT::INT,
+            A.DTTN_CREW_CNT::INT,
+            A.gear_cast,
+            A.gear_width,
+            C.CODE_NM ADDR_STR,
+            A.ADDR_DTL    ,
+            A.VLTN_TYPE    ,
+            A.VLTN_DTL,
+            A.IVSN_TYPE,
+            (A.DTTN_CAP_CNT::int + A.DTTN_MATE_CNT::int + A.DTTN_ENG_CNT::int + A.DTTN_CREW_CNT::int) DTTN_TOTAL_CNT,
+            TO_CHAR(A.ARST_DATE, 'YYYY-MM-DD hh24:mi') ARST_DATE,
+            TO_CHAR(MRGN_PYMT_DATE, 'YYYY-MM-DD hh24:mi') MRGN_PYMT_DATE	,
+            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	,
+            C.CODE_NM ADDR_STR,
+            D.CODENM SHIP_MENT_STR,
+            E.CODENM SHIP_TYPE_STR,
+            F.CODENM WO_DTTN_STR,
+            G.CODENM AGENCY_GUARD_STR ,
+            H.CODENM SHIP_QLTY_STR,
+            I.CODE_NM ADDR_AREA_STR,
+            case A.PROC_COND
+              when '01' then 1
+              else 0
+            end PROC_COND1,
+            case A.PROC_COND
+              when '02' then 1
+              else 0
+            end PROC_COND2,
+            case A.NLL_YN
+              when 'Y' then 1
+              else 0
+            end NLL,
+            case A.IVSN_TYPE
+              when 'YRB2' then 1
+              else 0
+            end IVSN_TYPE1,
+            case A.IVSN_TYPE
+              when 'YRD1' then 1
+              else 0
+            end IVSN_TYPE2,
+            case A.IVSN_TYPE
+              when 'YRA1' then 1
+              else 0
+            end IVSN_TYPE3,
+            case A.IVSN_TYPE
+              when 'YRB1' then 1
+              else 0
+            end IVSN_TYPE4,
+            case A.SPEC_BATL_YN
+              when 'Y' then 1
+              else 0
+            end SPEC_BATL,
+            case A.PROC_COND
+              when '02' then 1
+              else 0
+            end PROC_COND_Y,
+            case A.PROC_COND
+              when '01' then 1
+              else 0
+            end PROC_COND_N,
+            case A.MRGN_PYMT_YN
+              when 'Y' then A.MRGN_PYMT_AMT
+              else 0
+            end PYMT_Y_AMT,
+            case A.MRGN_PYMT_YN
+              when 'N' then A.MRGN_PYMT_AMT
+              else 0
+            end PYMT_N_AMT,
+            case A.MRGN_PYMT_YN
+              when 'N' then 1
+              else 0
+            end PYMT_N_CNT,
+            case A.MRGN_PYMT_YN
+              when 'N' then 1
+              else 0
+            end NOT_PAYMENT,
+            case A.SHIP_PROC_TYPE
+              when '01' then 1
+              else 0
+            end SHIP_PROC_TYPE_A,
+            case A.SHIP_PROC_TYPE
+              when '02' then 1
+              else 0
+            end SHIP_PROC_TYPE_B,
+            case A.SHIP_PROC_TYPE
+              when '03' then 1
+              else 0
+            end SHIP_PROC_TYPE_C,
+            case A.SHIP_PROC_TYPE
+              when '04' then 1
+              else 0
+            end SHIP_PROC_TYPE_D,
+            case A.SHIP_PROC_TYPE
+              when '05' then 1
+              else 0
+            end SHIP_PROC_TYPE_E,
+            case A.FIELD_ARST_DATE
+              when null then 0
+              else 1
+            end FIELD_CNT
+        FROM T_ITN_ARREST_INFO A
+            inner join CD_CODE C on C.GP_CODE = 'A001' AND A.ADDR_CITY = C.CODE AND A.ADDR_AREA = C.UP_CODE  -- 시군구
+            inner join TCODE D on A.SHIP_MENT = D.CODE2 AND D.CODE1 = 'SSRR'  -- 선적
+            inner join TCODE E on A.SHIP_TYPE = E.CODE2 AND E.CODE1 = 'FA81'  -- 선종
+            inner join TCODE F on F.CODE1 = 'T005' AND A.WO_DTTN_TYPE = F.CODE2 -- 무혐의불구속
+            left outer join TCODE G on G.CODE1 = 'C001' and G.CODE2 = A.AGENCY_GUARD --
+            inner join TCODE H on H.CODE1 = 'T004' AND A.SHIP_QLTY = H.CODE2 -- 선질
+            inner join CD_CODE I on I.GP_CODE = 'A001' AND I.UP_CODE ='0000' AND A.ADDR_AREA = I.CODE -- 특별광역시도
+        WHERE A.DEL_YN = 'N'
 		<if test="startDate != null and startDate != ''"><![CDATA[
 			AND A.ARST_DATE >= TO_DATE( #{startDate} || ' 00:00', 'YYYY-MM-DD hh24:mi')
 		]]></if>