From 10b16e5a718e0dd51aa75b06df2eaa78312b9e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 9 Nov 2022 17:57:42 +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=A0=95=EB=B3=B4=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9E=91=EC=97=85=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FishingBoatController.java | 32 +- .../mapper/CrackdownStatusMapper.java | 2 + .../service/FishingBoatService.java | 8 +- .../mybatisMapper/CrackdownStatustMapper.xml | 58 +++ .../static/js/faStatistics/fishingBoatMgt.js | 25 ++ .../static/js/publicBoard/publicBoard.js | 4 +- .../fishingBoat/fishingBoatMgt.html | 136 ++++-- .../fishingBoat/fishingBoatViewModal.html | 405 ++++++++++++++++++ .../resources/templates/layout/layout.html | 2 +- 9 files changed, 619 insertions(+), 53 deletions(-) create mode 100644 src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html 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 71c431d6..42eed9b7 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 @@ -30,34 +30,42 @@ public class FishingBoatController { @RequestMapping("/fishingBoat") public ModelAndView fishingBoat(@AuthenticationPrincipal UserInfo loginUser, CrackdownStatus crackdownStatus) { ModelAndView mav = new ModelAndView("faStatistics/fishingBoat/fishingBoatMgt"); - + if(crackdownStatus.getFishingBoat()==null){ + crackdownStatus.setFishingBoat(new FishingBoat()); + crackdownStatus.setProcessResult(new ProcessResult()); + } //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/fishingBoat").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); crackdownStatus.setQueryInfo(); - List crackdownStatusList = fishingBoatService.selectCrackdownStatusList(crackdownStatus); + List crackdownStatusList = fishingBoatService.selectFishingBoatList(crackdownStatus); mav.addObject("crackdownStatusList", crackdownStatusList); - crackdownStatus.setContentCnt(fishingBoatService.selectCrackdownStatusListCnt(crackdownStatus)); + crackdownStatus.setContentCnt(fishingBoatService.selectFishingBoatListCnt(crackdownStatus)); crackdownStatus.setPaginationInfo(); mav.addObject("searchParams", crackdownStatus); return mav; } @GetMapping("/fishingBoatViewModal") - public ModelAndView fishingBoatViewModal(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult){ - ModelAndView mav = new ModelAndView("faStatistics/processResult/processResultViewModal"); -// processResult = processResultService.selectProcessResult(processResult.getPrKey()); -// processResult.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(processResult.getCdsKey())); -// processResult.setFbKey(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).getFbKey()); -// processResult.setBoatNameKr(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).getBoatNameKr()); -// processResult.setViolationList(violationRepository.findByFbKey(processResult.getFbKey())); + public ModelAndView fishingBoatViewModal(@AuthenticationPrincipal UserInfo loginUser, CrackdownStatus crackdownStatus){ + ModelAndView mav = new ModelAndView("faStatistics/fishingBoat/fishingBoatViewModal"); + crackdownStatus = fishingBoatService.selectCrackdownStatus(crackdownStatus.getCdsKey()); - mav.addObject("processResult", processResult); - mav.addObject("userSeq",loginUser.getUserSeq()); + mav.addObject("crackdownStatus", crackdownStatus); //메뉴권한 확인 mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/processResult").get(0).getAccessAuth()); + + mav.addObject("ataList", codeMgtService.selectCodeMgtList("ATA")); + mav.addObject("cpoList", codeMgtService.selectCodeMgtList("CPO")); + mav.addObject("vtList", codeMgtService.selectCodeMgtList("VT")); + mav.addObject("ftList", codeMgtService.selectCodeMgtList("FT")); + mav.addObject("bmList", codeMgtService.selectCodeMgtList("BM")); + mav.addObject("prList", codeMgtService.selectCodeMgtList("PR")); + mav.addObject("bdtList", codeMgtService.selectCodeMgtList("BDT")); + mav.addObject("boatList", codeMgtService.selectCodeMgtList(crackdownStatus.getCrackdownPolice())); + mav.addObject("userSeq", loginUser.getUserSeq()); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/CrackdownStatusMapper.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/CrackdownStatusMapper.java index 27846bf2..5e687e41 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/CrackdownStatusMapper.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/CrackdownStatusMapper.java @@ -9,4 +9,6 @@ import java.util.List; public interface CrackdownStatusMapper { List selectCrackdownStatusList(CrackdownStatus crackdownStatus); Integer selectCrackdownStatusListCnt(CrackdownStatus crackdownStatus); + List selectFishingBoatList(CrackdownStatus crackdownStatus); + Integer selectFishingBoatListCnt(CrackdownStatus crackdownStatus); } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java index fac341bc..c7290928 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java @@ -38,11 +38,11 @@ public class FishingBoatService extends BaseService { private final SailorRepository sailorRepository; private final SailorVersionRepository sailorVersionRepository; - public List selectCrackdownStatusList(CrackdownStatus crackdownStatus){ - return crackdownStatusMapper.selectCrackdownStatusList(crackdownStatus); + public List selectFishingBoatList(CrackdownStatus crackdownStatus){ + return crackdownStatusMapper.selectFishingBoatList(crackdownStatus); } - public Integer selectCrackdownStatusListCnt(CrackdownStatus crackdownStatus){ - return crackdownStatusMapper.selectCrackdownStatusListCnt(crackdownStatus); + public Integer selectFishingBoatListCnt(CrackdownStatus crackdownStatus){ + return crackdownStatusMapper.selectFishingBoatListCnt(crackdownStatus); } public CrackdownStatus selectCrackdownStatus(Integer cdsKey) { CrackdownStatus crackdownStatus = crackdownStatusRepository.findById(cdsKey).orElse(null); diff --git a/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml b/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml index 26012000..4bfc11d1 100644 --- a/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml +++ b/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml @@ -111,4 +111,62 @@ ON cs.cds_key = pr.cds_key + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js index ff08edf9..0fc91620 100644 --- a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js +++ b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js @@ -2,6 +2,13 @@ let selectedList = []; $(document).on('click', '#getFishingBoatEditModalBtn', function (){ getFishingBoatEditModal(null); }) +$(document).on('click', '.crackdownStatusTr', function (){ + getFishingBoatViewModal($(this).find(".cdsKey").val()) +}) +$(document).on('click', '#editFishingBoatBtn', function (){ + getFishingBoatEditModal($("#fishingBoatViewModalContent").find(".cdsKey").val()); + $("#fishingBoatViewModal").modal('hide'); +}) $(document).on('change', '#caseNum', function (){ $.ajax({ url: '/faStatistics/checkCaseNum', @@ -145,7 +152,25 @@ function getFishingBoatEditModal(cdsKey){ } }); } +function getFishingBoatViewModal(cdsKey){ + $.ajax({ + url: '/faStatistics/fishingBoatViewModal', + data: {cdsKey: cdsKey}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#fishingBoatViewModalContent").empty().append(html) + const crackdownPolice = $("#crackdownPolice").val() + if(crackdownPolice){ + getCrackdownBoatOption(crackdownPolice) + } + $("#fishingBoatViewModal").modal('show'); + }, + error:function(){ + } + }); +} function getCrackdownBoatOption(categoryCd){ $.ajax({ url: '/selectBoxOptions', diff --git a/src/main/resources/static/js/publicBoard/publicBoard.js b/src/main/resources/static/js/publicBoard/publicBoard.js index 6ca9145f..c1743607 100644 --- a/src/main/resources/static/js/publicBoard/publicBoard.js +++ b/src/main/resources/static/js/publicBoard/publicBoard.js @@ -81,7 +81,7 @@ function getEditModal(publicKey, publicType){ dataType:"html", success: function(html){ $("#editContent").empty().append(html) - /*$("#content").summernote({ + $("#content").summernote({ lang:'ko-KR', height: 350, disableDragAndDrop: true, @@ -92,7 +92,7 @@ function getEditModal(publicKey, publicType){ ['para', ['ul', 'ol', 'paragraph']], ['table', ['table']] ] - });*/ + }); setUploadDiv(); $("#editModal").modal('show'); }, diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html index 5517b947..f0ca854a 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html @@ -3,6 +3,19 @@ xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> + + + @@ -26,6 +39,12 @@ +
@@ -60,34 +79,26 @@
- +
-
- -
- +
@@ -95,7 +106,7 @@
@@ -103,7 +114,7 @@ @@ -118,8 +129,8 @@
-
- +
+
@@ -136,28 +147,85 @@ + + - +
선질 위반형태 처리결과작성자수정일
@@ -207,9 +275,9 @@
-