diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java index b1e6c4ef..1d8e2331 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java @@ -26,81 +26,83 @@ import java.util.List; @RequestMapping("/ivsgt") public class MajorStatusController { - private final AuthMgtService authMgtService; - private final MajorStatusService majorStatusService; - private final CodeMgtService codeMgtService; + private final AuthMgtService authMgtService; + private final MajorStatusService majorStatusService; + private final CodeMgtService codeMgtService; - @GetMapping("/majorStatusPage") - public ModelAndView majorStatus(@AuthenticationPrincipal UserInfo loginUser, MajorStatus majorStatus){ + @GetMapping("/majorStatusPage") + public ModelAndView majorStatus(@AuthenticationPrincipal UserInfo loginUser, MajorStatus majorStatus){ - ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusPage"); + ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusPage"); - mav.addObject("mstList", codeMgtService.selectCodeMgtList("MST")); + mav.addObject("mstList", codeMgtService.selectCodeMgtList("MST")); - mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); - mav.addObject("searchParams", majorStatus); + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); + mav.addObject("searchParams", majorStatus); - majorStatus.setQueryInfo(); - mav.addObject("majorList", majorStatusService.selectMajorList(majorStatus)); - majorStatus.setContentCnt(majorStatusService.selectMajorListCnt(majorStatus)); - majorStatus.setPaginationInfo(); - return mav; - } + majorStatus.setQueryInfo(); + mav.addObject("majorList", majorStatusService.selectMajorList(majorStatus)); + majorStatus.setContentCnt(majorStatusService.selectMajorListCnt(majorStatus)); + majorStatus.setPaginationInfo(); + mav.addObject("organCd", loginUser.getOgCd()); + mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/ivsgt/majorStatusPage").get(0).getAccessAuth()); + return mav; + } - @GetMapping("/majorEditModal") - public ModelAndView majorEditModal(@AuthenticationPrincipal UserInfo loginUser, MajorStatus majorStatus) { - ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusEditModal"); + @GetMapping("/majorEditModal") + public ModelAndView majorEditModal(@AuthenticationPrincipal UserInfo loginUser, MajorStatus majorStatus) { + ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusEditModal"); - if(majorStatus.getMajorKey()!=null){ - majorStatus = majorStatusService.selectMajor(majorStatus.getMajorKey()); - }else{ - majorStatus.setWrtOrgan(loginUser.getOgCd()); - majorStatus.setWrtPart(loginUser.getOfcCd()); - majorStatus.setWrtUserSeq(loginUser.getUserSeq()); - majorStatus.setWrtUserGrd(loginUser.getTitleCd()); - majorStatus.setWrtUserNm(loginUser.getUserNm()); - majorStatus.setWrtDt(loginUser.getWrtDt()); - majorStatus.setWrtDt(loginUser.getWrtDt()); + if(majorStatus.getMajorKey()!=null){ + majorStatus = majorStatusService.selectMajor(majorStatus.getMajorKey()); + }else{ + majorStatus.setWrtOrgan(loginUser.getOgCd()); + majorStatus.setWrtPart(loginUser.getOfcCd()); + majorStatus.setWrtUserSeq(loginUser.getUserSeq()); + majorStatus.setWrtUserGrd(loginUser.getTitleCd()); + majorStatus.setWrtUserNm(loginUser.getUserNm()); + majorStatus.setWrtDt(loginUser.getWrtDt()); + majorStatus.setWrtDt(loginUser.getWrtDt()); - } - //mav.addObject("mstList", codeMgtService.selectCodeMgtList("MST")); - mav.addObject("majorStatus", majorStatus); - mav.addObject("userSeq", loginUser.getUserSeq()); - return mav; - } - - - @GetMapping("/majorViewModal") - public ModelAndView majorViewModal(@AuthenticationPrincipal UserInfo loginUser,MajorStatus majorStatus){ - - ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusViewModal"); - - majorStatus = majorStatusService.selectMajor(majorStatus.getMajorKey()); - mav.addObject("userSeq", loginUser.getUserSeq()); - mav.addObject("majorStatus", majorStatus); - - //메뉴권한 확인 - // mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/ivsgt/"+majorStatus.getMajorType()).get(0).getAccessAuth()); - - return mav; - } - - @PostMapping("/saveContent") - public Integer saveContent (MajorStatus majorStatus, - MultipartHttpServletRequest request, - @RequestParam(value = "fileSeq", required = false) List< Integer > deleteFileSeq){ - majorStatus.setMultipartFileList(request.getMultiFileMap().get("uploadFiles")); - return majorStatusService.saveContent(majorStatus, deleteFileSeq); - } - - - @PostMapping("/deleteContent") - @ResponseBody - public void deleteContent(@RequestBody MajorStatus majorStatus){ - - majorStatusService.deleteContent(majorStatus); - } + //mav.addObject("mstList", codeMgtService.selectCodeMgtList("MST")); + mav.addObject("majorStatus", majorStatus); + mav.addObject("userSeq", loginUser.getUserSeq()); + return mav; + } + + + @GetMapping("/majorViewModal") + public ModelAndView majorViewModal(@AuthenticationPrincipal UserInfo loginUser,MajorStatus majorStatus){ + + ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusViewModal"); + + majorStatus = majorStatusService.selectMajor(majorStatus.getMajorKey()); + mav.addObject("userSeq", loginUser.getUserSeq()); + mav.addObject("majorStatus", majorStatus); + + //메뉴권한 확인 + // mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/ivsgt/"+majorStatus.getMajorType()).get(0).getAccessAuth()); + + return mav; + } + + @PostMapping("/saveContent") + public Integer saveContent (MajorStatus majorStatus, + MultipartHttpServletRequest request, + @RequestParam(value = "fileSeq", required = false) List< Integer > deleteFileSeq){ + majorStatus.setMultipartFileList(request.getMultiFileMap().get("uploadFiles")); + return majorStatusService.saveContent(majorStatus, deleteFileSeq); + } + + + @PostMapping("/deleteContent") + @ResponseBody + public void deleteContent(@RequestBody MajorStatus majorStatus){ + + majorStatusService.deleteContent(majorStatus); + + } } diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html index 264e849c..2e7afe33 100644 --- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html +++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html @@ -120,8 +120,10 @@