diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/FpiMgtController.java b/src/main/java/com/dbnt/faisp/fpiMgt/FpiMgtController.java index 7c53ffa9..0245e717 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/FpiMgtController.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/FpiMgtController.java @@ -60,6 +60,7 @@ public class FpiMgtController { // 외사경찰견문관리 planBoard = monthPlanService.selectPlanBoard(planBoard.getPlanKey()); }else{ planBoard.setWrtOrgan(loginUser.getOgCd()); + planBoard.setWrtPart(loginUser.getOfcCd()); planBoard.setWrtUserSeq(loginUser.getUserSeq()); planBoard.setWrtUserNm(loginUser.getUserNm()); planBoard.setWrtDt(LocalDateTime.now()); @@ -69,10 +70,17 @@ public class FpiMgtController { // 외사경찰견문관리 } @GetMapping("/planViewModal") - public ModelAndView planViewModal(PlanBoard planBoard){ + public ModelAndView planViewModal(@AuthenticationPrincipal UserInfo loginUser, PlanBoard planBoard){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/planViewModal"); planBoard = monthPlanService.selectPlanBoard(planBoard.getPlanKey()); mav.addObject("plan", planBoard); + mav.addObject("userSeq",loginUser.getUserSeq()); + Map params = new HashMap<>(); + params.put("userSeq", loginUser.getUserSeq()); + params.put("menuUrl", "/fpiMgt/monthPlanPage"); + //메뉴권한 확인 + mav.addObject("accessAuth", authMgtService.selectAccessConfigList(params).get(0).getAccessAuth()); + mav.addObject("approvalAuth", authMgtService.selectApprovalConfigList(params).get(0).getApprovalAuth()); return mav; } @@ -107,7 +115,12 @@ public class FpiMgtController { // 외사경찰견문관리 //결재권한 확인 String apprvAuth = authMgtService.selectApprovalConfigList(params).get(0).getApprovalAuth(); if(apprvAuth==null) { - planBoard.setWrtUserSeq(loginUser.getUserSeq()); + if(!accessAuth.equals("ACC003")){ + planBoard.setWrtUserSeq(loginUser.getUserSeq()); + planBoard.setUserType("normalStayList"); + }else{ + planBoard.setUserType("managerStayList"); + } }else{ mav.addObject("userNm", loginUser.getUserNm()); switch (apprvAuth){ @@ -160,17 +173,21 @@ public class FpiMgtController { // 외사경찰견문관리 //결재권한 확인 String apprvAuth = authMgtService.selectApprovalConfigList(params).get(0).getApprovalAuth(); if(apprvAuth==null) { - planBoard.setWrtUserSeq(loginUser.getUserSeq()); - planBoard.setUserType("normal"); + if(!accessAuth.equals("ACC003")){ + planBoard.setWrtUserSeq(loginUser.getUserSeq()); + planBoard.setUserType("normalCommitList"); + }else{ + planBoard.setUserType("managerCommitList"); + } }else{ switch (apprvAuth) { case "APC004": // 계장대행 case "APC003": // 계장 // 계장반려, 계장승인 문서 조회 - planBoard.setUserType("section"); + planBoard.setUserType("sectionCommitList"); break; case "APC002": // 부장대행 case "APC001": // 부장 // 부장반려, 부장승인 문서 조회 - planBoard.setUserType("head"); + planBoard.setUserType("headCommitList"); break; } } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/PlanBoard.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/PlanBoard.java index 97c06a67..5bcd7de2 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/PlanBoard.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/PlanBoard.java @@ -33,6 +33,8 @@ public class PlanBoard extends BaseModel { private LocalDate planDt; @Column(name = "wrt_organ") private String wrtOrgan; + @Column(name = "wrt_part") + private String wrtPart; @Column(name = "wrt_user_nm") private String wrtUserNm; @Column(name = "wrt_dt") @@ -50,6 +52,8 @@ public class PlanBoard extends BaseModel { @Transient private List mainInfoList; @Transient + private List apprvList; + @Transient private List fileList; @Transient private List multipartFileList; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/repository/PlanApprvRepository.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/repository/PlanApprvRepository.java index e3e4c278..20f31bf8 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/repository/PlanApprvRepository.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/repository/PlanApprvRepository.java @@ -3,9 +3,12 @@ package com.dbnt.faisp.fpiMgt.monthPlan.repository; import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanApprv; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; import java.util.Optional; public interface PlanApprvRepository extends JpaRepository { Optional findTopByPlanKeyOrderByApprvSeqDesc(Integer planKey); + + List findByPlanKey(Integer planKey); } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/service/MonthPlanService.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/service/MonthPlanService.java index cb7a1b54..b4144fe6 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/service/MonthPlanService.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/service/MonthPlanService.java @@ -36,6 +36,7 @@ public class MonthPlanService extends BaseService { if (savedPlan != null) { savedPlan.setFileList(planFileRepository.findByPlanKey(planKey)); savedPlan.setMainInfoList(planMainInfoRepository.findByPlanKey(planKey)); + savedPlan.setApprvList(planApprvRepository.findByPlanKey(planKey)); } return savedPlan; } diff --git a/src/main/resources/mybatisMapper/MonthPlanMapper.xml b/src/main/resources/mybatisMapper/MonthPlanMapper.xml index 493624ed..ed6c344c 100644 --- a/src/main/resources/mybatisMapper/MonthPlanMapper.xml +++ b/src/main/resources/mybatisMapper/MonthPlanMapper.xml @@ -44,13 +44,22 @@ - + + and a.plan_state in ('DST002', 'DST004') + + + and a.plan_state in ('DST003', 'DST005', 'DST006') + + and a.plan_state in ('DST003', 'DST004', 'DST005', 'DST006') - - and a.plan_state in ('DST003', 'DST004', 'DST005', 'DST006') + + and a.plan_state in ('DST003', 'DST005', 'DST006') - + + and a.plan_state in ('DST002', 'DST004') + + and a.plan_state in ('DST003', 'DST005', 'DST006') @@ -62,7 +71,9 @@ a.plan_state, a.plan_dt, a.wrt_organ, + a.wrt_part, a.wrt_user_nm, + a.wrt_user_seq, a.wrt_dt, b.fileCnt from plan_board a diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/commitPlan.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/commitPlan.html index feb3f2a7..4c1d2c16 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/commitPlan.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/commitPlan.html @@ -90,6 +90,8 @@ 제목 시행일자 + 관서 + 부서 작성자 작성일시 첨부파일 @@ -102,6 +104,12 @@ + + + + + + @@ -158,18 +166,8 @@