From 30d990af65ef5b97b6b4fe3a79193c17531f7e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Thu, 2 Feb 2023 10:17:28 +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=EB=A7=88=EA=B0=90=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crackdownsStatus/FishingBoatController.java | 3 +++ .../templates/faStatistics/fishingBoat/fishingBoatMgt.html | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java index e10b7c7e..0b458426 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java @@ -9,6 +9,7 @@ import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.Fishi import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResult; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.FishingBoatService; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.UnlawfulFishingService; +import com.dbnt.faisp.main.menuMgt.service.MenuMgtService; import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; @@ -28,6 +29,7 @@ public class FishingBoatController { private final FishingBoatService fishingBoatService; private final UnlawfulFishingService ufService; private final CodeMgtService codeMgtService; + private final MenuMgtService menuMgtService; @RequestMapping("/fishingBoat") public ModelAndView fishingBoat(@AuthenticationPrincipal UserInfo loginUser, UnlawfulFishingParam params) { @@ -52,6 +54,7 @@ public class FishingBoatController { yearList.add(params.getYear()); } mav.addObject("yearList", yearList); + mav.addObject("deadlineState", menuMgtService.selectDeadlineChk("/faStatistics/fishingBoat")); mav.addObject("searchParams", params); return mav; } diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html index f09bc233..7a4aecc3 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html @@ -4,6 +4,7 @@ layout:decorate="~{layout/layout}"> +