diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatBaseEntity.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatBaseEntity.java index 21236b25..b9080ab0 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatBaseEntity.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatBaseEntity.java @@ -7,6 +7,7 @@ import lombok.Setter; import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; +import java.time.LocalDate; import java.time.LocalDateTime; @Getter @@ -52,8 +53,8 @@ public class FishingBoatBaseEntity extends BaseModel { @Column(name = "dambo_payment") private Double damboPayment=0d; @Column(name = "payment_payment_dt") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") - private LocalDateTime paymentPaymentDt; + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate paymentPaymentDt; @Column(name = "confiscation_frame") private String confiscationFrame; @Column(name = "confiscation_width") diff --git a/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipInfo.js b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipInfo.js index 87e57a9b..e661d385 100644 --- a/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipInfo.js +++ b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipInfo.js @@ -29,9 +29,6 @@ $(document).on('change', '#confiscationSelector', function (){ confiscationInput.removeAttr('disabled') } }) -$(document).on('change', '#paymentDate,#paymentTime', function (){ - $("#paymentPaymentDt").val($("#paymentDate").val()+" "+$("#paymentTime").val()) -}) $(document).on('click', '.saveEditInfoBtn', function (){ saveIllegalShipInfo($(this).attr("data-status")) }) diff --git a/src/main/resources/templates/common/modal/crackdownStatusModal.html b/src/main/resources/templates/common/modal/crackdownStatusModal.html index b540ab98..61346199 100644 --- a/src/main/resources/templates/common/modal/crackdownStatusModal.html +++ b/src/main/resources/templates/common/modal/crackdownStatusModal.html @@ -107,7 +107,7 @@ 일시 해점 인계함정 - 중측인수함정 + 중국측 인수함정 계 선장 향해장 diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html index 59d84cc2..4d9f5526 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html @@ -207,7 +207,7 @@
- +
-
+ +
@@ -145,7 +147,7 @@
- --> +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html index f0dba033..d5b25c0a 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html @@ -94,10 +94,6 @@
- -
- -
-
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiSelectModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiSelectModal.html index a29374e5..dda0bd45 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiSelectModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiSelectModal.html @@ -50,9 +50,6 @@
-
- -
@@ -85,7 +82,6 @@ 사건번호 - MMSI.NO 나포일시 나포장소 사건담당경찰서 @@ -104,7 +100,6 @@ -
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiViewModal.html index 9dacca73..b5d696ee 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiViewModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiViewModal.html @@ -78,10 +78,6 @@
- -
- -
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html index 4885cd23..c6f6451b 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html @@ -65,12 +65,12 @@
+
-
- -
@@ -103,7 +103,6 @@ 순번 사건번호 - MMSI.NO 나포일시 나포장소 사건담당경찰서 @@ -122,7 +121,6 @@ -
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/illegalShipInfoPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/illegalShipInfoPage.html index 812223bb..aa675cf7 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/illegalShipInfoPage.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/illegalShipInfoPage.html @@ -38,9 +38,6 @@
-
- -
@@ -97,7 +94,6 @@ 순번 사건번호 선명 - 허가번호 국적 승선원 톤수 @@ -114,7 +110,6 @@ - diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html index 943697f8..30e0aafc 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html @@ -35,10 +35,6 @@
- -
- -
@@ -114,13 +110,9 @@
- +
- -
- - -
+
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html index 05b6cc72..241d7226 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html @@ -14,10 +14,6 @@
- -
- -
@@ -82,7 +78,7 @@
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiSelectModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiSelectModal.html index 3d7901f5..64711706 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiSelectModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiSelectModal.html @@ -18,9 +18,6 @@
-
- -
@@ -77,7 +74,6 @@ 사건번호 선명 - 허가번호 국적 승선원 톤수 @@ -93,7 +89,6 @@ - diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html index 87324acd..d39436c6 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html @@ -45,10 +45,6 @@
- -
- -
@@ -113,7 +109,7 @@
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html index d484a697..d8e12d48 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html @@ -100,10 +100,6 @@
- -
- -
@@ -168,7 +164,7 @@
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html index ead499f4..06f9a256 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html @@ -138,7 +138,7 @@
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiHistoryDiv.html b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiHistoryDiv.html index 966f3eed..2ea3f2bd 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiHistoryDiv.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiHistoryDiv.html @@ -67,7 +67,7 @@
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html index 61f50f93..75aaac70 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html @@ -99,7 +99,7 @@
- +
@@ -143,10 +143,6 @@
- -
- -
@@ -211,7 +207,7 @@
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html b/src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html index 252e888f..5a69643c 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html @@ -187,10 +187,6 @@
- -
- -
@@ -344,7 +340,7 @@
- +