diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java index 8435c3c9..04b8e617 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java @@ -75,7 +75,7 @@ public class InternationalCrimeArrestService extends BaseService { ica.getSubInfo().setIcaKey(icaKey); break; } - if(ica.getSubInfo().getIcaKey()!=null){ + if(ica.getSubInfo()!=null && ica.getSubInfo().getIcaKey()!=null){ icaSubInfoRepository.save(ica.getSubInfo()); } return icaKey; diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiSelectModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiSelectModal.html new file mode 100644 index 00000000..f9cec94e --- /dev/null +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiSelectModal.html @@ -0,0 +1,183 @@ + + + + + + + + +
+
+ + + +
+
+
+
불법조업 외국어선 단속현황
+
+

외사통계 > 불법조업외국어선 > 불법조업 외국어선 단속현황

+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
순번사건번호MMSI.NO나포일시나포장소사건담당경찰서사건담당경찰관단속경찰서단속함정침범유형NLL침범여부압송여부작성자작성일시
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+ + +
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html index d9559323..f9cec94e 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html @@ -7,13 +7,7 @@
@@ -39,15 +33,15 @@
@@ -56,41 +50,18 @@
-
- -
- -
- - -
-
-
-
- -
-
- -
-
- -
-
- -
-
-
+
+ +
+
+
- +
- + +
+
+
- - - -
-
@@ -374,166 +119,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -541,119 +140,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/illegalShipInfoPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/illegalShipInfoPage.html new file mode 100644 index 00000000..f9cec94e --- /dev/null +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/illegalShipInfoPage.html @@ -0,0 +1,183 @@ + + + + + + + + +
+
+ + + +
+
+
+
불법조업 외국어선 단속현황
+
+

외사통계 > 불법조업외국어선 > 불법조업 외국어선 단속현황

+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
순번나포일시위반내용위반장소침범유형NLL특수공무집행방해사건담당경찰서검거기관MMSI.NO(AIS)선박제원선장(출생년도)선종어획물 축소기재범칙물처리현황담보금납부(만원)담보금미납(만원)선박처리직접인계구속불구속현장조사압송영장청구 소요시간압수어구
무허가 조업 -
특정금지
-
(무허가, 정선명령위반)
-
-
EEZ
-
제한조건
-
영해침범발생건수인적피해물적피해구분선명톤수(톤)선원(명)선질선적어종어획량(kg)폐기량(kg)위판량(kg)위판금액(원)조사중완료척수납부액납부일시미납미납금액위탁관리위탁시작일위탁종료일퇴거직접인계공매폐선침몰환부일시해점인계함정중측인수함정선장항해장기관장선원구속척수(몰수판결)선장항해장기관장선원불구속척수틀(타망)폭(유망)조(형망)개(통발)기타
피해인원피해액(만원)상세내용발생건수피해액(만원)상세내용단순폐선폐선조건부공매
순번사건번호MMSI.NO나포일시나포장소사건담당경찰서사건담당경찰관 단속경찰서 단속함정이름출생년도어종수량나포일시석방일시소요시간소요시간거리(해리)침범유형NLL침범여부압송여부작성자작성일시
- - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
순번사건번호MMSI.NO나포일시나포장소사건담당경찰서사건담당경찰관단속경찰서단속함정침범유형NLL침범여부압송여부작성자작성일시
+
+
+
+
+ + +
+
+ +
+
+ +
+
+ + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html new file mode 100644 index 00000000..942c229b --- /dev/null +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html @@ -0,0 +1,112 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiSelectModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiSelectModal.html new file mode 100644 index 00000000..f9cec94e --- /dev/null +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiSelectModal.html @@ -0,0 +1,183 @@ + + + + + + + + +
+
+ + + +
+
+
+
불법조업 외국어선 단속현황
+
+

외사통계 > 불법조업외국어선 > 불법조업 외국어선 단속현황

+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
순번사건번호MMSI.NO나포일시나포장소사건담당경찰서사건담당경찰관단속경찰서단속함정침범유형NLL침범여부압송여부작성자작성일시
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+ + +
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html new file mode 100644 index 00000000..f8ac5370 --- /dev/null +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html @@ -0,0 +1,606 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html new file mode 100644 index 00000000..f9cec94e --- /dev/null +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html @@ -0,0 +1,183 @@ + + + + + + + + +
+
+ + + +
+
+
+
불법조업 외국어선 단속현황
+
+

외사통계 > 불법조업외국어선 > 불법조업 외국어선 단속현황

+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
순번사건번호MMSI.NO나포일시나포장소사건담당경찰서사건담당경찰관단속경찰서단속함정침범유형NLL침범여부압송여부작성자작성일시
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+ + +
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issEditModal.html new file mode 100644 index 00000000..942c229b --- /dev/null +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issEditModal.html @@ -0,0 +1,112 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html new file mode 100644 index 00000000..f8ac5370 --- /dev/null +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html @@ -0,0 +1,606 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/shipProcessInfoPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/shipProcessInfoPage.html new file mode 100644 index 00000000..f9cec94e --- /dev/null +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/shipProcessInfoPage.html @@ -0,0 +1,183 @@ + + + + + + + + +
+
+ + + +
+
+
+
불법조업 외국어선 단속현황
+
+

외사통계 > 불법조업외국어선 > 불법조업 외국어선 단속현황

+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
순번사건번호MMSI.NO나포일시나포장소사건담당경찰서사건담당경찰관단속경찰서단속함정침범유형NLL침범여부압송여부작성자작성일시
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+ + +
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html new file mode 100644 index 00000000..942c229b --- /dev/null +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html @@ -0,0 +1,112 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html new file mode 100644 index 00000000..f8ac5370 --- /dev/null +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html @@ -0,0 +1,606 @@ + + + + + + + + + + \ No newline at end of file