외사경찰견문관리 > 계획수립 로직 수정.

외사경찰견문관리 > 견문관리 작업중.

src/main/java/com/dbnt/faisp/authMgt/AuthMgtController.java

@@ -34,10 +34,8 @@ public class AuthMgtController {
   @GetMapping("/authEditModal")
   public ModelAndView menuEditModal(UserInfo userInfo){
     ModelAndView mav = new ModelAndView("adminPage/authMgt/authEditModal");
-    Map<String, Object> params = new HashMap<>();
+    userInfo.setAccessConfigList(authMgtService.selectAccessConfigList(userInfo.getUserSeq(), null));
-    params.put("userSeq", userInfo.getUserSeq());
+    userInfo.setApprovalConfigList(authMgtService.selectApprovalConfigList(userInfo.getUserSeq(), null));
-    userInfo.setAccessConfigList(authMgtService.selectAccessConfigList(params));
-    userInfo.setApprovalConfigList(authMgtService.selectApprovalConfigList(params));
     mav.addObject("userInfo", userInfo);
     return mav;
   }

src/main/java/com/dbnt/faisp/authMgt/service/AuthMgtService.java

@@ -10,6 +10,7 @@ import com.dbnt.faisp.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -21,12 +22,17 @@ public class AuthMgtService {
   private final AccessConfigRepository accessConfigRepository;
   private final ApprovalConfigRepository approvalConfigRepository;
 
-
+  public List<AccessConfig> selectAccessConfigList(Integer userSeq, String url) {
-  public List<AccessConfig> selectAccessConfigList(Map<String, Object> params) {
+    Map<String, Object> params = new HashMap<>();
+    params.put("userSeq", userSeq);
+    params.put("menuUrl", url);
     return authMgtMapper.selectAccessConfigList(params);
   }
 
-  public List<ApprovalConfig> selectApprovalConfigList(Map<String, Object> params) {
+  public List<ApprovalConfig> selectApprovalConfigList(Integer userSeq, String url) {
+    Map<String, Object> params = new HashMap<>();
+    params.put("userSeq", userSeq);
+    params.put("menuUrl", url);
     return authMgtMapper.selectApprovalConfigList(params);
   }
 

src/main/java/com/dbnt/faisp/config/FileController.java

@@ -1,6 +1,6 @@
 package com.dbnt.faisp.config;
 
-import com.dbnt.faisp.fpiMgt.monthPlan.service.PlanService;
+import com.dbnt.faisp.fpiMgt.affairPlan.service.PlanService;
 import com.dbnt.faisp.publicBoard.service.PublicBoardService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.util.FileCopyUtils;

src/main/java/com/dbnt/faisp/config/SecurityConfig.java

@@ -15,6 +15,7 @@ import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.security.web.DefaultRedirectStrategy;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.access.AccessDeniedHandler;
+import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.savedrequest.HttpSessionRequestCache;
 import org.springframework.security.web.savedrequest.SavedRequest;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
@@ -61,6 +62,20 @@ public class SecurityConfig{
     };
   }
 
+  @Bean
+  public AuthenticationSuccessHandler loginSuccessHandler() {
+    return (request, response, authentication) -> {
+      SavedRequest savedRequest = new HttpSessionRequestCache().getRequest(request,response);
+      baseController.setSession((UserInfo)authentication.getPrincipal(), request.getSession());
+      if(savedRequest != null){
+        String targetUrl = savedRequest.getRedirectUrl();
+        new DefaultRedirectStrategy().sendRedirect(request,response,targetUrl);
+      }else{
+        new DefaultRedirectStrategy().sendRedirect(request,response,"/");
+      }
+    };
+  }
+
   @Bean
   protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
     http.authorizeRequests() // 페이지 권한 설정
@@ -68,7 +83,8 @@ public class SecurityConfig{
               "/dashboard",
               "/refreshSession",
               "/publicBoard/**",
-              "/fpiMgt/**"
+              "/affairPlan/**",
+              "/affair/**"
           ).hasRole(Role.USER.name()) // USER 접근 허용
           .antMatchers(
               "/authMgt/**",
@@ -87,16 +103,7 @@ public class SecurityConfig{
           /*.failureHandler((request, response, exception) -> {
 
           })*/ // 로그인 실패시 동작 수행
-          .successHandler((request, response, authentication) -> {
+          .successHandler(loginSuccessHandler()) // 로그인 성공시 동작 수행.
-            SavedRequest savedRequest = new HttpSessionRequestCache().getRequest(request,response);
-            baseController.setSession((UserInfo)authentication.getPrincipal(), request.getSession());
-            if(savedRequest != null){
-              String targetUrl = savedRequest.getRedirectUrl();
-              new DefaultRedirectStrategy().sendRedirect(request,response,targetUrl);
-            }else{
-              new DefaultRedirectStrategy().sendRedirect(request,response,"/");
-            }
-          }) // 로그인 성공시 동작 수행.
         .and() // 로그아웃 설정
           .logout().logoutRequestMatcher(new AntPathRequestMatcher("/logout")) // 로그아웃 시 URL 재정의
           .logoutSuccessUrl("/") // 로그아웃 성공 시 redirect 이동

src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java

@@ -0,0 +1,194 @@
+package com.dbnt.faisp.fpiMgt.affair;
+
+import com.dbnt.faisp.authMgt.service.AuthMgtService;
+import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard;
+import com.dbnt.faisp.fpiMgt.affair.service.AffairService;
+import com.dbnt.faisp.userInfo.model.UserInfo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/affair")
+public class AffairController { // 첩보수집활동 > 외사경찰 견문관리 > 견문관리
+  private final AffairService affairService;
+  private final AuthMgtService authMgtService;
+
+  @GetMapping("/affairMgt")
+  public ModelAndView affairMgtPage(@AuthenticationPrincipal UserInfo loginUser, AffairBoard affairBoard){
+    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affair/affairMgt");
+    mav.addObject("page", "main");
+    mav.addObject("searchUrl", "/affair/affairMgt");
+    //메뉴권한 확인
+    String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getAccessAuth();
+    switch (accessAuth){
+      case "ACC001": // 조회
+      case "ACC002": // 작성 // 자신이 작성한 문서만 열람가능
+        affairBoard.setWrtUserSeq(loginUser.getUserSeq());
+        break;
+      case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능
+        affairBoard.setDownOrganCdList(loginUser.getDownOrganCdList());
+        mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
+        break;
+    }
+    //결재권한 확인
+    String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getApprovalAuth();
+    mav.addObject("accessAuth", accessAuth);
+    mav.addObject("apprvAuth", apprvAuth);
+    affairBoard.setQueryInfo();
+    mav.addObject("affairList", affairService.selectAffairBoardList(affairBoard));
+    affairBoard.setContentCnt(affairService.selectAffairBoardListCnt(affairBoard));
+    affairBoard.setPaginationInfo();
+    mav.addObject("searchParams", affairBoard);
+    return mav;
+  }
+
+  @GetMapping("/stayPage")
+  public ModelAndView apprvStayPage(@AuthenticationPrincipal UserInfo loginUser, AffairBoard affairBoard){
+    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affair/affairMgt");
+    mav.addObject("page", "stay");
+    mav.addObject("searchUrl", "/affair/stayPage");
+    //메뉴권한 확인
+    String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getAccessAuth();
+    switch (accessAuth){
+      case "ACC001": // 조회
+      case "ACC002": // 작성 // 자신의 관서 내에서 작성한 문서만 열람가능
+        affairBoard.setWrtOrgan(loginUser.getOgCd());
+        break;
+      case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능
+        affairBoard.setDownOrganCdList(loginUser.getDownOrganCdList());
+        mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
+        break;
+    }
+    //결재권한 확인
+    String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getApprovalAuth();
+    if(apprvAuth==null) {
+      if(!accessAuth.equals("ACC003")){
+        affairBoard.setWrtUserSeq(loginUser.getUserSeq());
+        affairBoard.setUserType("normalStayList");
+      }else{
+        affairBoard.setUserType("managerStayList");
+      }
+    }else{
+      mav.addObject("userNm", loginUser.getUserNm());
+      switch (apprvAuth){
+        case "APC004": // 계장대행
+        case "APC003": // 계장 // 결재대기 문서 조회
+          affairBoard.setAffairStatus("DST002");
+          break;
+        case "APC002": // 부장대행
+        case "APC001": // 부장 // 계장승인 문서 조회
+          affairBoard.setAffairStatus("DST004");
+          break;
+      }
+    }
+    mav.addObject("accessAuth", accessAuth);
+    mav.addObject("apprvAuth", apprvAuth);
+    affairBoard.setQueryInfo();
+    mav.addObject("affairList", affairService.selectAffairBoardList(affairBoard));
+    affairBoard.setContentCnt(affairService.selectAffairBoardListCnt(affairBoard));
+    affairBoard.setPaginationInfo();
+    mav.addObject("searchParams", affairBoard);
+    return mav;
+  }
+
+  @GetMapping("/commitPage")
+  public ModelAndView apprvCommitPage(@AuthenticationPrincipal UserInfo loginUser, AffairBoard affairBoard){
+    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affair/affairMgt");
+    mav.addObject("page", "commit");
+    mav.addObject("searchUrl", "/affair/commitPage");
+    //메뉴권한 확인
+    String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getAccessAuth();
+    switch (accessAuth){
+      case "ACC001": // 조회
+      case "ACC002": // 작성 // 자신의 관서 내에서 작성한 문서만 열람가능
+        affairBoard.setWrtOrgan(loginUser.getOgCd());
+        break;
+      case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능
+        affairBoard.setDownOrganCdList(loginUser.getDownOrganCdList());
+        mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
+        break;
+    }
+    //결재권한 확인
+    String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getApprovalAuth();
+    if(apprvAuth==null) {
+      if(!accessAuth.equals("ACC003")){
+        affairBoard.setWrtUserSeq(loginUser.getUserSeq());
+        affairBoard.setUserType("normalCommitList");
+      }else{
+        affairBoard.setUserType("managerCommitList");
+      }
+    }else{
+      switch (apprvAuth) {
+        case "APC004": // 계장대행
+        case "APC003": // 계장 // 계장반려, 계장승인 문서 조회
+          affairBoard.setUserType("sectionCommitList");
+          break;
+        case "APC002": // 부장대행
+        case "APC001": // 부장 // 부장반려, 부장승인 문서 조회
+          affairBoard.setUserType("headCommitList");
+          break;
+      }
+    }
+    mav.addObject("accessAuth", accessAuth);
+    mav.addObject("apprvAuth", apprvAuth);
+    affairBoard.setQueryInfo();
+    mav.addObject("affairList", affairService.selectAffairBoardList(affairBoard));
+    affairBoard.setContentCnt(affairService.selectAffairBoardListCnt(affairBoard));
+    affairBoard.setPaginationInfo();
+    mav.addObject("searchParams", affairBoard);
+    return mav;
+  }
+
+  @GetMapping("/affairEditModal")
+  public ModelAndView affairEditModal(@AuthenticationPrincipal UserInfo loginUser, AffairBoard affairBoard){
+    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affair/affairEditModal");
+    if(affairBoard.getAffairKey()!=null){
+      affairBoard = affairService.selectAffairBoard(affairBoard.getAffairKey());
+    }else{
+      affairBoard.setWrtOrgan(loginUser.getOgCd());
+      affairBoard.setWrtPart(loginUser.getOfcCd());
+      affairBoard.setWrtUserSeq(loginUser.getUserSeq());
+      affairBoard.setWrtUserNm(loginUser.getUserNm());
+      affairBoard.setWrtDt(LocalDateTime.now());
+    }
+    mav.addObject("affair", affairBoard);
+    return mav;
+  }
+
+  @GetMapping("/affairViewModal")
+  public ModelAndView affairViewModal(@AuthenticationPrincipal UserInfo loginUser, AffairBoard affairBoard){
+    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affair/affairViewModal");
+    affairBoard = affairService.selectAffairBoard(affairBoard.getAffairKey());
+    mav.addObject("affair", affairBoard);
+    mav.addObject("userSeq",loginUser.getUserSeq());
+    //메뉴권한 확인
+    mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getAccessAuth());
+    mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getApprovalAuth());
+    return mav;
+  }
+
+  @PostMapping("/saveAffair")
+  public Integer saveAffair(AffairBoard affairBoard,
+                          MultipartHttpServletRequest request,
+                          @RequestParam(value = "fileSeq", required = false) List<Integer> deleteFileSeq){
+    affairBoard.setMultipartFileList(request.getMultiFileMap().get("uploadFiles"));
+    return affairService.saveAffairBoard(affairBoard, deleteFileSeq);
+  }
+
+  /*@PostMapping("/affairStateChange")
+  public Integer affairStateChange(@AuthenticationPrincipal UserInfo loginUser, AffairApprv apprv){
+    apprv.setUserSeq(loginUser.getUserSeq());
+    apprv.setUserNm(loginUser.getUserNm());
+    apprv.setSaveDt(LocalDateTime.now());
+    return affairService.affairStateChange(apprv);
+  }*/
+}

src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java

@@ -48,12 +48,12 @@ public class AffairBoard extends BaseModel {
   @Column(name = "wrt_dt")
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
   private LocalDateTime wrtDt;
-  @Column(name = "plan_state")
-  private String planState;
   @Column(name = "wrt_user_seq")
   private Integer wrtUserSeq;
 
 
+  @Transient
+  private String userType;
   @Transient
   private List<AffairFile> fileList;
   @Transient

src/main/java/com/dbnt/faisp/fpiMgt/affair/service/AffairService.java

@@ -5,8 +5,10 @@ import com.dbnt.faisp.config.BaseService;
 import com.dbnt.faisp.fpiMgt.affair.mapper.AffairMapper;
 import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard;
 import com.dbnt.faisp.fpiMgt.affair.model.AffairFile;
+import com.dbnt.faisp.fpiMgt.affair.model.AffairRating;
 import com.dbnt.faisp.fpiMgt.affair.repository.*;
-import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanFile;
+import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanApprv;
+import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,7 +31,7 @@ public class AffairService extends BaseService { // 견문보고
   public List<AffairBoard> selectAffairBoardList(AffairBoard affair){
     return affairMapper.selectAffairBoardList(affair);
   }
-  public Integer selectAffairBoardCnt(AffairBoard affair){
+  public Integer selectAffairBoardListCnt(AffairBoard affair){
     return affairMapper.selectAffairBoardCnt(affair);
   }
 
@@ -67,7 +69,7 @@ public class AffairService extends BaseService { // 견문보고
     int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1);
     for(MultipartFile file : multipartFileList){
       String saveName = UUID.randomUUID().toString();
-      String path = locationPath+File.separator+"monthPlan"+File.separator;
+      String path = locationPath+File.separator+"affair"+File.separator;
       saveFile(file, new File(path+File.separator+saveName));
 
       String originalFilename = file.getOriginalFilename();

src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/PlanController.java

@@ -1,10 +1,9 @@
-package com.dbnt.faisp.fpiMgt;
+package com.dbnt.faisp.fpiMgt.affairPlan;
 
 import com.dbnt.faisp.authMgt.service.AuthMgtService;
-import com.dbnt.faisp.fpiMgt.affair.service.AffairService;
+import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanApprv;
-import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanApprv;
+import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard;
-import com.dbnt.faisp.fpiMgt.monthPlan.service.PlanService;
+import com.dbnt.faisp.fpiMgt.affairPlan.service.PlanService;
-import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanBoard;
 import com.dbnt.faisp.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -19,20 +18,18 @@ import java.util.Map;
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/fpiMgt")
+@RequestMapping("/affairPlan")
-public class FpiMgtController { // 첩보수집활동
+public class PlanController { // 첩보수집활동 > 외사경찰 견문관리 > 계획수립
   private final PlanService planService;
-  private final AffairService affairService;
   private final AuthMgtService authMgtService;
 
-  @GetMapping("/monthPlanPage")
+  @GetMapping("/planMgt")
   public ModelAndView monthPlanPage(@AuthenticationPrincipal UserInfo loginUser, PlanBoard planBoard){
-    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/monthPlan");
+    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/planMgt");
-    Map<String, Object> params = new HashMap<>();
+    mav.addObject("page", "main");
-    params.put("userSeq", loginUser.getUserSeq());
+    mav.addObject("searchUrl", "/affairPlan/planMgt");
-    params.put("menuUrl", "/fpiMgt/monthPlanPage");
     //메뉴권한 확인
-    String accessAuth = authMgtService.selectAccessConfigList(params).get(0).getAccessAuth();
+    String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getAccessAuth();
     switch (accessAuth){
       case "ACC001": // 조회
       case "ACC002": // 작성 // 자신이 작성한 문서만 열람가능
@@ -44,7 +41,104 @@ public class FpiMgtController { // 첩보수집활동
         break;
     }
     //결재권한 확인
-    String apprvAuth = authMgtService.selectApprovalConfigList(params).get(0).getApprovalAuth();
+    String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getApprovalAuth();
+    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();
+    switch (accessAuth){
+      case "ACC001": // 조회
+      case "ACC002": // 작성 // 자신의 관서 내에서 작성한 문서만 열람가능
+        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();
+    if(apprvAuth==null) {
+      if(!accessAuth.equals("ACC003")){
+        planBoard.setWrtUserSeq(loginUser.getUserSeq());
+        planBoard.setUserType("normalStayList");
+      }else{
+        planBoard.setUserType("managerStayList");
+      }
+    }else{
+      mav.addObject("userNm", loginUser.getUserNm());
+      switch (apprvAuth){
+        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();
+    switch (accessAuth){
+      case "ACC001": // 조회
+      case "ACC002": // 작성 // 자신의 관서 내에서 작성한 문서만 열람가능
+        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();
+    if(apprvAuth==null) {
+      if(!accessAuth.equals("ACC003")){
+        planBoard.setWrtUserSeq(loginUser.getUserSeq());
+        planBoard.setUserType("normalCommitList");
+      }else{
+        planBoard.setUserType("managerCommitList");
+      }
+    }else{
+      switch (apprvAuth) {
+        case "APC004": // 계장대행
+        case "APC003": // 계장 // 계장반려, 계장승인 문서 조회
+          planBoard.setUserType("sectionCommitList");
+          break;
+        case "APC002": // 부장대행
+        case "APC001": // 부장 // 부장반려, 부장승인 문서 조회
+          planBoard.setUserType("headCommitList");
+          break;
+      }
+    }
     mav.addObject("accessAuth", accessAuth);
     mav.addObject("apprvAuth", apprvAuth);
     planBoard.setQueryInfo();
@@ -77,12 +171,9 @@ public class FpiMgtController { // 첩보수집활동
     planBoard = planService.selectPlanBoard(planBoard.getPlanKey());
     mav.addObject("plan", planBoard);
     mav.addObject("userSeq",loginUser.getUserSeq());
-    Map<String, Object> params = new HashMap<>();
-    params.put("userSeq", loginUser.getUserSeq());
-    params.put("menuUrl", "/fpiMgt/monthPlanPage");
     //메뉴권한 확인
-    mav.addObject("accessAuth", authMgtService.selectAccessConfigList(params).get(0).getAccessAuth());
+    mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getAccessAuth());
-    mav.addObject("approvalAuth", authMgtService.selectApprovalConfigList(params).get(0).getApprovalAuth());
+    mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getApprovalAuth());
     return mav;
   }
 
@@ -96,55 +187,6 @@ public class FpiMgtController { // 첩보수집활동
     return planService.savePlanBoard(planBoard, planInfos, detailPlanInfos, deleteFileSeq);
   }
 
-  @GetMapping("/apprvStayPage")
-  public ModelAndView apprvStayPage(@AuthenticationPrincipal UserInfo loginUser, PlanBoard planBoard){
-    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/stayPlan");
-    Map<String, Object> params = new HashMap<>();
-    params.put("userSeq", loginUser.getUserSeq());
-    params.put("menuUrl", "/fpiMgt/monthPlanPage");
-    //메뉴권한 확인
-    String accessAuth = authMgtService.selectAccessConfigList(params).get(0).getAccessAuth();
-    switch (accessAuth){
-      case "ACC001": // 조회
-      case "ACC002": // 작성 // 자신의 관서 내에서 작성한 문서만 열람가능
-        planBoard.setWrtOrgan(loginUser.getOgCd());
-        break;
-      case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능
-        planBoard.setDownOrganCdList(loginUser.getDownOrganCdList());
-        mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
-        break;
-    }
-    //결재권한 확인
-    String apprvAuth = authMgtService.selectApprovalConfigList(params).get(0).getApprovalAuth();
-    if(apprvAuth==null) {
-      if(!accessAuth.equals("ACC003")){
-        planBoard.setWrtUserSeq(loginUser.getUserSeq());
-        planBoard.setUserType("normalStayList");
-      }else{
-        planBoard.setUserType("managerStayList");
-      }
-    }else{
-      mav.addObject("userNm", loginUser.getUserNm());
-      switch (apprvAuth){
-        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;
-  }
 
   @PostMapping("/planStateChange")
   public Integer planStateChange(@AuthenticationPrincipal UserInfo loginUser, PlanApprv apprv){
@@ -153,53 +195,4 @@ public class FpiMgtController { // 첩보수집활동
     apprv.setSaveDt(LocalDateTime.now());
     return planService.planStateChange(apprv);
   }
-
-  @GetMapping("/apprvCommitPage")
-  public ModelAndView apprvCommitPage(@AuthenticationPrincipal UserInfo loginUser, PlanBoard planBoard){
-    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/commitPlan");
-    Map<String, Object> params = new HashMap<>();
-    params.put("userSeq", loginUser.getUserSeq());
-    params.put("menuUrl", "/fpiMgt/monthPlanPage");
-    //메뉴권한 확인
-    String accessAuth = authMgtService.selectAccessConfigList(params).get(0).getAccessAuth();
-    switch (accessAuth){
-      case "ACC001": // 조회
-      case "ACC002": // 작성 // 자신의 관서 내에서 작성한 문서만 열람가능
-        planBoard.setWrtOrgan(loginUser.getOgCd());
-        break;
-      case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능
-        planBoard.setDownOrganCdList(loginUser.getDownOrganCdList());
-        mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
-        break;
-    }
-    //결재권한 확인
-    String apprvAuth = authMgtService.selectApprovalConfigList(params).get(0).getApprovalAuth();
-    if(apprvAuth==null) {
-      if(!accessAuth.equals("ACC003")){
-        planBoard.setWrtUserSeq(loginUser.getUserSeq());
-        planBoard.setUserType("normalCommitList");
-      }else{
-        planBoard.setUserType("managerCommitList");
-      }
-    }else{
-      switch (apprvAuth) {
-        case "APC004": // 계장대행
-        case "APC003": // 계장 // 계장반려, 계장승인 문서 조회
-          planBoard.setUserType("sectionCommitList");
-          break;
-        case "APC002": // 부장대행
-        case "APC001": // 부장 // 부장반려, 부장승인 문서 조회
-          planBoard.setUserType("headCommitList");
-          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;
-  }
 }

src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/mapper/PlanMapper.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.fpiMgt.monthPlan.mapper;
+package com.dbnt.faisp.fpiMgt.affairPlan.mapper;
 
-import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanBoard;
+import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanApprv.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fpiMgt.monthPlan.model;
+package com.dbnt.faisp.fpiMgt.affairPlan.model;
 
 import lombok.*;
 import org.hibernate.annotations.DynamicInsert;

src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanBoard.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fpiMgt.monthPlan.model;
+package com.dbnt.faisp.fpiMgt.affairPlan.model;
 
 import com.dbnt.faisp.config.BaseModel;
 import lombok.Getter;

src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanFile.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fpiMgt.monthPlan.model;
+package com.dbnt.faisp.fpiMgt.affairPlan.model;
 
 import com.dbnt.faisp.config.FileInfo;
 import lombok.*;

src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanMainInfo.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fpiMgt.monthPlan.model;
+package com.dbnt.faisp.fpiMgt.affairPlan.model;
 
 import lombok.*;
 import org.hibernate.annotations.DynamicInsert;

src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanApprvRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.fpiMgt.monthPlan.repository;
+package com.dbnt.faisp.fpiMgt.affairPlan.repository;
 
-import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanApprv;
+import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanApprv;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanBoardRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.fpiMgt.monthPlan.repository;
+package com.dbnt.faisp.fpiMgt.affairPlan.repository;
 
-import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanBoard;
+import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 

src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanFileRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.fpiMgt.monthPlan.repository;
+package com.dbnt.faisp.fpiMgt.affairPlan.repository;
 
-import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanFile;
+import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanFile;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanMainInfoRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.fpiMgt.monthPlan.repository;
+package com.dbnt.faisp.fpiMgt.affairPlan.repository;
 
-import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanMainInfo;
+import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanMainInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/service/PlanService.java

@@ -1,17 +1,17 @@
-package com.dbnt.faisp.fpiMgt.monthPlan.service;
+package com.dbnt.faisp.fpiMgt.affairPlan.service;
 
 
 import com.dbnt.faisp.config.BaseService;
 import com.dbnt.faisp.config.FileInfo;
-import com.dbnt.faisp.fpiMgt.monthPlan.mapper.PlanMapper;
+import com.dbnt.faisp.fpiMgt.affairPlan.mapper.PlanMapper;
-import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanApprv;
+import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanApprv;
-import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanBoard;
+import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard;
-import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanFile;
+import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanFile;
-import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanMainInfo;
+import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanMainInfo;
-import com.dbnt.faisp.fpiMgt.monthPlan.repository.PlanApprvRepository;
+import com.dbnt.faisp.fpiMgt.affairPlan.repository.PlanApprvRepository;
-import com.dbnt.faisp.fpiMgt.monthPlan.repository.PlanBoardRepository;
+import com.dbnt.faisp.fpiMgt.affairPlan.repository.PlanBoardRepository;
-import com.dbnt.faisp.fpiMgt.monthPlan.repository.PlanFileRepository;
+import com.dbnt.faisp.fpiMgt.affairPlan.repository.PlanFileRepository;
-import com.dbnt.faisp.fpiMgt.monthPlan.repository.PlanMainInfoRepository;
+import com.dbnt.faisp.fpiMgt.affairPlan.repository.PlanMainInfoRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/dbnt/faisp/translator/TranslatorController.java

@@ -36,9 +36,6 @@ public class TranslatorController {
   @GetMapping("/info")
   public ModelAndView translatorInfo(@AuthenticationPrincipal UserInfo loginUser,Translator translator,HttpServletResponse response) {
     ModelAndView mav = new ModelAndView("translator/translator");
-    Map<String, Object> params = new HashMap<>();
-    params.put("userSeq", loginUser.getUserSeq());
-    params.put("menuUrl", "/translator/info");
     translator.setDownOrganCdList(loginUser.getDownOrganCdList());
     //엑셀다운
     if(translator.getExcel() != null && translator.getExcel().equals("Y")){
@@ -57,7 +54,7 @@ public class TranslatorController {
 		return null;
     }
     //메뉴권한 확인
-    String accessAuth = authMgtService.selectAccessConfigList(params).get(0).getAccessAuth();
+    String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/translator/info").get(0).getAccessAuth();
     
     mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
     mav.addObject("accessAuth", accessAuth);
@@ -79,11 +76,8 @@ public class TranslatorController {
   @GetMapping("/translatorEditModal")
   public ModelAndView translatorEditModal(@AuthenticationPrincipal UserInfo loginUser,Translator translator){
     ModelAndView mav = new ModelAndView("translator/translatorEditModal");
-    Map<String, Object> params = new HashMap<>();
-    params.put("userSeq", loginUser.getUserSeq());
-    params.put("menuUrl", "/translator/info");
     //메뉴권한 확인
-    String accessAuth = authMgtService.selectAccessConfigList(params).get(0).getAccessAuth();
+    String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/translator/info").get(0).getAccessAuth();
     mav.addObject("trInfo", translatorSevice.selectTranslatorView(translator));
     mav.addObject("accessAuth", accessAuth);
     return mav;
@@ -113,11 +107,8 @@ public class TranslatorController {
   @GetMapping("/careerView")
   public ModelAndView careerView(@AuthenticationPrincipal UserInfo loginUser,TranslatorCrr translatorCrr){
     ModelAndView mav = new ModelAndView("translator/translatorCareerModal");
-    Map<String, Object> params = new HashMap<>();
-    params.put("userSeq", loginUser.getUserSeq());
-    params.put("menuUrl", "/translator/info");
     //메뉴권한 확인
-    String accessAuth = authMgtService.selectAccessConfigList(params).get(0).getAccessAuth();
+    String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/translator/info").get(0).getAccessAuth();
     mav.addObject("policeCrr", translatorSevice.selectMaritimePoliceCareer(translatorCrr));
     mav.addObject("anotherCrr", translatorSevice.selectAnotherOrganizationCareer(translatorCrr));
     mav.addObject("trKey", translatorCrr.getTranslatorKey());

src/main/resources/mybatisMapper/AffairMapper.xml

@@ -4,7 +4,7 @@
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.dbnt.faisp.fpiMgt.affair.mapper.AffairMapper">
-  <sql id="selectAffairBoardListWhere">
+  <sql id="selectAffairBoardWhere">
     <where>
       <if test='wrtUserSeq != null and wrtUserSeq != ""'>
         and a.wrt_user_seq = #{wrtUserSeq}
@@ -15,11 +15,11 @@
       <if test='wrtOrgan != null and wrtOrgan != ""'>
         and a.wrt_organ = #{wrtOrgan}
       </if>
-      <if test='contentTitle != null and contentTitle != ""'>
+      <if test='title != null and title != ""'>
-        and a.content_title like '%'||#{contentTitle}||'%'
+        and a.title like '%'||#{title}||'%'
       </if>
-      <if test='affairState != null and affairState != ""'>
+      <if test='affairStatus != null and affairStatus != ""'>
-        and a.affair_state = #{affairState}
+        and a.affair_status = #{affairStatus}
       </if>
       <if test='dateSelector == "wrtDt"'>
         <if test='startDate != null and startDate != ""'>
@@ -40,7 +40,7 @@
   <select id="selectAffairBoardList" resultType="AffairBoard" parameterType="AffairBoard">
     select a.affair_key,
            a.title,
-           a.affair_state,
+           a.affair_status,
            a.wrt_organ,
            a.wrt_part,
            a.wrt_user_nm,
@@ -53,13 +53,13 @@
                             from affair_file
                             group by affair_key) b
              on a.affair_key = b.affair_key
-    <include refid="selectAffairBoardListWhere"></include>
+    <include refid="selectAffairBoardWhere"></include>
     order by affair_key desc
     limit #{rowCnt} offset #{firstIndex}
   </select>
-  <select id="selectAffairBoardListCnt" resultType="int" parameterType="AffairBoard">
+  <select id="selectAffairBoardCnt" resultType="int" parameterType="AffairBoard">
     select count(*)
     from affair_board a
-    <include refid="selectAffairBoardListWhere"></include>
+    <include refid="selectAffairBoardWhere"></include>
   </select>
 </mapper>

src/main/resources/mybatisMapper/PlanMapper.xml

@@ -3,7 +3,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.dbnt.faisp.fpiMgt.monthPlan.mapper.PlanMapper">
+<mapper namespace="com.dbnt.faisp.fpiMgt.affairPlan.mapper.PlanMapper">
   <sql id="selectPlanBoardListWhere">
     <where>
       <if test='wrtUserSeq != null and wrtUserSeq != ""'>

src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js

@@ -0,0 +1,125 @@
+let files = [];
+
+$(function(){
+  $("#dateSelectorDiv").datepicker({
+    format: "yyyy-mm-dd",
+    language: "ko"
+  });
+})
+$(document).on('click', '#affairTab', function (){
+  location.href = "/affair/affairMgt";
+})
+$(document).on('click', '#stayTab', function (){
+  location.href = "/affair/stayPage";
+})
+$(document).on('click', '#commitTab', function (){
+  location.href = "/affair/commitPage";
+})
+$(document).on('click', '.affairTr', function (){
+  $(".trChkBox").prop("checked", false);
+  $(this).find(".trChkBox").prop("checked", true);
+  getAffairViewModal(Number($(this).find(".affairKey").val()));
+})
+$(document).on('click', '#addAffairBtn', function (){
+  getAffairEditModal(null)
+})
+$(document).on('click', '#editAffairBtn', function (){
+  $("#affairViewModal").modal('hide');
+  getAffairEditModal(Number($("#affairViewBody").find("[name='affairKey']").val()));
+})
+
+$(document).on('click', '#saveAffairBtn', function (){
+  saveAffair('DST002')
+})
+$(document).on('click', '#saveTempBtn', function (){
+  saveAffair('DST001')
+})
+
+function getAffairViewModal(affairKey){
+  $.ajax({
+    url: '/affair/affairViewModal',
+    data: {affairKey: affairKey},
+    type: 'GET',
+    dataType:"html",
+    success: function(html){
+      $("#affairViewBody").empty().append(html)
+      $("#affairViewModal").modal('show');
+    },
+    error:function(){
+
+    }
+  });
+}
+
+function getAffairEditModal(affairKey){
+  $.ajax({
+    url: '/affair/affairEditModal',
+    data: {affairKey: affairKey},
+    type: 'GET',
+    dataType:"html",
+    success: function(html){
+      $("#affairEditModalContent").empty().append(html)
+      $("#affairEditModal").modal('show');
+      $("#content").summernote({
+        lang:'ko-KR',
+        height: 120,
+        disableDragAndDrop: true,
+        toolbar: [
+          ['style', ['style']],
+          ['font', ['bold', 'underline', 'clear']],
+          ['color', ['color']],
+          ['para', ['ul', 'ol', 'paragraph']],
+          ['table', ['table']]
+        ]
+      });
+      setUploadDiv();
+    },
+    error:function(){
+
+    }
+  });
+}
+function saveAffair(affairStatus){
+  if(contentCheck()){
+    if(confirm("저장하시겠습니까?")){
+      $("#affairStatus").val(affairStatus);
+      contentFade("in");
+      const formData = new FormData($("#affairEditForm")[0]);
+      for(const file of files) {
+        if(!file.isDelete)
+          formData.append('uploadFiles', file, file.name);
+      }
+      $(".text-decoration-line-through").each(function (idx, el){
+        formData.append('fileSeq', $(el).attr("data-fileseq"));
+      })
+      $.ajax({
+        type : 'POST',
+        data : formData,
+        url : "/affair/saveAffair",
+        processData: false,
+        contentType: false,
+        success : function(result) {
+          alert("저장되었습니다.");
+          contentFade("out");
+          $("#affairEditModal").modal('hide');
+          getAffairViewModal(result);
+        },
+        error : function(xhr, status) {
+          alert("저장에 실패하였습니다.")
+          contentFade("out");
+        }
+      })
+    }
+  }
+}
+
+
+function contentCheck(){
+  let flag = true;
+  if(!$("#title").val()){
+    alert("제목을 입력해주세요.")
+    flag = false;
+  }
+  flag = fileCheck(flag, files);
+  return flag;
+}

src/main/resources/static/js/igActivities/fpiMgt/affairPlan.js

@@ -1,26 +0,0 @@
-$(document).on('click', '#monthPlanTab', function (){
-  location.href = "/fpiMgt/monthPlanPage";
-})
-$(document).on('click', '#apprvStayTab', function (){
-  location.href = "/fpiMgt/apprvStayPage";
-})
-$(document).on('click', '#apprvCommitTab', function (){
-  location.href = "/fpiMgt/apprvCommitPage";
-})
-
-
-function getViewModal(planKey){
-  $.ajax({
-    url: '/fpiMgt/planViewModal',
-    data: {planKey: planKey},
-    type: 'GET',
-    dataType:"html",
-    success: function(html){
-      $("#planViewBody").empty().append(html)
-      $("#planViewModal").modal('show');
-    },
-    error:function(){
-
-    }
-  });
-}

src/main/resources/static/js/igActivities/fpiMgt/commitPlan.js

@@ -1,33 +0,0 @@
-
-$(document).on('click', '.planTr', function (){
-  $(".trChkBox").prop("checked", false);
-  $(this).find(".trChkBox").prop("checked", true);
-  getViewModal(Number($(this).find(".planKey").val()));
-})
-
-$(document).on('click', '.apprvBtn', function (){
-  $("#apprvFormPlanKey").val($("#viewModalPlanKey").val());
-  $("#viewModalApprvValue").val($(this).attr("data-planstate"));
-  if(confirm($(this).val()+"하시겠습니까?")){
-    const formData = new FormData($("#apprvForm")[0]);
-    contentFade("in")
-    $.ajax({
-      type : 'POST',
-      data : formData,
-      url : "/fpiMgt/planStateChange",
-      processData: false,
-      contentType: false,
-      beforeSend: function (xhr){
-        xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
-      },
-      success : function(result) {
-        alert("저장되었습니다")
-        contentFade("out");
-      },
-      error : function(xhr, status) {
-        alert("저장에 실패하였습니다.");
-        contentFade("out");
-      }
-    })
-  }
-})

src/main/resources/static/js/igActivities/fpiMgt/plan/planMgt.js

@@ -7,17 +7,22 @@ $(function(){
   });
 })
 
-$(document).on('click', '.planTr', function (){
+$(document).on('click', '#planTab', function (){
-  $(".trChkBox").prop("checked", false);
+  location.href = "/affairPlan/planMgt";
-  $(this).find(".trChkBox").prop("checked", true);
-  getViewModal(Number($(this).find(".planKey").val()));
 })
+$(document).on('click', '#stayTab', function (){
+  location.href = "/affairPlan/stayPage";
+})
+$(document).on('click', '#commitTab', function (){
+  location.href = "/affairPlan/commitPage";
+})
+
 $(document).on('click', '#addPlanBtn', function (){
-  getEditModal(null)
+  getPlanEditModal(null)
 })
 $(document).on('click', '#editPlanBtn', function (){
   $("#planViewModal").modal('hide');
-  getEditModal(Number($("#planViewBody").find("[name='planKey']").val()));
+  getPlanEditModal(Number($("#planViewBody").find("[name='planKey']").val()));
 })
 
 $(document).on('click', '#planAddBtn', function (){
@@ -45,13 +50,63 @@ $(document).on('click', '#detailPlanAddBtn', function (){
 $(document).on('click', '#savePlanBtn', function (){
   savePlan('DST002')
 })
+
 $(document).on('click', '#saveTempBtn', function (){
   savePlan('DST001')
 })
 
-function getEditModal(planKey){
+$(document).on('click', '.planTr', function (){
+  $(".trChkBox").prop("checked", false);
+  $(this).find(".trChkBox").prop("checked", true);
+  getPlanViewModal(Number($(this).find(".planKey").val()));
+})
+
+$(document).on('click', '.apprvBtn', function (){
+  $("#apprvFormPlanKey").val($("#viewModalPlanKey").val());
+  $("#viewModalApprvValue").val($(this).attr("data-planstate"));
+  if(confirm($(this).val()+"하시겠습니까?")){
+    const formData = new FormData($("#apprvForm")[0]);
+    contentFade("in")
+    $.ajax({
+      type : 'POST',
+      data : formData,
+      url : "/affairPlan/planStateChange",
+      processData: false,
+      contentType: false,
+      beforeSend: function (xhr){
+        xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
+      },
+      success : function(result) {
+        alert("저장되었습니다")
+        contentFade("out");
+      },
+      error : function(xhr, status) {
+        alert("저장에 실패하였습니다.");
+        contentFade("out");
+      }
+    })
+  }
+})
+
+function getPlanViewModal(planKey){
   $.ajax({
-    url: '/fpiMgt/planEditModal',
+    url: '/affairPlan/planViewModal',
+    data: {planKey: planKey},
+    type: 'GET',
+    dataType:"html",
+    success: function(html){
+      $("#planViewBody").empty().append(html)
+      $("#planViewModal").modal('show');
+    },
+    error:function(){
+
+    }
+  });
+}
+
+function getPlanEditModal(planKey){
+  $.ajax({
+    url: '/affairPlan/planEditModal',
     data: {planKey: planKey},
     type: 'GET',
     dataType:"html",
@@ -97,14 +152,14 @@ function savePlan(planState){
       $.ajax({
         type : 'POST',
         data : formData,
-        url : "/fpiMgt/savePlan",
+        url : "/affairPlan/savePlan",
         processData: false,
         contentType: false,
         success : function(result) {
           alert("저장되었습니다.");
           contentFade("out");
           $("#planEditModal").modal('hide');
-          getViewModal(result);
+          getPlanViewModal(result);
         },
         error : function(xhr, status) {
           alert("저장에 실패하였습니다.")

src/main/resources/static/js/igActivities/fpiMgt/stayPlan.js

@@ -1,33 +0,0 @@
-
-$(document).on('click', '.planTr', function (){
-  $(".trChkBox").prop("checked", false);
-  $(this).find(".trChkBox").prop("checked", true);
-  getViewModal(Number($(this).find(".planKey").val()));
-})
-
-$(document).on('click', '.apprvBtn', function (){
-  $("#apprvFormPlanKey").val($("#viewModalPlanKey").val());
-  $("#viewModalApprvValue").val($(this).attr("data-planstate"));
-  if(confirm($(this).val()+"하시겠습니까?")){
-    const formData = new FormData($("#apprvForm")[0]);
-    contentFade("in")
-    $.ajax({
-      type : 'POST',
-      data : formData,
-      url : "/fpiMgt/planStateChange",
-      processData: false,
-      contentType: false,
-      beforeSend: function (xhr){
-        xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
-      },
-      success : function(result) {
-        alert("저장되었습니다")
-        contentFade("out");
-      },
-      error : function(xhr, status) {
-        alert("저장에 실패하였습니다.");
-        contentFade("out");
-      }
-    })
-  }
-})

src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html

@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<div class="modal-header">
+  <h5 class="modal-title" id="affairEditModalLabel" th:text="${affair.affairKey eq null?'월간 계획 작성':'월간 계획 수정'}"></h5>
+  <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+</div>
+<div class="modal-body" id="affairEditBody">
+  <form action="#" method="post" id="affairEditForm">
+    <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
+    <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+    <input type="hidden" name="affairKey" th:value="${affair.affairKey}">
+    <input type="hidden" name="wrtOrgan" th:value="${affair.wrtOrgan}">
+    <input type="hidden" name="wrtPart" th:value="${affair.wrtPart}">
+    <input type="hidden" name="wrtUserSeq" th:value="${affair.wrtUserSeq}">
+    <input type="hidden" name="affairStatus" id="affairStatus" th:value="${affair.affairStatus}">
+    <div class="mb-3 row">
+      <label for="wrtUserNm" class="col-sm-1 col-form-label text-center">작성자</label>
+      <div class="col-sm-2">
+        <input type="text" class="form-control" id="wrtUserNm" name="wrtUserNm" th:value="${affair.wrtUserNm}" readonly>
+      </div>
+      <label for="wrtDt" class="col-sm-1 col-form-label text-center">작성일시</label>
+      <div class="col-sm-2">
+        <input type="text" class="form-control" id="wrtDt" name="wrtDt" th:value="${#temporals.format(affair.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
+      </div>
+    </div>
+    <div class="mb-3 row">
+      <label for="wrtUserNm" class="col-sm-1 col-form-label text-center">분야1</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm">
+
+        </select>
+      </div>
+      <label for="wrtDt" class="col-sm-1 col-form-label text-center">분야2</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm">
+
+        </select>
+      </div>
+      <label for="wrtUserNm" class="col-sm-1 col-form-label text-center">분야3</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm">
+
+        </select>
+      </div>
+      <label for="wrtDt" class="col-sm-1 col-form-label text-center">분야4</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm">
+
+        </select>
+      </div>
+    </div>
+    <div class="mb-3 row">
+      <label for="title" class="col-sm-1 col-form-label text-center">제목</label>
+      <div class="col-sm-11">
+        <input type="text" class="form-control" id="title" name="title" th:value="${affair.title}">
+      </div>
+    </div>
+    <div class="mb-3 row">
+      <label for="title" class="col-sm-1 col-form-label text-center">내용</label>
+      <div class="col-sm-11">
+        <textarea id="content" name="content" th:value="${affair.content}"></textarea>
+      </div>
+    </div>
+    <div class="row mb-3">
+      <label for="fileInputer" class="col-sm-1 col-form-label text-center">업로드<br>자료</label>
+      <div class="col-sm-11" style="min-height: 70px;">
+        <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
+          <th:block th:if="${#arrays.isEmpty(affair.fileList)}">
+            <br>파일을 업로드 해주세요.
+          </th:block>
+          <th:block th:unless="${#arrays.isEmpty(affair.fileList)}">
+            <div class='row-col-6' th:each="affairFile:${affair.fileList}">
+              <span th:data-fileseq="${affairFile.fileSeq}" th:text="|${affairFile.origNm}.${affairFile.fileExtn} ${affairFile.fileSize}|"></span>
+              <a href='#' class='uploadedFileDelete text-danger text-decoration-none'>삭제</a>
+            </div>
+          </th:block>
+        </div>
+      </div>
+      <input type="file" class="d-none" id="fileInputer" multiple>
+    </div>
+  </form>
+</div>
+<div class="modal-footer">
+  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+  <button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>
+  <button type="button" class="btn btn-primary" id="saveAffairBtn">저장</button>
+</div>

src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html

@@ -3,13 +3,12 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorate="~{layout/layout}">
 <th:block layout:fragment="script">
-  <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/affairPlan.js}"></script>
+  <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/affair/affairMgt.js}"></script>
-  <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/commitPlan.js}"></script>
 </th:block>
 <div layout:fragment="content">
   <main class="pt-3">
-    <p>첩보수집활동 > 외사경찰 견문관리 > 계획수립</p>
+    <p>첩보수집활동 > 외사경찰 견문관리 > 견문관리</p>
-    <h4>계획수립</h4>
+    <h4>견문관리</h4>
     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <div class="row mx-0">
@@ -17,17 +16,17 @@
         <div class="card-body">
           <ul class="nav nav-tabs" id="userTab" role="tablist">
             <li class="nav-item" role="presentation">
-              <button class="nav-link" id="monthPlanTab" data-bs-toggle="tab" data-bs-target="#monthPlanPanel" type="button" role="tab" aria-controls="monthPlanPanel" aria-selected="false">월간 계획</button>
+              <button class="nav-link" th:classappend="${page eq 'main'?' active':''}" id="affairTab" data-bs-toggle="tab" type="button" role="tab">견문 목록</button>
             </li>
             <li class="nav-item" role="presentation">
-              <button class="nav-link" id="apprvStayTab" data-bs-toggle="tab" data-bs-target="#apprvStayPanel" type="button" role="tab" aria-controls="apprvStayPanel" aria-selected="false">결재대기목록</button>
+              <button class="nav-link" th:classappend="${page eq 'stay'?' active':''}" id="stayTab" data-bs-toggle="tab" type="button" role="tab">결재대기목록</button>
             </li>
             <li class="nav-item" role="presentation">
-              <button class="nav-link active" id="apprvCommitTab" data-bs-toggle="tab" data-bs-target="#apprvCommitPanel" type="button" role="tab" aria-controls="apprvCommitPanel" aria-selected="true">결재처리목록</button>
+              <button class="nav-link" th:classappend="${page eq 'commit'?' active':''}" id="commitTab" data-bs-toggle="tab" type="button" role="tab">결재처리목록</button>
             </li>
           </ul>
-          <div class="tab-content border border-top-0 p-2" id="planContent">
+          <div class="tab-content border border-top-0 p-2">
-            <form method="get" th:action="@{/fpiMgt/apprvCommitPage}">
+            <form method="get" th:action="${searchUrl}">
               <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
               <div class="row justify-content-between pe-3 py-1">
                 <div class="col-auto">
@@ -50,26 +49,21 @@
                       </select>
                     </div>
                     <div class="col-auto">
-                      <input type="text" class="form-control form-control-sm" placeholder="제목" name="contentTitle" th:value="${searchParams.contentTitle}">
+                      <input type="text" class="form-control form-control-sm" placeholder="제목" name="title" th:value="${searchParams.title}">
                     </div>
                     <div class="col-auto" th:if="${accessAuth eq 'ACC003'}">
                       <input type="text" class="form-control form-control-sm" placeholder="작성자" name="wrtUserNm" th:value="${searchParams.wrtUserNm}">
                     </div>
                     <div class="col-auto">
-                      <select class="form-select form-select-sm" name="planState">
+                      <select class="form-select form-select-sm" name="affairStatus">
                         <option value="">상태 선택</option>
                         <th:block th:each="commonCode:${session.commonCode.get('DST')}">
-                          <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.planState}"></option>
+                          <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.affairStatus}"></option>
                         </th:block>
                       </select>
                     </div>
                     <div class="col-4">
                       <div class="input-group w-auto input-daterange" id="dateSelectorDiv">
-                        <select class="form-select form-select-sm" name="dateSelector">
-                          <option value="">조건선택</option>
-                          <option value="planDt" th:selected="${searchParams.dateSelector eq 'planDt'}">시행일</option>
-                          <option value="wrtDt" th:selected="${searchParams.dateSelector eq 'wrtDt'}">작성일</option>
-                        </select>
                         <input type="text" class="form-control form-control-sm" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
                         <input type="text" class="form-control form-control-sm" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
                       </div>
@@ -89,7 +83,6 @@
                         <tr>
                           <th></th>
                           <th>제목</th>
-                          <th>시행일자</th>
                           <th>관서</th>
                           <th>부서</th>
                           <th>작성자</th>
@@ -99,26 +92,25 @@
                         </tr>
                         </thead>
                         <tbody>
-                        <tr class="planTr" th:each="plan:${planList}">
+                        <tr class="affairTr" th:each="affair:${affairList}">
-                          <input type="hidden" class="planKey" th:value="${plan.planKey}">
+                          <input type="hidden" class="affairKey" th:value="${affair.affairKey}">
                           <td><input type="checkbox" class="trChkBox"></td>
-                          <td th:text="${plan.contentTitle}"></td>
+                          <td th:text="${affair.title}"></td>
-                          <td th:text="${#temporals.format(plan.planDt, 'yyyy-MM-dd')}"></td>
                           <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                            <td th:if="${plan.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
+                            <td th:if="${affair.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                           </th:block>
                           <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
-                            <td th:if="${plan.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
+                            <td th:if="${affair.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                           </th:block>
-                          <td th:text="${plan.wrtUserNm}"></td>
+                          <td th:text="${affair.wrtUserNm}"></td>
-                          <td th:text="${#temporals.format(plan.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+                          <td th:text="${#temporals.format(affair.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
-                          <td th:text="${plan.fileCnt eq null?'파일 없음':#strings.concat(plan.fileCnt,' 건')}"></td>
+                          <td th:text="${affair.fileCnt eq null?'파일 없음':#strings.concat(affair.fileCnt,' 건')}"></td>
-                          <td th:if="${plan.planState eq 'DST001'}">임시저장</td>
+                          <td th:if="${affair.affairStatus eq 'DST001'}">임시저장</td>
-                          <td th:if="${plan.planState eq 'DST002'}">결재대기</td>
+                          <td th:if="${affair.affairStatus eq 'DST002'}">결재대기</td>
-                          <td th:if="${plan.planState eq 'DST003'}">계장반려</td>
+                          <td th:if="${affair.affairStatus eq 'DST003'}">계장반려</td>
-                          <td th:if="${plan.planState eq 'DST004'}">계장결재</td>
+                          <td th:if="${affair.affairStatus eq 'DST004'}">계장결재</td>
-                          <td th:if="${plan.planState eq 'DST005'}">부장반려</td>
+                          <td th:if="${affair.affairStatus eq 'DST005'}">부장반려</td>
-                          <td th:if="${plan.planState eq 'DST006'}">부장결재</td>
+                          <td th:if="${affair.affairStatus eq 'DST006'}">부장결재</td>
                         </tr>
                         </tbody>
                       </table>
@@ -151,7 +143,7 @@
                         </nav>
                       </div>
                       <div class="col-auto">
-                        <input type="button" class="btn btn-success" value="등록" id="addPlanBtn" th:unless="${accessAuth eq 'ACC001'}">
+                        <input type="button" class="btn btn-success" value="등록" id="addAffairBtn" th:unless="${accessAuth eq 'ACC001'}">
                       </div>
                     </div>
                   </div>
@@ -164,9 +156,16 @@
     </div>
   </main>
 
-  <div class="modal fade" id="planViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="planViewModalLabel" aria-hidden="true">
+  <div class="modal fade" id="affairEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="affairEditModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-xl modal-dialog-scrollable">
-      <div class="modal-content" id="planViewBody">
+      <div class="modal-content" id="affairEditModalContent">
+
+      </div>
+    </div>
+  </div>
+  <div class="modal fade" id="affairViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="affairViewModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xl modal-dialog-scrollable">
+      <div class="modal-content" id="affairViewBody">
 
       </div>
     </div>

src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html

@@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<div class="modal-header">
+  <h5 class="modal-title" id="planViewModalLabel">월간 계획 열람</h5>
+  <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+  <div class="row">
+    <div class="col-12">
+      <input type="hidden" name="planKey" id="viewModalPlanKey" th:value="${plan.planKey}">
+      <input type="hidden" name="wrtOrgan" th:value="${plan.wrtOrgan}">
+      <input type="hidden" name="planState" id="planState" th:value="${plan.planState}">
+      <div class="mb-3 row">
+        <label for="wrtUserNm" class="col-sm-1 col-form-label text-center">작성자</label>
+        <div class="col-sm-2">
+          <input type="text" class="form-control border-0" id="wrtUserNm" name="wrtUserNm" th:value="${plan.wrtUserNm}" readonly>
+        </div>
+        <label for="wrtDt" class="col-sm-1 col-form-label text-center">작성일시</label>
+        <div class="col-sm-2">
+          <input type="text" class="form-control border-0" id="wrtDt" name="wrtDt" th:value="${#temporals.format(plan.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
+        </div>
+        <label for="planDt" class="col-sm-1 col-form-label text-center">시행일자</label>
+        <div class="col-sm-2">
+          <input type="text" class="form-control border-0" id="planDt" name="planDt" th:value="${#temporals.format(plan.planDt, 'yyyy-MM-dd')}" readonly>
+        </div>
+        <label for="planState" class="col-sm-1 col-form-label text-center">상태</label>
+        <div class="col-sm-2">
+          <th:block th:each="commonCode:${session.commonCode.get('DST')}">
+            <input type="text" class="form-control border-0" th:if="${commonCode.itemCd eq plan.planState}" th:value="${commonCode.itemValue}" readonly>
+          </th:block>
+        </div>
+      </div>
+      <hr>
+      <div class="row">
+        <div class="col-8">
+          <div class="mb-3 row">
+            <label for="contentTitle" class="col-sm-2 col-form-label text-center">제목</label>
+            <div class="col-sm-10">
+              <input type="text" class="form-control border-0" id="contentTitle" name="contentTitle" th:value="${plan.contentTitle}" readonly>
+            </div>
+          </div>
+          <hr>
+          <div class="mb-3 row">
+            <label for="planDiv" class="col-sm-2 col-form-label text-center">주요<br>사업계획</label>
+            <div class="col-sm-10" id="planDiv">
+              <th:block th:each="infoList:${plan.mainInfoList}">
+                <th:block th:if="${infoList.planType eq 'S'}">
+                  <input type="text" class="form-control border-0" name="planInfo" th:value="${infoList.planInfo}" readonly>
+                </th:block>
+              </th:block>
+            </div>
+          </div>
+          <hr>
+          <div class="mb-3 row">
+            <label for="detailPlanDiv" class="col-sm-2 col-form-label text-center">사업개요<br>및<br>추진계획</label>
+            <div class="col-sm-10" id="detailPlanDiv">
+              <th:block th:each="infoList:${plan.mainInfoList}">
+                <th:block th:if="${infoList.planType eq 'D'}">
+                  <div th:utext="${infoList.planInfo}"></div>
+                </th:block>
+              </th:block>
+            </div>
+          </div>
+        </div>
+        <div class="col-4">
+          <table class="table">
+            <thead>
+            <tr>
+              <th>파일명</th>
+              <th>사이즈</th>
+            </tr>
+            </thead>
+            <tbody>
+            <th:block th:if="${#lists.isEmpty(plan.fileList)}">
+              <tr>
+                <td colspan="2">파일이 없습니다.</td>
+              </tr>
+            </th:block>
+            <th:block th:unless="${#lists.isEmpty(plan.fileList)}">
+              <th:block th:each="file:${plan.fileList}">
+                <tr class="fileInfoTr">
+                  <td><a href="#" class="fileDownLink" data-board="monthPlan"
+                         th:data-parentkey="${file.planKey}" th:data-fileseq="${file.fileSeq}" th:text="|${file.origNm}.${file.fileExtn}|"></a></td>
+                  <td th:text="${file.fileSize}"></td>
+                </tr>
+              </th:block>
+            </th:block>
+            </tbody>
+          </table>
+        </div>
+      </div>
+      <th:block th:unless="${#lists.isEmpty(plan.apprvList)}">
+        <hr>
+        <th:block th:each="apprv,cnt:${plan.apprvList}">
+          <div class="row justify-content-between py-1">
+            <div class="col-auto">
+              <th:block th:each="commonCode:${session.commonCode.get('DST')}">
+                <span th:if="${commonCode.itemCd eq apprv.state}" th:text="|결재결과: ${commonCode.itemValue}|"></span>
+              </th:block>
+              <span th:text="|결재자: ${apprv.userNm}|"></span>
+            </div>
+            <div class="col-auto">
+              <span th:text="|결재일시: ${#temporals.format(apprv.saveDt, 'yyyy-MM-dd HH:mm:ss')}|"></span>
+            </div>
+            <div class="col-12">
+              <span th:text="|기타의견: ${apprv.etc}|"></span>
+            </div>
+          </div>
+        </th:block>
+      </th:block>
+    </div>
+    <div class="col-12" th:if="${apprvAuth ne null}">
+      <form action="#" method="post" id="apprvForm">
+        <div class="row">
+          <div class="col-10">
+            <input type="hidden" name="planKey" id="apprvFormPlanKey">
+            <input type="hidden" name="state" id="viewModalApprvValue">
+            <input type="text" class="form-control form-control-sm" name="etc" placeholder="추가의견, 반려사유 기입">
+            <input type="text" class="d-none" id="submitPrevention">
+          </div>
+          <div class="col-auto">
+            <input type="button" class="btn btn-sm btn-success apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST004':'DST006'}" value="승인">
+          </div>
+          <div class="col-auto">
+            <input type="button" class="btn btn-sm btn-danger apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST003':'DST005'}" value="반려">
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+<div class="modal-footer">
+  <th:block th:unless="${plan.planState eq 'DST004' or plan.planState eq 'DST006'}"><!--승인 상태일때는 수정 불가-->
+    <th:block th:if="${userSeq eq plan.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
+      <button type="button" class="btn btn-warning" id="editPlanBtn">수정</button>
+    </th:block>
+  </th:block>
+  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+</div>

src/main/resources/templates/igActivities/fpiMgt/affair/temp.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>

src/main/resources/templates/igActivities/fpiMgt/affairPlan/monthPlan.html

@@ -1,182 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko" xmlns:th="http://www.thymeleaf.org"
-      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorate="~{layout/layout}">
-<th:block layout:fragment="script">
-  <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/affairPlan.js}"></script>
-  <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/monthPlan.js}"></script>
-</th:block>
-<div layout:fragment="content">
-  <main class="pt-3">
-    <p>첩보수집활동 > 외사경찰 견문관리 > 계획수립</p>
-    <h4>계획수립</h4>
-    <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
-    <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
-    <div class="row mx-0">
-      <div class="col-12 card text-center">
-        <div class="card-body">
-          <ul class="nav nav-tabs" id="userTab" role="tablist">
-            <li class="nav-item" role="presentation">
-              <button class="nav-link active" id="monthPlanTab" data-bs-toggle="tab" data-bs-target="#monthPlanPanel" type="button" role="tab" aria-controls="monthPlanPanel" aria-selected="true">월간 계획</button>
-            </li>
-            <li class="nav-item" role="presentation">
-              <button class="nav-link" id="apprvStayTab" data-bs-toggle="tab" data-bs-target="#apprvStayPanel" type="button" role="tab" aria-controls="apprvStayPanel" aria-selected="false">결재대기목록</button>
-            </li>
-            <li class="nav-item" role="presentation">
-              <button class="nav-link" id="apprvCommitTab" data-bs-toggle="tab" data-bs-target="#apprvCommitPanel" type="button" role="tab" aria-controls="apprvCommitPanel" aria-selected="false">결재처리목록</button>
-            </li>
-          </ul>
-          <div class="tab-content border border-top-0 p-2" id="planContent">
-            <form method="get" th:action="@{/fpiMgt/monthPlanPage}">
-              <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
-              <div class="row justify-content-between pe-3 py-1">
-                <div class="col-auto">
-                  <select class="form-select" name="rowCnt" id="rowCnt">
-                    <th:block th:each="num : ${#numbers.sequence(1,5)}">
-                      <option th:value="${num*10}" th:text="${num*10}" th:selected="${searchParams.rowCnt eq num*10}"></option>
-                    </th:block>
-                  </select>
-                </div>
-                <div class="col-auto">
-                  <div class="row justify-content-end">
-                    <div class="col-auto" th:if="${accessAuth eq 'ACC003'}">
-                      <select class="form-select form-select-sm" name="wrtOrgan">
-                        <option value="">관서 선택</option>
-                        <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                          <th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}">
-                            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.wrtOrgan}"></option>
-                          </th:block>
-                        </th:block>
-                      </select>
-                    </div>
-                    <div class="col-auto">
-                      <input type="text" class="form-control form-control-sm" placeholder="제목" name="contentTitle" th:value="${searchParams.contentTitle}">
-                    </div>
-                    <div class="col-auto" th:if="${accessAuth eq 'ACC003'}">
-                      <input type="text" class="form-control form-control-sm" placeholder="작성자" name="wrtUserNm" th:value="${searchParams.wrtUserNm}">
-                    </div>
-                    <div class="col-auto">
-                      <select class="form-select form-select-sm" name="planState">
-                        <option value="">상태 선택</option>
-                        <th:block th:each="commonCode:${session.commonCode.get('DST')}">
-                          <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.planState}"></option>
-                        </th:block>
-                      </select>
-                    </div>
-                    <div class="col-4">
-                      <div class="input-group w-auto input-daterange" id="dateSelectorDiv">
-                        <select class="form-select form-select-sm" name="dateSelector">
-                          <option value="">조건선택</option>
-                          <option value="planDt" th:selected="${searchParams.dateSelector eq 'planDt'}">시행일</option>
-                          <option value="wrtDt" th:selected="${searchParams.dateSelector eq 'wrtDt'}">작성일</option>
-                        </select>
-                        <input type="text" class="form-control form-control-sm" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
-                        <input type="text" class="form-control form-control-sm" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
-                      </div>
-                    </div>
-                    <input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
-                  </div>
-                </div>
-              </div>
-            </form>
-            <div class="row justify-content-start">
-              <div class="col-12">
-                <div class="card">
-                  <div class="card-body">
-                    <div class="row">
-                      <table class="table table-hover">
-                        <thead>
-                        <tr>
-                          <th></th>
-                          <th>제목</th>
-                          <th>시행일자</th>
-                          <th>관서</th>
-                          <th>부서</th>
-                          <th>작성자</th>
-                          <th>작성일시</th>
-                          <th>첨부파일</th>
-                          <th>상태</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr class="planTr" th:each="plan:${planList}">
-                          <input type="hidden" class="planKey" th:value="${plan.planKey}">
-                          <td><input type="checkbox" class="trChkBox"></td>
-                          <td th:text="${plan.contentTitle}"></td>
-                          <td th:text="${#temporals.format(plan.planDt, 'yyyy-MM-dd')}"></td>
-                          <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                            <td th:if="${plan.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                          </th:block>
-                          <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
-                            <td th:if="${plan.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                          </th:block>
-                          <td th:text="${plan.wrtUserNm}"></td>
-                          <td th:text="${#temporals.format(plan.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
-                          <td th:text="${plan.fileCnt eq null?'파일 없음':#strings.concat(plan.fileCnt,' 건')}"></td>
-                          <td th:if="${plan.planState eq 'DST001'}">임시저장</td>
-                          <td th:if="${plan.planState eq 'DST002'}">결재대기</td>
-                          <td th:if="${plan.planState eq 'DST003'}">계장반려</td>
-                          <td th:if="${plan.planState eq 'DST004'}">계장결재</td>
-                          <td th:if="${plan.planState eq 'DST005'}">부장반려</td>
-                          <td th:if="${plan.planState eq 'DST006'}">부장결재</td>
-                        </tr>
-                        </tbody>
-                      </table>
-                    </div>
-                    <div class="row justify-content-between">
-                      <div class="col-auto"></div>
-                      <div class="col-auto">
-                        <nav aria-label="Page navigation">
-                          <ul class="pagination">
-                            <th:block th:if="${searchParams.pageIndex>3}">
-                              <li class="page-item" th:data-pageindex="${(searchParams.pageIndex)-3}">
-                                <a class="page-link" href="#" aria-label="Previous">
-                                  <span aria-hidden="true">&laquo;</span>
-                                </a>
-                              </li>
-                            </th:block>
-                            <th:block th:each="num : ${#numbers.sequence(searchParams.startNum, searchParams.endNum)}">
-                              <li class="page-item" th:data-pageindex="${num}" th:classappend="${searchParams.pageIndex eq num?'active':''}">
-                                <a class="page-link" href="#" th:text="${num}"></a>
-                              </li>
-                            </th:block>
-                            <th:block th:if="${searchParams.maxNum>searchParams.endNum+2}">
-                              <li class="page-item" th:data-pageindex="${(searchParams.pageIndex)+3}">
-                                <a class="page-link" href="#" aria-label="Next">
-                                  <span aria-hidden="true">&raquo;</span>
-                                </a>
-                              </li>
-                            </th:block>
-                          </ul>
-                        </nav>
-                      </div>
-                      <div class="col-auto">
-                        <input type="button" class="btn btn-success" value="등록" id="addPlanBtn" th:unless="${accessAuth eq 'ACC001'}">
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </main>
-
-  <div class="modal fade" id="planEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="planEditModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-xl modal-dialog-scrollable">
-      <div class="modal-content" id="planEditModalContent">
-
-      </div>
-    </div>
-  </div>
-  <div class="modal fade" id="planViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="planViewModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-xl modal-dialog-scrollable">
-      <div class="modal-content" id="planViewBody">
-
-      </div>
-    </div>
-  </div>
-</div>
-</html>

src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html

@@ -3,8 +3,7 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorate="~{layout/layout}">
 <th:block layout:fragment="script">
-  <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/affairPlan.js}"></script>
+  <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/plan/planMgt.js}"></script>
-  <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/stayPlan.js}"></script>
 </th:block>
 <div layout:fragment="content">
   <main class="pt-3">
@@ -17,17 +16,17 @@
         <div class="card-body">
           <ul class="nav nav-tabs" id="userTab" role="tablist">
             <li class="nav-item" role="presentation">
-              <button class="nav-link" id="monthPlanTab" data-bs-toggle="tab" data-bs-target="#monthPlanPanel" type="button" role="tab" aria-controls="monthPlanPanel" aria-selected="false">월간 계획</button>
+              <button class="nav-link" th:classappend="${page eq 'main'?' active':''}" id="planTab" data-bs-toggle="tab" type="button" role="tab">견문 목록</button>
             </li>
             <li class="nav-item" role="presentation">
-              <button class="nav-link active" id="apprvStayTab" data-bs-toggle="tab" data-bs-target="#apprvStayPanel" type="button" role="tab" aria-controls="apprvStayPanel" aria-selected="true">결재대기목록</button>
+              <button class="nav-link" th:classappend="${page eq 'stay'?' active':''}" id="stayTab" data-bs-toggle="tab" type="button" role="tab">결재대기목록</button>
             </li>
             <li class="nav-item" role="presentation">
-              <button class="nav-link" id="apprvCommitTab" data-bs-toggle="tab" data-bs-target="#apprvCommitPanel" type="button" role="tab" aria-controls="apprvCommitPanel" aria-selected="false">결재처리목록</button>
+              <button class="nav-link" th:classappend="${page eq 'commit'?' active':''}" id="commitTab" data-bs-toggle="tab" type="button" role="tab">결재처리목록</button>
             </li>
           </ul>
           <div class="tab-content border border-top-0 p-2" id="planContent">
-            <form method="get" th:action="@{/fpiMgt/apprvStayPage}">
+            <form method="get" th:action="${searchUrl}">
               <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
               <div class="row justify-content-between pe-3 py-1">
                 <div class="col-auto">

src/main/resources/templates/publicBoard/notice/noticePage.html

@@ -15,7 +15,7 @@
     <div class="row mx-0">
       <div class="col-12 card text-center">
         <div class="card-body">
-          <form method="get" th:action="@{/fpiMgt/monthPlanPage}">
+          <form method="get" th:action="@{/affairPlan/monthPlanPage}">
             <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
             <div class="row justify-content-between pe-3 py-1">
               <div class="col-auto">

src/main/resources/templates/publicBoard/qna/qnaPage.html

@@ -4,7 +4,7 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorate="~{layout/layout}">
 <th:block layout:fragment="script">
-  <!--<script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/affairPlan.js}"></script>-->
+  <!--<script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/plan.js}"></script>-->
 </th:block>
 <div layout:fragment="content">
   <main class="pt-3">
@@ -14,7 +14,7 @@
     <div class="row mx-0">
       <div class="col-12 card text-center">
         <div class="card-body">
-          <form method="get" th:action="@{/fpiMgt/monthPlanPage}">
+          <form method="get" th:action="@{/affairPlan/monthPlanPage}">
             <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
             <div class="row justify-content-between pe-3 py-1">
               <div class="col-auto">