From 6d52907a8732ff37b72c493de969cf15d6f87db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 16 May 2023 18:27:55 +0900 Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EA=B2=BD=EC=B0=B0=EA=B2=AC?= =?UTF-8?q?=EB=AC=B8=EA=B4=80=EB=A6=AC=20=EA=B2=B0=EC=A0=9C=20=EB=8F=99?= =?UTF-8?q?=EC=9E=91=20=EC=88=98=EC=A0=95=20=EC=99=B8=EC=82=AC=EA=B2=BD?= =?UTF-8?q?=EC=B0=B0=EA=B2=AC=EB=AC=B8=EA=B4=80=EB=A6=AC=20>=20=EA=B3=84?= =?UTF-8?q?=ED=9A=8D=EC=88=98=EB=A6=BD,=20=EC=B2=AD=EC=82=B0=EB=B3=B4?= =?UTF-8?q?=EA=B3=A0=EC=84=9C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=A0=84=EC=9A=A9=20=ED=83=AD=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80.=20=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=20=EA=B2=B0?= =?UTF-8?q?=EC=9E=AC=EB=8C=80=EA=B8=B0=ED=95=A8=20=EC=BF=BC=EB=A6=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/ApprovalConfigRepository.java | 1 + .../main/fpiMgt/affair/AffairController.java | 6 + .../fpiMgt/affairPlan/PlanController.java | 163 +++++++-------- .../fpiMgt/affairResult/ResultController.java | 189 +++++++----------- .../affairResult/service/ResultService.java | 7 +- .../main/menuMgt/service/MenuMgtService.java | 6 + .../resources/mybatisMapper/AffairMapper.xml | 33 +-- .../static/js/igActivities/fpiMgt/planMgt.js | 10 +- .../js/igActivities/fpiMgt/resultMgt.js | 10 +- .../igActivities/fpiMgt/affair/affairMgt.html | 4 +- .../fpiMgt/affairPlan/planMgt.html | 11 +- .../fpiMgt/affairPlan/planViewModal.html | 42 +--- .../fpiMgt/affairResult/resultMgt.html | 17 +- .../fpiMgt/affairResult/resultViewModal.html | 62 +++--- 14 files changed, 246 insertions(+), 315 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/authMgt/repository/ApprovalConfigRepository.java b/src/main/java/com/dbnt/faisp/main/authMgt/repository/ApprovalConfigRepository.java index 106ea3e1..8a76f45e 100644 --- a/src/main/java/com/dbnt/faisp/main/authMgt/repository/ApprovalConfigRepository.java +++ b/src/main/java/com/dbnt/faisp/main/authMgt/repository/ApprovalConfigRepository.java @@ -6,4 +6,5 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface ApprovalConfigRepository extends JpaRepository { + void deleteByMenuKey(Integer menuKey); } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java index 98597d98..14d91d0b 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java @@ -32,6 +32,9 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 public ModelAndView affairMgtPage(@AuthenticationPrincipal UserInfo loginUser, @PathVariable("tab") String tab, AffairBoard affairBoard){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affair/affairMgt"); + if(Utils.isEmpty(affairBoard.getAffairCategory())){ + return new ModelAndView("redirect:/"); + } //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList (loginUser.getUserSeq(), "/affair/affairMgt/myReport?affairCategory="+affairBoard.getAffairCategory()).get(0).getAccessAuth(); @@ -53,6 +56,7 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 switch (apprvAuth) { case "APC004APC001": // 계장대행+부장 case "APC003APC002": // 계장+부장대행 + case "APC004APC002": // 계장대행+부장대행 affairBoard.setQueryType("normalStayList"); break; case "APC004": // 계장대행 @@ -102,6 +106,8 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 if(accessAuth.equals("ACC003")){ affairBoard.setDownOrganCdList(loginUser.getDownOrganCdList()); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); + }else{ + return new ModelAndView("redirect:/affair/affairMgt/myReport?affairCategory="+affairBoard.getAffairCategory()); } break; } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java index 6da6f3ca..932c299d 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java @@ -25,106 +25,79 @@ public class PlanController { // 첩보수집활동 > 외사경찰 견문관리 private final PlanService planService; private final AuthMgtService authMgtService; - @GetMapping("/planMgt") - public ModelAndView monthPlanPage(@AuthenticationPrincipal UserInfo loginUser, PlanBoard planBoard){ + @GetMapping("/planMgt/{tab}") + public ModelAndView monthPlanPage(@AuthenticationPrincipal UserInfo loginUser, + @PathVariable("tab") String tab, PlanBoard planBoard){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/planMgt"); //메뉴권한 확인 - String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getAccessAuth(); - switch (accessAuth){ - case "ACC001": // 조회 - case "ACC002": // 작성 // 자신이 작성한 문서만 열람가능 + String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt/myReport").get(0).getAccessAuth(); + //결재권한 확인 + String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt/myReport").get(0).getApprovalAuth(); + switch (tab){ + case "myReport": planBoard.setWrtUserSeq(loginUser.getUserSeq()); + planBoard.setWrtOrgan(loginUser.getOgCd()); break; - case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능 - planBoard.setDownOrganCdList(loginUser.getDownOrganCdList()); - mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); - break; - } - //결재권한 확인 - String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getApprovalAuth(); - - mav.addObject("page", "main"); - mav.addObject("searchUrl", "/affairPlan/planMgt"); - mav.addObject("accessAuth", accessAuth); - mav.addObject("apprvAuth", apprvAuth); - planBoard.setQueryInfo(); - mav.addObject("planList", planService.selectPlanBoardList(planBoard)); - planBoard.setContentCnt(planService.selectPlanBoardListCnt(planBoard)); - planBoard.setPaginationInfo(); - mav.addObject("searchParams", planBoard); - return mav; - } - - @GetMapping("/stayPage") - public ModelAndView apprvStayPage(@AuthenticationPrincipal UserInfo loginUser, PlanBoard planBoard){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/planMgt"); - mav.addObject("page", "stay"); - mav.addObject("searchUrl", "/affairPlan/stayPage"); - //메뉴권한 확인 - String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getAccessAuth(); - planBoard.setWrtOrgan(loginUser.getOgCd()); - //결재권한 확인 - String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getApprovalAuth(); - if(Utils.isEmpty(apprvAuth)) { - planBoard.setWrtOrgan(loginUser.getOgCd()); - planBoard.setWrtUserSeq(loginUser.getUserSeq()); - planBoard.setUserType("normalStayList"); - }else{ - switch (apprvAuth){ - case "APC004APC001": // 계장대행+부장 - case "APC003APC002": // 계장+부장대행 + case "stayReport": + planBoard.setWrtOrgan(loginUser.getOgCd()); + if(Utils.isEmpty(apprvAuth)) { + planBoard.setWrtOrgan(loginUser.getOgCd()); + planBoard.setWrtUserSeq(loginUser.getUserSeq()); planBoard.setUserType("normalStayList"); - break; - case "APC004": // 계장대행 - case "APC003": // 계장 // 결재대기 문서 조회 - planBoard.setPlanState("DST002"); - break; - case "APC002": // 부장대행 - case "APC001": // 부장 // 계장승인 문서 조회 - planBoard.setPlanState("DST004"); - break; - } - } - mav.addObject("accessAuth", accessAuth); - mav.addObject("apprvAuth", apprvAuth); - planBoard.setQueryInfo(); - mav.addObject("planList", planService.selectPlanBoardList(planBoard)); - planBoard.setContentCnt(planService.selectPlanBoardListCnt(planBoard)); - planBoard.setPaginationInfo(); - mav.addObject("searchParams", planBoard); - return mav; - } - - @GetMapping("/commitPage") - public ModelAndView apprvCommitPage(@AuthenticationPrincipal UserInfo loginUser, PlanBoard planBoard){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/planMgt"); - mav.addObject("page", "commit"); - mav.addObject("searchUrl", "/affairPlan/commitPage"); - //메뉴권한 확인 - String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getAccessAuth(); - planBoard.setWrtOrgan(loginUser.getOgCd()); - //결재권한 확인 - String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getApprovalAuth(); - if(Utils.isEmpty(apprvAuth)) { - planBoard.setWrtOrgan(loginUser.getOgCd()); - planBoard.setWrtUserSeq(loginUser.getUserSeq()); - planBoard.setUserType("normalCommitList"); - }else{ - switch (apprvAuth) { - case "APC004APC001": // 계장대행+부장 - case "APC003APC002": // 계장+부장대행 + }else{ + switch (apprvAuth){ + case "APC004APC001": // 계장대행+부장 + case "APC003APC002": // 계장+부장대행 + case "APC004APC002": // 계장대행+부장대행 + planBoard.setUserType("normalStayList"); + break; + case "APC004": // 계장대행 + case "APC003": // 계장 // 결재대기 문서 조회 + planBoard.setPlanState("DST002"); + break; + case "APC002": // 부장대행 + case "APC001": // 부장 // 계장승인 문서 조회 + planBoard.setPlanState("DST004"); + break; + } + } + break; + case "commitReport": + planBoard.setWrtOrgan(loginUser.getOgCd()); + if(Utils.isEmpty(apprvAuth)) { + planBoard.setWrtOrgan(loginUser.getOgCd()); + planBoard.setWrtUserSeq(loginUser.getUserSeq()); planBoard.setUserType("normalCommitList"); - break; - case "APC004": // 계장대행 - case "APC003": // 계장 // 계장반려, 계장승인 문서 조회 - planBoard.setUserType("sectionCommitList"); - break; - case "APC002": // 부장대행 - case "APC001": // 부장 // 부장반려, 부장승인 문서 조회 - planBoard.setUserType("headCommitList"); - break; - } + }else{ + switch (apprvAuth) { + case "APC004APC001": // 계장대행+부장 + case "APC003APC002": // 계장+부장대행 + case "APC004APC002": // 계장대행+부장대행 + planBoard.setUserType("normalCommitList"); + break; + case "APC004": // 계장대행 + case "APC003": // 계장 // 계장반려, 계장승인 문서 조회 + planBoard.setUserType("sectionCommitList"); + break; + case "APC002": // 부장대행 + case "APC001": // 부장 // 부장반려, 부장승인 문서 조회 + planBoard.setUserType("headCommitList"); + break; + } + } + break; + case "allReport": + if(accessAuth.equals("ACC003")){ + planBoard.setDownOrganCdList(loginUser.getDownOrganCdList()); + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); + }else{ + return new ModelAndView("redirect:/affairPlan/planMgt/myReport"); + } + break; } + + mav.addObject("page", tab); + mav.addObject("searchUrl", "/affairPlan/planMgt/"+tab); mav.addObject("accessAuth", accessAuth); mav.addObject("apprvAuth", apprvAuth); planBoard.setQueryInfo(); @@ -162,8 +135,8 @@ public class PlanController { // 첩보수집활동 > 외사경찰 견문관리 mav.addObject("viewOrgan",loginUser.getOgCd()); mav.addObject("lineSeparator", '\n'); //메뉴권한 확인 - mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getAccessAuth()); - mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getApprovalAuth()); + mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt/myReport").get(0).getAccessAuth()); + mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt/myReport").get(0).getApprovalAuth()); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java index fec0402f..c868086b 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java @@ -34,31 +34,79 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 private final AuthMgtService authMgtService; private final CodeMgtService codeMgtService; - @GetMapping("/resultMgt") - public ModelAndView resultMgtPage(@AuthenticationPrincipal UserInfo loginUser, ResultBoard resultBoard){ - ModelAndView mav = null; - if(resultBoard.getDashboardFlag()){ - mav = new ModelAndView("igActivities/fpiMgt/affairResult/resultMgtDashboard"); - resultBoard.setRowCnt(5); - }else{ - mav = new ModelAndView("igActivities/fpiMgt/affairResult/resultMgt"); - } - mav.addObject("page", "main"); - mav.addObject("searchUrl", "/affairResult/resultMgt"); + @GetMapping("/resultMgt/{tab}") + public ModelAndView resultMgtPage(@AuthenticationPrincipal UserInfo loginUser, + @PathVariable("tab") String tab, ResultBoard resultBoard){ + ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairResult/resultMgt"); //메뉴권한 확인 - String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt").get(0).getAccessAuth(); - switch (accessAuth){ - case "ACC001": // 조회 - case "ACC002": // 작성 // 자신이 작성한 문서만 열람가능 + String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt/myReport").get(0).getAccessAuth(); + //결재권한 확인 + String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt/myReport").get(0).getApprovalAuth(); + switch (tab){ + case "myReport": resultBoard.setWrtUserSeq(loginUser.getUserSeq()); + resultBoard.setWrtOrgan(loginUser.getOgCd()); break; - case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능 - resultBoard.setDownOrganCdList(loginUser.getDownOrganCdList()); - mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); + case "stayReport": + resultBoard.setWrtOrgan(loginUser.getOgCd()); + if(Utils.isEmpty(apprvAuth)){ + resultBoard.setWrtUserSeq(loginUser.getUserSeq()); + resultBoard.setWrtOrgan(loginUser.getOgCd()); + resultBoard.setUserType("normalStayList"); + }else{ + switch (apprvAuth){ + case "APC004APC001": // 계장대행+부장 + case "APC003APC002": // 계장+부장대행 + case "APC004APC002": // 계장대행+부장대행 + resultBoard.setUserType("normalStayList"); + break; + case "APC004": // 계장대행 + case "APC003": // 계장 // 결재대기 문서 조회 + resultBoard.setResultState("DST002"); + break; + case "APC002": // 부장대행 + case "APC001": // 부장 // 계장승인 문서 조회 + resultBoard.setResultState("DST004"); + break; + } + } + break; + case "commitReport": + resultBoard.setWrtOrgan(loginUser.getOgCd()); + if(Utils.isEmpty(apprvAuth)) { + resultBoard.setWrtOrgan(loginUser.getOgCd()); + resultBoard.setWrtUserSeq(loginUser.getUserSeq()); + resultBoard.setUserType("normalCommitList"); + }else{ + switch (apprvAuth) { + case "APC004APC001": // 계장대행+부장 + case "APC003APC002": // 계장+부장대행 + case "APC004APC002": // 계장대행+부장대행 + resultBoard.setUserType("normalCommitList"); + break; + case "APC004": // 계장대행 + case "APC003": // 계장 // 계장반려, 계장승인 문서 조회 + resultBoard.setUserType("sectionCommitList"); + break; + case "APC002": // 부장대행 + case "APC001": // 부장 // 부장반려, 부장승인 문서 조회 + resultBoard.setUserType("headCommitList"); + break; + } + } + break; + case "allReport": + if(accessAuth.equals("ACC003")){ + resultBoard.setDownOrganCdList(loginUser.getDownOrganCdList()); + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); + }else{ + return new ModelAndView("redirect:/affairResult/resultMgt/myReport"); + } break; } - //결재권한 확인 - String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt").get(0).getApprovalAuth(); + + mav.addObject("page", tab); + mav.addObject("searchUrl", "/affairResult/resultMgt/"+tab); mav.addObject("accessAuth", accessAuth); mav.addObject("apprvAuth", apprvAuth); resultBoard.setQueryInfo(); @@ -70,103 +118,6 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 return mav; } - @GetMapping("/stayPage") - public ModelAndView apprvStayPage(@AuthenticationPrincipal UserInfo loginUser, ResultBoard resultBoard){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairResult/resultMgt"); - mav.addObject("page", "stay"); - mav.addObject("searchUrl", "/affairResult/stayPage"); - //메뉴권한 확인 - String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt").get(0).getAccessAuth(); - switch (accessAuth){ - case "ACC001": // 조회 - case "ACC002": // 작성 // 자신의 관서 내에서 작성한 문서만 열람가능 - resultBoard.setWrtOrgan(loginUser.getOgCd()); - break; - case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능 - resultBoard.setDownOrganCdList(loginUser.getDownOrganCdList()); - mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); - break; - } - //결재권한 확인 - String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt").get(0).getApprovalAuth(); - if(apprvAuth==null) { - if(!accessAuth.equals("ACC003")){ - resultBoard.setWrtUserSeq(loginUser.getUserSeq()); - resultBoard.setUserType("normalStayList"); - }else{ - resultBoard.setUserType("managerStayList"); - } - }else{ - mav.addObject("userNm", loginUser.getUserNm()); - switch (apprvAuth){ - case "APC004": // 계장대행 - case "APC003": // 계장 // 결재대기 문서 조회 - resultBoard.setResultState("DST002"); - break; - case "APC002": // 부장대행 - case "APC001": // 부장 // 계장승인 문서 조회 - resultBoard.setResultState("DST004"); - break; - } - } - mav.addObject("accessAuth", accessAuth); - mav.addObject("apprvAuth", apprvAuth); - resultBoard.setQueryInfo(); - mav.addObject("resultList", resultService.selectResultBoardList(resultBoard)); - resultBoard.setContentCnt(resultService.selectResultBoardListCnt(resultBoard)); - resultBoard.setPaginationInfo(); - mav.addObject("searchParams", resultBoard); - return mav; - } - - @GetMapping("/commitPage") - public ModelAndView apprvCommitPage(@AuthenticationPrincipal UserInfo loginUser, ResultBoard resultBoard){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairResult/resultMgt"); - mav.addObject("page", "commit"); - mav.addObject("searchUrl", "/affairResult/commitPage"); - //메뉴권한 확인 - String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt").get(0).getAccessAuth(); - switch (accessAuth){ - case "ACC001": // 조회 - case "ACC002": // 작성 // 자신의 관서 내에서 작성한 문서만 열람가능 - resultBoard.setWrtOrgan(loginUser.getOgCd()); - break; - case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능 - resultBoard.setDownOrganCdList(loginUser.getDownOrganCdList()); - mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); - break; - } - //결재권한 확인 - String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt").get(0).getApprovalAuth(); - if(apprvAuth==null) { - if(!accessAuth.equals("ACC003")){ - resultBoard.setWrtUserSeq(loginUser.getUserSeq()); - resultBoard.setUserType("normalCommitList"); - }else{ - resultBoard.setUserType("managerCommitList"); - } - }else{ - switch (apprvAuth) { - case "APC004": // 계장대행 - case "APC003": // 계장 // 계장반려, 계장승인 문서 조회 - resultBoard.setUserType("sectionCommitList"); - break; - case "APC002": // 부장대행 - case "APC001": // 부장 // 부장반려, 부장승인 문서 조회 - resultBoard.setUserType("headCommitList"); - break; - } - } - mav.addObject("accessAuth", accessAuth); - mav.addObject("apprvAuth", apprvAuth); - resultBoard.setQueryInfo(); - mav.addObject("resultList", resultService.selectResultBoardList(resultBoard)); - resultBoard.setContentCnt(resultService.selectResultBoardListCnt(resultBoard)); - resultBoard.setPaginationInfo(); - mav.addObject("searchParams", resultBoard); - return mav; - } - @GetMapping("/resultEditModal") public ModelAndView resultEditModal(@AuthenticationPrincipal UserInfo loginUser, ResultBoard resultBoard){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairResult/resultEditModal"); @@ -224,8 +175,8 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 mav.addObject("userSeq",loginUser.getUserSeq()); mav.addObject("viewOrgan",loginUser.getOgCd()); //메뉴권한 확인 - mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt").get(0).getAccessAuth()); - mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt").get(0).getApprovalAuth()); + mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt/myReport").get(0).getAccessAuth()); + mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt/myReport").get(0).getApprovalAuth()); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java index b86a8667..79b35ce6 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java @@ -115,7 +115,7 @@ public class ResultService extends BaseService { // 월간계획 userAlarmService.sendAlarmToWrtUser(savedResult.getResultKey(), savedResult.getWrtUserSeq(), 31, savedResult.getResultTitle()+" 문서가 승인되었습니다."); break; } - return apprv.getApprvSeq(); + return apprv.getResultKey(); } public ResultBoard getPrintTypeResultBoard(ResultBoard resultBoard, Map> codeMap) { @@ -130,9 +130,14 @@ public class ResultService extends BaseService { // 월간계획 if(apprv.getState().equals("DST004")){ resultBoard.setSectionApprv(apprv.getUserNm()); }else if(apprv.getState().equals("DST006")){ + resultBoard.setHeadApprv(apprv.getUserNm()); } } + if(Utils.isEmpty(resultBoard.getSectionApprv())){ + resultBoard.setSectionApprv(resultBoard.getHeadApprv()); + resultBoard.setHeadApprv("전결"); + } for(AffairBoard affair: resultBoard.getAffairBoardList()){ affair.setAffairRate(Utils.searchCodeValue(affair.getAffairRate(), codeMap.get("AAR"))+(affair.getOrganUp().equals("T")?"(상보)":"")); } diff --git a/src/main/java/com/dbnt/faisp/main/menuMgt/service/MenuMgtService.java b/src/main/java/com/dbnt/faisp/main/menuMgt/service/MenuMgtService.java index 149a9b95..40eda76e 100644 --- a/src/main/java/com/dbnt/faisp/main/menuMgt/service/MenuMgtService.java +++ b/src/main/java/com/dbnt/faisp/main/menuMgt/service/MenuMgtService.java @@ -1,6 +1,7 @@ package com.dbnt.faisp.main.menuMgt.service; import com.dbnt.faisp.main.authMgt.repository.AccessConfigRepository; +import com.dbnt.faisp.main.authMgt.repository.ApprovalConfigRepository; import com.dbnt.faisp.main.menuMgt.mapper.MenuMgtMapper; import com.dbnt.faisp.main.menuMgt.model.MenuMgt; import com.dbnt.faisp.main.menuMgt.repository.MenuMgtRepository; @@ -16,6 +17,7 @@ public class MenuMgtService { private final MenuMgtRepository menuMgtRepository; private final AccessConfigRepository accessConfigRepository; + private final ApprovalConfigRepository approvalConfigRepository; private final MenuMgtMapper menuMgtMapper; public List selectMenuMgtList(MenuMgt menuMgt){ @@ -54,6 +56,10 @@ public class MenuMgtService { @Transactional public void deleteMenuMgt(List menuList) { + for(MenuMgt menu: menuList){ + accessConfigRepository.deleteByMenuKey(menu.getMenuKey()); + approvalConfigRepository.deleteByMenuKey(menu.getMenuKey()); + } menuMgtRepository.deleteAll(menuList); } diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml index 454489cc..9e5f5a40 100644 --- a/src/main/resources/mybatisMapper/AffairMapper.xml +++ b/src/main/resources/mybatisMapper/AffairMapper.xml @@ -298,7 +298,7 @@ where a.wrt_organ = #{ogCd} and ( - a.wrt_user_seq = #{userSeq} + (a.wrt_user_seq = #{userSeq} and a.plan_state in ('DST002', 'DST004')) or ( a.plan_state = 'DST002' and ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' @@ -323,8 +323,8 @@ inner join affair_rating b on a.affair_key = b.affair_key and b.rating_organ = #{ogCd} where a.affair_category = 'CAT215' and ( - a.wrt_user_seq = #{userSeq} or - ( + (a.wrt_user_seq = #{userSeq} and b.affair_status in ('DST002', 'DST004')) + or ( b.affair_status = 'DST002' and ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' from menu_mgt aa @@ -347,7 +347,8 @@ where a.wrt_organ = #{ogCd} and ( - a.wrt_user_seq = #{userSeq} or ( + (a.wrt_user_seq = #{userSeq} and a.result_state in ('DST002', 'DST004')) + or ( a.result_state = 'DST002' and ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' from menu_mgt aa @@ -370,7 +371,7 @@ where a.wrt_organ = #{ogCd} and ( - a.wrt_user_seq = #{userSeq} + (a.wrt_user_seq = #{userSeq} and a.op_state in ('DST002', 'DST004')) or ( a.op_state = 'DST002' and ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' @@ -395,7 +396,8 @@ inner join affair_rating b on a.affair_key = b.affair_key and b.rating_organ = #{ogCd} where a.affair_category = 'CAT216' and ( - a.wrt_user_seq = #{userSeq} or ( + (a.wrt_user_seq = #{userSeq} and b.affair_status in ('DST002', 'DST004')) + or ( b.affair_status = 'DST002' and ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' from menu_mgt aa @@ -418,7 +420,7 @@ where a.wrt_organ = #{ogCd} and ( - a.wrt_user_seq = #{userSeq} + (a.wrt_user_seq = #{userSeq} and a.ia_state in ('DST002', 'DST004')) or ( a.ia_state = 'DST002' and ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' @@ -443,7 +445,7 @@ where a.wrt_organ = #{ogCd} and ( - a.wrt_user_seq = #{userSeq} + (a.wrt_user_seq = #{userSeq} and a.fer_state in ('DST002', 'DST004')) or ( a.fer_state = 'DST002' and ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' @@ -467,7 +469,7 @@ where a.wrt_organ = #{ogCd} and ( - a.wrt_user_seq = #{userSeq} + (a.wrt_user_seq = #{userSeq} and a.md_state in ('DST002', 'DST004')) or ( a.md_state = 'DST002' and ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' @@ -491,7 +493,7 @@ where a.wrt_organ = #{ogCd} and ( - a.wrt_user_seq = #{userSeq} + (a.wrt_user_seq = #{userSeq} and a.mr_state in ('DST002', 'DST004')) or ( a.mr_state = 'DST002' and ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' @@ -514,13 +516,14 @@ from activity_case a inner join activity_case_info b on a.receipt_key = b.receipt_key where - a.wrt_organ = #{ogCd} + b.status = 'DST007' + and a.wrt_organ = #{ogCd} and ( a.wrt_user_seq = #{userSeq} - or b.case_key in ( - select case_key - from activity_case_apprv - where user_seq = #{userSeq} + or b.case_key in ( + select case_key + from activity_case_apprv + where user_seq = #{userSeq} ) ) order by wrt_dt desc diff --git a/src/main/resources/static/js/igActivities/fpiMgt/planMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/planMgt.js index 440432f9..4007dba0 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/planMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/planMgt.js @@ -16,14 +16,8 @@ $(function(){ }); }) -$(document).on('click', '#planTab', function (){ - location.href = "/affairPlan/planMgt"; -}) -$(document).on('click', '#stayTab', function (){ - location.href = "/affairPlan/stayPage"; -}) -$(document).on('click', '#commitTab', function (){ - location.href = "/affairPlan/commitPage"; +$(document).on('click', '.pageTab', function (){ + location.href = "/affairPlan/planMgt/"+this.id; }) $(document).on('click', '#addPlanBtn', function (){ diff --git a/src/main/resources/static/js/igActivities/fpiMgt/resultMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/resultMgt.js index c3ddfcad..268c45c6 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/resultMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/resultMgt.js @@ -16,14 +16,8 @@ $(function(){ }); }) -$(document).on('click', '#resultTab', function (){ - location.href = "/affairResult/resultMgt"; -}) -$(document).on('click', '#stayTab', function (){ - location.href = "/affairResult/stayPage"; -}) -$(document).on('click', '#commitTab', function (){ - location.href = "/affairResult/commitPage"; +$(document).on('click', '.pageTab', function (){ + location.href = "/affairResult/resultMgt/"+this.id; }) $(document).on('click', '#addResultBtn', function (){ diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html index 56b28563..f022cef7 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html @@ -25,9 +25,9 @@