DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

불법조업 외국어선 마감 기능 추가.

master
강석 최 2023-02-02 10:17:28 +09:00
parent 5edd061b49
commit 30d990af65
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java
View File

@ -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.model.processResult.ProcessResult;
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.FishingBoatService; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.FishingBoatService;
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.UnlawfulFishingService; 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 com.dbnt.faisp.main.userInfo.model.UserInfo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.security.core.annotation.AuthenticationPrincipal;
@ -28,6 +29,7 @@ public class FishingBoatController {
private final FishingBoatService fishingBoatService; private final FishingBoatService fishingBoatService;
private final UnlawfulFishingService ufService; private final UnlawfulFishingService ufService;
private final CodeMgtService codeMgtService; private final CodeMgtService codeMgtService;
private final MenuMgtService menuMgtService;
@RequestMapping("/fishingBoat") @RequestMapping("/fishingBoat")
public ModelAndView fishingBoat(@AuthenticationPrincipal UserInfo loginUser, UnlawfulFishingParam params) { public ModelAndView fishingBoat(@AuthenticationPrincipal UserInfo loginUser, UnlawfulFishingParam params) {
@ -52,6 +54,7 @@ public class FishingBoatController {
yearList.add(params.getYear()); yearList.add(params.getYear());
} }
mav.addObject("yearList", yearList); mav.addObject("yearList", yearList);
mav.addObject("deadlineState", menuMgtService.selectDeadlineChk("/faStatistics/fishingBoat"));
mav.addObject("searchParams", params); mav.addObject("searchParams", params);
return mav; return mav;
} }

7
src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html
View File

@ -4,6 +4,7 @@
layout:decorate="~{layout/layout}"> layout:decorate="~{layout/layout}">
<th:block layout:fragment="script"> <th:block layout:fragment="script">
<script type="text/javascript" th:src="@{/js/faStatistics/fishingBoatMgt.js}"></script> <script type="text/javascript" th:src="@{/js/faStatistics/fishingBoatMgt.js}"></script>
<script type="text/javascript" th:src="@{/js/menuMgt/deadline.js}"></script>
</th:block> </th:block>
<th:block layout:fragment="css"> <th:block layout:fragment="css">
<style> <style>
@ -243,7 +244,9 @@
</div> </div>
</div> </div>
<div class="row justify-content-between"> <div class="row justify-content-between">
<div class="col-auto"></div> <div class="col-auto">
<button class="btn btn-warning" id="deadlineBtn" data-menukey="51" th:data-deadlinechk="${deadlineState}" th:if="${accessAuth eq 'ACC003'}" th:text="${deadlineState eq 'F'?'마감':'등록허용'}"></button>
</div>
<div class="col-auto"> <div class="col-auto">
<nav aria-label="Page navigation"> <nav aria-label="Page navigation">
<ul class="pagination mb-0"> <ul class="pagination mb-0">
@ -270,7 +273,7 @@
</nav> </nav>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<input type="button" class="btn btn-success" value="등록" id="getFishingBoatEditModalBtn"> <input type="button" class="btn btn-success" value="등록" id="getFishingBoatEditModalBtn" th:disabled="${deadlineState eq 'T'}">
</div> </div>
</div> </div>
</div> </div>