diff --git a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml
index b07dae37..d142293f 100644
--- a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml
+++ b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml
@@ -64,42 +64,37 @@
and case_agency = #{caseAgency}
-
- and case_police_officer like '%'||#{casePoliceOfficer}||'%'
-
-
- and crackdown_police = #{crackdownPolice}
-
and crackdown_boat = #{crackdownBoat}
-
- and case_num like '%'||#{caseNum}||'%'
-
-
- and mmsi like '%'||#{mmsi}||'%'
-
-
- and (napo_sea_point_lon like '%'||#{napoPoint}||'%'
- or napo_sea_point_lat like '%'||#{napoPoint}||'%'
- or napo_sea_point_detail like '%'||#{napoPoint}||'%')
-
-
-
- and napo_dt >= #{startDate}::date
-
-
- and napo_dt <= #{endDate}::date
-
-
-
-
- and wrt_dt >= #{startDate}::date
-
-
- and wrt_dt <= #{endDate}::date
-
+
+ and (napo_sea_point_lon like '%'||#{searchKeyword}||'%'
+ or napo_sea_point_lat like '%'||#{searchKeyword}||'%'
+ or napo_sea_point_detail like '%'||#{searchKeyword}||'%'
+ or case_police_officer like '%'||#{searchKeyword}||'%'
+ or case_num like '%'||#{searchKeyword}||'%'
+ or person_damage_detail like '%'||#{searchKeyword}||'%'
+ or material_damage_detail like '%'||#{searchKeyword}||'%'
+ or catch_fish_species like '%'||#{searchKeyword}||'%')
+
+
+
+ and napo_dt >= #{startDate}::date
+
+
+ and napo_dt <= #{endDate}::date
+
+
+
+
+ and wrt_dt >= #{startDate}::date
+
+
+ and wrt_dt <= #{endDate}::date
+
+
+
and (case_agency in
@@ -148,23 +143,15 @@
where a.status <> 'DST008'
-
- and b.case_num like '%'||#{caseNum}||'%'
-
-
- and a.permit_num like '%'||#{permitNum}||'%'
-
-
- and (a.boat_nny_sung like '%'||#{boatNny}||'%' or a.boat_nny_si like '%'||#{boatNny}||'%')
-
and (a.boat_name_kr like '%'||#{boatName}||'%' or a.boat_name_cn like '%'||#{boatName}||'%')
-
- and a.boat_material = #{boatMaterial}
-
-
- and a.fishery_type = #{fisheryType}
+
+ and (a.boat_nny_sung like '%'||#{searchKeyword}||'%'
+ or a.boat_nny_si like '%'||#{searchKeyword}||'%'
+ or a.nationality like '%'||#{searchKeyword}||'%'
+ or a.offense_type like '%'||#{searchKeyword}||'%'
+ or b.case_num like '%'||#{searchKeyword}||'%')
@@ -229,9 +216,6 @@
where a.status <> 'DST008'
-
- and c.case_num like '%'||#{caseNum}||'%'
-
and (b.boat_name_kr like '%'||#{boatName}||'%' or b.boat_name_cn like '%'||#{boatName}||'%')
@@ -241,11 +225,12 @@
and a.is_ivsgt_stop = #{isIvsgtStop}
-
- and a.sentencing_court like '%'||#{sentencingCourt}||'%'
-
-
- and a.sentencing_detail like '%'||#{sentencingDetail}||'%'
+
+ and (a.sentencing_detail like '%'||#{searchKeyword}||'%'
+ or a.sentencing_court like '%'||#{searchKeyword}||'%'
+ or c.case_num like '%'||#{searchKeyword}||'%'
+ or a.handover_boat like '%'||#{searchKeyword}||'%'
+ or a.middle_takeover_boat like '%'||#{searchKeyword}||'%')
diff --git a/src/main/resources/static/js/faStatistics/unlawfulFishing/crackdownInfo.js b/src/main/resources/static/js/faStatistics/unlawfulFishing/crackdownInfo.js
index a304a86a..5b0b7c8f 100644
--- a/src/main/resources/static/js/faStatistics/unlawfulFishing/crackdownInfo.js
+++ b/src/main/resources/static/js/faStatistics/unlawfulFishing/crackdownInfo.js
@@ -7,10 +7,6 @@ $(function(){
});
})
-$(document).on('change', '#searchFormPolice', function (){
- getChildOption(this.value, null, "#searchFormBoat");
-})
-
$(document).on('click', '#addCrackdownStatusBtn', function (){
getCdiEditModal(null);
})
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html
index c6f6451b..1e520487 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html
@@ -44,42 +44,25 @@