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 @@