diff --git a/src/main/java/com/dbnt/faisp/config/BaseModel.java b/src/main/java/com/dbnt/faisp/config/BaseModel.java index 24928e0e..53fa10ed 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseModel.java +++ b/src/main/java/com/dbnt/faisp/config/BaseModel.java @@ -11,6 +11,8 @@ import java.util.List; @Setter @NoArgsConstructor public class BaseModel { + @Transient + private String accessAuth; @Transient private List upOrganCdList; @Transient diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java index 35289c7e..a15f5079 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java @@ -291,6 +291,22 @@ public class UnlawfulFishingController { mav.addObject("illegalShipSailor", illegalShipSailor); return mav; } + @GetMapping("/issViewModal") + public ModelAndView illegalShipSailorViewModal(@AuthenticationPrincipal UserInfo loginUser, IllegalShipSailor illegalShipSailor){ + ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/illegalShipSailor/issViewModal"); + illegalShipSailor = unlawfulFishingService.selectIllegalShipSailor(illegalShipSailor.getSailorKey()); + illegalShipSailor.setHistoryList(unlawfulFishingService.selectIllegalShipSailorHistoryList(illegalShipSailor.getSailorKey())); + mav.addObject("illegalShipSailor", illegalShipSailor); + IllegalShipInfo shipInfo = unlawfulFishingService.selectIllegalShipInfo(illegalShipSailor.getFbKey()); + mav.addObject("shipInfo", shipInfo); + mav.addObject("crackdownInfo", unlawfulFishingService.selectCrackdownInfo(shipInfo.getCdsKey())); + + AccessConfig accessConfig = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/unlawfulFishing/shipProcessInfo").get(0); + mav.addObject("accessAuth", accessConfig.getAccessAuth()); + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); + mav.addObject("userSeq", loginUser.getUserSeq()); + return mav; + } @GetMapping("/crackdownStatusVersionInfo") public ModelAndView selectUnlawfulFishingVersionInfo(Integer cdsKey, Integer versionNo){ diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/IllegalShipSailor.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/IllegalShipSailor.java index 432aa510..e2f51a2f 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/IllegalShipSailor.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/IllegalShipSailor.java @@ -38,4 +38,6 @@ public class IllegalShipSailor extends SailorBaseEntity { private String caseNum; @Transient private String boatNameKr; + @Transient + private List historyList; } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/IllegalShipSailorHistoryRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/IllegalShipSailorHistoryRepository.java index 54ca2f3d..64cc6eba 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/IllegalShipSailorHistoryRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/IllegalShipSailorHistoryRepository.java @@ -9,6 +9,7 @@ import java.util.Optional; public interface IllegalShipSailorHistoryRepository extends JpaRepository { Optional findTopBySailorKeyOrderByVersionNoDesc(Integer sailorKey); List findBySailorKey(Integer sailorKey); + List findBySailorKeyOrderByVersionNoDesc(Integer sailorKey); IllegalShipSailorHistory findByVersionNoAndSailorKey(Integer versionNo, Integer sailorKey); } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java index 9aa157a1..e375b4df 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java @@ -263,4 +263,8 @@ public class UnlawfulFishingService { public Integer selectIllegalShipSailorListCnt(UnlawfulFishingParam params) { return unlawfulFishingMapper.selectIllegalShipSailorListCnt(params); } + + public List selectIllegalShipSailorHistoryList(Integer sailorKey) { + return isshRepository.findBySailorKeyOrderByVersionNoDesc(sailorKey); + } } diff --git a/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js index 28c81917..db741cff 100644 --- a/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js +++ b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js @@ -48,7 +48,7 @@ $(document).on('click', '.saveEditInfoBtn', function (){ if(confirm("저장하시겠습니까?")){ const sailorList = []; const fbKey = $("#fbKey").val() - const status = $(this).data("data-status") + const status = $(this).attr("data-status") $.each($(".sailorInfo"), function (idx, sailor){ const sailorDiv = $(sailor); sailorList.push({ @@ -89,6 +89,10 @@ $(document).on('click', '.saveEditInfoBtn', function (){ } }) +$(document).on('click', '.sailorTr', function (){ + getIssViewModal($(this).attr('data-sailorkey')) +}) + function getIssAddModal(){ $.ajax({ url: '/unlawfulFishing/issAddModal', @@ -110,7 +114,22 @@ function getIssAddModal(){ } }); } - +function getIssViewModal(sailorKey){ + $.ajax({ + url: '/unlawfulFishing/issViewModal', + data: {sailorKey: sailorKey}, + type: 'GET', + dataType:"html", + success: function(html){ + const contentDiv = $("#issViewModalContent"); + contentDiv.empty().append(html) + $("#issViewModal").modal('show'); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); +} function getIssEditModal(sailorKey){ $.ajax({ url: '/unlawfulFishing/issEditModal', diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html index b99d3e82..8fea7ef4 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html @@ -8,7 +8,9 @@
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html index f8ac5370..efc0d18d 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html @@ -1,61 +1,244 @@