From dabb0624672ada592de2bea2635fad2155899c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Fri, 13 Jan 2023 11:02:37 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B6=88=EB=B2=95=EC=A1=B0=EC=97=85=20?= =?UTF-8?q?=EC=99=B8=EA=B5=AD=EC=96=B4=EC=84=A0=20=EC=9E=91=EC=97=85?= =?UTF-8?q?=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/fishingBoat/FishingBoat.java | 5 +++++ .../fishingBoat/FishingBoatBaseEntity.java | 4 ++-- .../resources/mybatisMapper/AsfCovMapper.xml | 2 +- .../mybatisMapper/CrackdownStatustMapper.xml | 2 +- .../static/js/faStatistics/fishingBoatMgt.js | 12 +++++------ .../fishingBoat/fishingBoatEditModal.html | 20 +++++++++++++------ .../fishingBoat/fishingBoatMgt.html | 5 ++++- 7 files changed, 33 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoat.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoat.java index 5212315e..a5d0e271 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoat.java +++ b/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; } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatBaseEntity.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatBaseEntity.java index 3c3b19a1..4a2cebbe 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatBaseEntity.java +++ b/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") - private String saveYn; + @Column(name = "status") + private String status; @Column(name = "wrt_organ") private String wrtOrgan; @Column(name = "wrt_part") diff --git a/src/main/resources/mybatisMapper/AsfCovMapper.xml b/src/main/resources/mybatisMapper/AsfCovMapper.xml index 75164a25..52fc5ce6 100644 --- a/src/main/resources/mybatisMapper/AsfCovMapper.xml +++ b/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 diff --git a/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml b/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml index 060ecf13..5c3a2ec0 100644 --- a/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml +++ b/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 diff --git a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js index 3a4253df..bd8e5aeb 100644 --- a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js +++ b/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 (){ - saveFishingBoatInfo("N") +$(document).on('click', '.saveEditInfoBtn', function (){ + saveFishingBoatInfo($(this).attr("data-status")) }) -$(document).on('click', '#saveResultBtn', function (){ - saveFishingBoatInfo("Y") +$(document).on('change', '#napoDate, #napoTime', function (){ + $("#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) { diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html index 91035e80..09e16af6 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html @@ -10,7 +10,7 @@ - + @@ -76,9 +76,13 @@
- +
- + +
+ + +
@@ -428,7 +432,11 @@
- + +
+ + +
@@ -720,7 +728,7 @@
- - + +
\ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html index d908f067..f7b2dd5a 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html @@ -69,7 +69,10 @@
- +
+ + +