불법조업 외국어선 작업중.

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoat.java

@@ -41,4 +41,9 @@ public class FishingBoat extends FishingBoatBaseEntity {
   private String boatMaterialEtc;
   @Transient
   private String fisheryTypeEtc;
+
+  @Transient
+  private Double tonMin;
+  @Transient
+  private Double tonMax;
 }

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatBaseEntity.java

@@ -72,8 +72,8 @@ public class FishingBoatBaseEntity extends BaseModel {
   private String offenseFishSpecies;
   @Column(name = "offense_catch_cnt")
   private Integer offenseCatchCnt=0;
-  @Column(name = "save_yn")
+  @Column(name = "status")
-  private String saveYn;
+  private String status;
   @Column(name = "wrt_organ")
   private String wrtOrgan;
   @Column(name = "wrt_part")

src/main/resources/mybatisMapper/AsfCovMapper.xml

@@ -104,7 +104,7 @@
         , fb.catch_cnt
         , fb.offense_fish_species
         , fb.offense_catch_cnt
-        , fb.save_yn
+        , fb.status
 
         FROM asfcov_status a
         INNER JOIN crackdown_status cs

src/main/resources/mybatisMapper/CrackdownStatustMapper.xml

@@ -322,7 +322,7 @@
         , fb.catch_cnt
         , fb.offense_fish_species
         , fb.offense_catch_cnt
-        , fb.save_yn
+        , fb.status
         , pr.pr_key
         , pr.process_status
         , pr.eviction_dt

src/main/resources/static/js/faStatistics/fishingBoatMgt.js

@@ -146,11 +146,11 @@ $(document).on('click', '#sailorAddBtn', function (){
 $(document).on('click', '.sailorRemoveBtn', function (){
   $(this).parents(".sailorRestriction").remove();
 })
-$(document).on('click', '#saveTempBtn', function (){
+$(document).on('click', '.saveEditInfoBtn', function (){
-  saveFishingBoatInfo("N")
+  saveFishingBoatInfo($(this).attr("data-status"))
 })
-$(document).on('click', '#saveResultBtn', function (){
+$(document).on('change', '#napoDate, #napoTime', function (){
-  saveFishingBoatInfo("Y")
+  $("#napoDt").val($("#napoDate").val()+" "+$("#napoTime").val());
 })
 $(document).on('change', '.pressurizedTimeTaken', function (){
   $("#pressurizedTimeTaken").val($("#pressurizedTimeTakenDate").val()+"일 "+$("#pressurizedTimeTakenTime").val())
@@ -254,9 +254,9 @@ function getCrackdownBoatOption(categoryCd){
   });
 }
 
-function saveFishingBoatInfo(saveYn){
+function saveFishingBoatInfo(status){
   if(confirm("저장하시겠습니까?")){
-    $("#saveYn").val(saveYn)
+    $("#status").val(status)
     contentFade("in");
     const formData = new FormData($("#fishingBoatEditForm")[0]);
     for(const file of files) {

src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html

@@ -10,7 +10,7 @@
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <input type="hidden" name="cdsKey" id="cdsKey" th:value="${crackdownStatus.cdsKey}">
     <input type="hidden" name="fishingBoat.fbKey" th:value="${crackdownStatus.fishingBoat.fbKey}">
-    <input type="hidden" name="fishingBoat.saveYn" id="saveYn" th:value="${crackdownStatus.fishingBoat.saveYn}">
+    <input type="hidden" name="fishingBoat.status" id="status" th:value="${crackdownStatus.fishingBoat.status}">
     <input type="hidden" name="fishingBoat.wrtOrgan" th:value="${crackdownStatus.fishingBoat.wrtOrgan}">
     <input type="hidden" name="fishingBoat.wrtPart" th:value="${crackdownStatus.fishingBoat.wrtPart}">
     <input type="hidden" name="fishingBoat.wrtUserSeq" th:value="${crackdownStatus.fishingBoat.wrtUserSeq}">
@@ -76,9 +76,13 @@
           </div>
         </div>
         <div class="row mb-1">
-          <label for="napoDt" class="col-sm-1 col-form-label col-form-label-sm text-center">나포일시</label>
+          <label for="napoDate" class="col-sm-1 col-form-label col-form-label-sm text-center">나포일시</label>
           <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm crackdownStatusInfo dateTimeSelector" id="napoDt" name="napoDt" placeholder="0000-00-00 00:00" th:value="${#temporals.format(crackdownStatus.napoDt, 'yyyy-MM-dd')}" autocomplete="off">
+            <input type="hidden" id="napoDt" name="napoDt" th:value="${#temporals.format(crackdownStatus.napoDt, 'yyyy-MM-dd hh:mm')}">
+            <div class="input-group">
+              <input type="text" class="form-control form-control-sm crackdownStatusInfo dateSelector" id="napoDate" placeholder="0000-00-00" th:value="${#temporals.format(crackdownStatus.napoDt, 'yyyy-MM-dd')}" autocomplete="off">
+              <input type="text" class="form-control form-control-sm crackdownStatusInfo" id="napoTime" placeholder="00:00" th:value="${#temporals.format(crackdownStatus.napoDt, 'hh:mm')}" autocomplete="off">
+            </div>
           </div>
           <label for="napoSeaPointLon" class="col-sm-1 col-form-label col-form-label-sm text-center">나포장소</label>
           <div class="col-sm-5">
@@ -428,7 +432,11 @@
           </div>
           <label for="paymentPaymentDt" class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">담보금 납부일시</label>
           <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm fishingBoatInfo dateTimeSelector" id="paymentPaymentDt" name="fishingBoat.paymentPaymentDt" placeholder="0000-00-00 00:00" th:value="${crackdownStatus.fishingBoat.paymentPaymentDt}" autocomplete="off">
+            <input type="hidden" id="paymentPaymentDt" name="fishingBoat.paymentPaymentDt" th:value="${crackdownStatus.fishingBoat.paymentPaymentDt}">
+            <div class="input-group">
+              <input type="text" class="form-control form-control-sm fishingBoatInfo dateSelector" id="paymentPaymentDate" placeholder="0000-00-00" th:value="${crackdownStatus.fishingBoat.paymentPaymentDt}" autocomplete="off">
+              <input type="text" class="form-control form-control-sm fishingBoatInfo" id="paymentPaymentTime"  placeholder="00:00" th:value="${crackdownStatus.fishingBoat.paymentPaymentDt}" autocomplete="off">
+            </div>
           </div>
         </div>
         <div class="row mb-1">
@@ -720,7 +728,7 @@
   </form>
 </div>
 <div class="modal-footer bg-light">
-  <!--<button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>-->
+  <button type="button" class="btn btn-warning saveEditInfoBtn" data-status="DST001">임시저장</button>
-  <button type="button" class="btn btn-primary" id="saveResultBtn">저장</button>
+  <button type="button" class="btn btn-primary saveEditInfoBtn" data-status="DST007">저장</button>
   <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
 </div>

src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html

@@ -69,7 +69,10 @@
                         <input type="text" class="form-control form-control-sm" placeholder="선적지" name="boatNny" th:value="${searchParams.fishingBoat.boatNny}">
                       </div>
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" placeholder="톤수" name="tonCnt" th:value="${searchParams.fishingBoat.tonCnt>0?searchParams.fishingBoat.tonCnt:''}">
+                        <div class="input-group">
+                          <input type="text" class="form-control form-control-sm" placeholder="톤수~" name="tonMin" th:value="${searchParams.fishingBoat.tonMin>0?searchParams.fishingBoat.tonMin:''}">
+                          <input type="text" class="form-control form-control-sm" placeholder="톤수" name="tonMax" th:value="${searchParams.fishingBoat.tonMax>0?searchParams.fishingBoat.tonMax:''}">
+                        </div>
                       </div>
                     </div>
                     <div class="row justify-content-end">