diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java index 47167030..8704907d 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java @@ -2,6 +2,7 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus; +import com.dbnt.faisp.main.authMgt.service.AuthMgtService; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov.AsfCov; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus; @@ -27,51 +28,59 @@ import java.util.List; @RequestMapping("/faStatistics") public class AsfCovController { - private final AsfCovService asfCovService; - private final CodeMgtService codeMgtService; + private final AsfCovService asfCovService; + private final CodeMgtService codeMgtService; + private final AuthMgtService authMgtService; - @GetMapping("/asfCov") - public ModelAndView asfCove(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov) { - ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCov"); + @GetMapping("/asfCov") + public ModelAndView asfCove(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov) { + ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCov"); + //메뉴권한 확인 + String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/asfCov").get(0).getAccessAuth(); + mav.addObject("accessAuth", accessAuth); + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); + mav.addObject("searchParams", asfCov); - mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); - mav.addObject("searchParams", asfCov); + asfCov.setQueryInfo(); + // mav.addObject("asfCov", asfCov); + mav.addObject("asfCovList", asfCovService.selectAsfCovList(asfCov)); + asfCov.setPaginationInfo(); + return mav; + } - asfCov.setQueryInfo(); - // mav.addObject("asfCov", asfCov); - mav.addObject("asfCovList", asfCovService.selectAsfCovList(asfCov)); - asfCov.setPaginationInfo(); - return mav; + @GetMapping("/asfCovEditModal") + public ModelAndView asfCovEditModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov) { + ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCovEditModal"); + if (asfCov.getAsfCovKey() != null) { + asfCov = asfCovService.selectAsfCov(asfCov.getAsfCovKey()); + } else { + asfCov.setWrtOrgan(loginUser.getOgCd()); + asfCov.setWrtPart(loginUser.getOfcCd()); + asfCov.setWrtUserSeq(loginUser.getUserSeq()); + asfCov.setWrtUserGrd(loginUser.getTitleCd()); + asfCov.setWrtUserNm(loginUser.getUserNm()); + asfCov.setWrtDt(LocalDateTime.now()); } + mav.addObject("asfCov", asfCov); + mav.addObject("userSeq", loginUser.getUserSeq()); - @GetMapping("/asfCovEditModal") - public ModelAndView asfCovEditModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov) { - ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCovEditModal"); - if (asfCov.getAsfCovKey() != null) { - asfCov = asfCovService.selectAsfCov(asfCov.getAsfCovKey()); - } else { - asfCov.setWrtOrgan(loginUser.getOgCd()); - asfCov.setWrtPart(loginUser.getOfcCd()); - asfCov.setWrtUserSeq(loginUser.getUserSeq()); - asfCov.setWrtUserGrd(loginUser.getTitleCd()); - asfCov.setWrtUserNm(loginUser.getUserNm()); - asfCov.setWrtDt(LocalDateTime.now()); - } - mav.addObject("asfCov", asfCov); - mav.addObject("userSeq", loginUser.getUserSeq()); + return mav; + } - return mav; - } + @GetMapping("/asfCovViewModal") + public ModelAndView asfCovViewModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov){ + ModelAndView mav= new ModelAndView("faStatistics/asfCov/asfCovViewModal"); - @GetMapping("/asfCovViewModal") - public ModelAndView asfCovViewModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov){ - ModelAndView mav= new ModelAndView("faStatistics/asfCov/asfCovViewModal"); + //메뉴권한 확인 + String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/asfCov").get(0).getAccessAuth(); + mav.addObject("accessAuth", accessAuth); + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); - mav.addObject("userSeq",loginUser.getUserSeq()); - mav.addObject("asfCov", asfCovService.selectAsfCov(asfCov.getAsfCovKey())); - mav.addObject("asfCovHistory", asfCovService.selectAsfCovHistory(asfCov.getAsfCovKey())); - return mav; - } + mav.addObject("userSeq",loginUser.getUserSeq()); + mav.addObject("asfCov", asfCovService.selectAsfCov(asfCov.getAsfCovKey())); + mav.addObject("asfCovHistory", asfCovService.selectAsfCovHistory(asfCov.getAsfCovKey())); + return mav; + } // @GetMapping("/asfCovHistoryViewModal") // public ModelAndView asfCovHistoryViewModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov){ @@ -82,27 +91,27 @@ public class AsfCovController { // return mav; // } - @GetMapping("/asfCovHistoryDetail") - public ModelAndView asfCovHistoryDetail(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov){ - ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCovHistoryDetail"); - asfCov = asfCovService.selectAsfCov(asfCov.getAsfCovKey()); - mav.addObject("userSeq",loginUser.getUserSeq()); - mav.addObject("asfCovHistory", asfCovService.selectAsfCovHistory(asfCov.getAsfCovKey())); - mav.addObject("asfCov", asfCov); - return mav; - } + @GetMapping("/asfCovHistoryDetail") + public ModelAndView asfCovHistoryDetail(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov){ + ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCovHistoryDetail"); + asfCov = asfCovService.selectAsfCov(asfCov.getAsfCovKey()); + mav.addObject("userSeq",loginUser.getUserSeq()); + mav.addObject("asfCovHistory", asfCovService.selectAsfCovHistory(asfCov.getAsfCovKey())); + mav.addObject("asfCov", asfCov); + return mav; + } - @PostMapping("/saveContent") - public Integer saveContent (AsfCov asfCov){ - return asfCovService.saveContent(asfCov); - } + @PostMapping("/saveContent") + public Integer saveContent (AsfCov asfCov){ + return asfCovService.saveContent(asfCov); + } - @PostMapping("/deleteContent") - @ResponseBody - public void deleteContent(@RequestBody AsfCov asfCov){ - asfCovService.deleteContent(asfCov); - } + @PostMapping("/deleteContent") + @ResponseBody + public void deleteContent(@RequestBody AsfCov asfCov){ + asfCovService.deleteContent(asfCov); + } } 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 7c849032..bead2d9b 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 @@ -40,7 +40,7 @@ public class FishingBoatController { //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/fishingBoat").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); - + mav.addObject("loginUserOrgan", loginUser.getOgCd()); params.setQueryInfo(); if(params.getYear()==null){ params.setYear(LocalDateTime.now().getYear()); @@ -101,6 +101,7 @@ public class FishingBoatController { mav.addObject("bdtList", codeMgtService.selectCodeMgtList("BDT")); mav.addObject("boatList", codeMgtService.selectCodeMgtList(crackdownStatus.getCrackdownPolice())); mav.addObject("userSeq", loginUser.getUserSeq()); + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/SailorController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/SailorController.java index 81e238d8..cd26eec5 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/SailorController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/SailorController.java @@ -64,6 +64,7 @@ public class SailorController { mav.addObject("userSeq",loginUser.getUserSeq()); //메뉴권한 확인 mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/sailor").get(0).getAccessAuth()); + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); return mav; } diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCov.html b/src/main/resources/templates/faStatistics/asfCov/asfCov.html index 3e92d516..2e2b0dcb 100644 --- a/src/main/resources/templates/faStatistics/asfCov/asfCov.html +++ b/src/main/resources/templates/faStatistics/asfCov/asfCov.html @@ -166,7 +166,9 @@
| - | 수정자 | -수정일 | -
| - |
- - |
- - |
| + | 수정자 | +수정일 | +
| + |
+ + |
+ + |