첩보수집활동 계획수립 결재기능 작업중...

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

@@ -8,6 +8,9 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
+import java.util.HashMap;
+import java.util.Map;
+
 
 @RestController
 @RequiredArgsConstructor
@@ -31,8 +34,10 @@ public class AuthMgtController {
   @GetMapping("/authEditModal")
   public ModelAndView menuEditModal(UserInfo userInfo){
     ModelAndView mav = new ModelAndView("adminPage/authMgt/authEditModal");
-    userInfo.setAccessConfigList(authMgtService.selectAccessConfigList(userInfo));
+    Map<String, Object> params = new HashMap<>();
-    userInfo.setApprovalConfigList(authMgtService.selectApprovalConfigList(userInfo));
+    params.put("userSeq", userInfo.getUserSeq());
+    userInfo.setAccessConfigList(authMgtService.selectAccessConfigList(params));
+    userInfo.setApprovalConfigList(authMgtService.selectApprovalConfigList(params));
     mav.addObject("userInfo", userInfo);
     return mav;
   }

src/main/java/com/dbnt/faisp/authMgt/mapper/AuthMgtMapper.java

@@ -6,11 +6,12 @@ import com.dbnt.faisp.userInfo.model.UserInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface AuthMgtMapper {
 
-  List<AccessConfig> selectAccessConfigList(UserInfo userInfo);
+  List<AccessConfig> selectAccessConfigList(Map<String, Object> params);
 
-  List<ApprovalConfig> selectApprovalConfigList(UserInfo userInfo);
+  List<ApprovalConfig> selectApprovalConfigList(Map<String, Object> params);
 }

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

@@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 
 @Service
@@ -21,12 +22,12 @@ public class AuthMgtService {
   private final ApprovalConfigRepository approvalConfigRepository;
 
 
-  public List<AccessConfig> selectAccessConfigList(UserInfo userInfo) {
+  public List<AccessConfig> selectAccessConfigList(Map<String, Object> params) {
-    return authMgtMapper.selectAccessConfigList(userInfo);
+    return authMgtMapper.selectAccessConfigList(params);
   }
 
-  public List<ApprovalConfig> selectApprovalConfigList(UserInfo userInfo) {
+  public List<ApprovalConfig> selectApprovalConfigList(Map<String, Object> params) {
-    return authMgtMapper.selectApprovalConfigList(userInfo);
+    return authMgtMapper.selectApprovalConfigList(params);
   }
 
   public void saveAuth(AuthMgt authMgt) {

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

@@ -28,6 +28,8 @@ public class BaseModel {
   @Transient
   private Integer contentCnt=0;
   @Transient
+  private String dateSelector;
+  @Transient
   private String startDate;
   @Transient
   private String endDate;

src/main/java/com/dbnt/faisp/fpiMgt/FpiMgtController.java

@@ -1,5 +1,6 @@
 package com.dbnt.faisp.fpiMgt;
 
+import com.dbnt.faisp.authMgt.service.AuthMgtService;
 import com.dbnt.faisp.fpiMgt.monthPlan.service.MonthPlanService;
 import com.dbnt.faisp.fpiMgt.monthPlan.model.BoardPlan;
 import com.dbnt.faisp.userInfo.model.UserInfo;
@@ -10,19 +11,38 @@ 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("/fpiMgt")
 public class FpiMgtController { // 외사경찰견문관리
   private final MonthPlanService monthPlanService;
+  private final AuthMgtService authMgtService;
 
   @GetMapping("/monthPlanPage")
   public ModelAndView monthPlanPage(@AuthenticationPrincipal UserInfo loginUser, BoardPlan boardPlan){
-    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monthPlan/monthPlan");
+    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/monthPlan");
-    mav.addObject("loginUser", loginUser);
+    Map<String, Object> params = new HashMap<>();
-    boardPlan.setWrtNm(loginUser.getUserNm());
+    params.put("userSeq", loginUser.getUserSeq());
+    params.put("menuUrl", "/fpiMgt/monthPlanPage");
+    //메뉴권한 확인
+    String accessAuth = authMgtService.selectAccessConfigList(params).get(0).getAccessAuth();
+    switch (accessAuth){
+      case "ACC001": // 조회
+      case "ACC002": // 작성 // 자신이 작성한 문서만 열람가능
+        boardPlan.setWrtUserSeq(loginUser.getUserSeq());
+        break;
+      case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능
+        boardPlan.setOrganCdList(loginUser.getOrganCdList());
+        mav.addObject("mgtOrganList", loginUser.getOrganCdList());
+        break;
+    }
+    mav.addObject("accessAuth", accessAuth);
+    //결재권한 확인
+    //authMgtService.selectApprovalConfigList(params);
     boardPlan.setQueryInfo();
     mav.addObject("planList", monthPlanService.selectBoardPlanList(boardPlan));
     boardPlan.setContentCnt(monthPlanService.selectBoardPlanListCnt(boardPlan));
@@ -33,12 +53,13 @@ public class FpiMgtController { // 외사경찰견문관리
 
   @GetMapping("/planEditModal")
   public ModelAndView planEditModal(@AuthenticationPrincipal UserInfo loginUser, BoardPlan boardPlan){
-    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monthPlan/planEditModal");
+    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/planEditModal");
     if(boardPlan.getPlanKey()!=null){
       boardPlan = monthPlanService.selectBoardPlan(boardPlan.getPlanKey());
     }else{
       boardPlan.setWrtOrgan(loginUser.getOgCd());
-      boardPlan.setWrtNm(loginUser.getUserNm());
+      boardPlan.setWrtUserSeq(loginUser.getUserSeq());
+      boardPlan.setWrtUserNm(loginUser.getUserNm());
       boardPlan.setWrtDt(LocalDateTime.now());
     }
     mav.addObject("plan", boardPlan);
@@ -47,7 +68,7 @@ public class FpiMgtController { // 외사경찰견문관리
 
   @GetMapping("/planViewModal")
   public ModelAndView planViewModal(BoardPlan boardPlan){
-    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monthPlan/planViewModal");
+    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/planViewModal");
     boardPlan = monthPlanService.selectBoardPlan(boardPlan.getPlanKey());
     mav.addObject("plan", boardPlan);
     return mav;
@@ -62,4 +83,84 @@ public class FpiMgtController { // 외사경찰견문관리
     boardPlan.setMultipartFileList(request.getMultiFileMap().get("uploadFiles"));
     return monthPlanService.saveBoardPlan(boardPlan, planInfos, detailPlanInfos, deleteFileSeq);
   }
+
+  @GetMapping("/apprvStayPage")
+  public ModelAndView apprvStayPage(@AuthenticationPrincipal UserInfo loginUser, BoardPlan boardPlan){
+    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": // 작성 // 자신이 작성한 문서만 열람가능
+        boardPlan.setWrtUserSeq(loginUser.getUserSeq());
+        break;
+      case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능
+        boardPlan.setOrganCdList(loginUser.getOrganCdList());
+        mav.addObject("mgtOrganList", loginUser.getOrganCdList());
+        break;
+    }
+    //결재권한 확인
+    String apprvAuth = authMgtService.selectApprovalConfigList(params).get(0).getApprovalAuth();
+    switch (apprvAuth){
+      case "ACC004": // 계장대행
+      case "ACC003": // 계장 // 결재대기 문서 조회
+        boardPlan.setPlanState("DST002");
+        break;
+      case "ACC002": // 부장대행
+      case "ACC001": // 부장 // 계장승인 문서 조회
+        boardPlan.setPlanState("DST004");
+        break;
+    }
+    mav.addObject("accessAuth", accessAuth);
+    mav.addObject("apprvAuth", apprvAuth);
+    boardPlan.setQueryInfo();
+    mav.addObject("planList", monthPlanService.selectBoardPlanList(boardPlan));
+    boardPlan.setContentCnt(monthPlanService.selectBoardPlanListCnt(boardPlan));
+    boardPlan.setPaginationInfo();
+    mav.addObject("searchParams", boardPlan);
+    return mav;
+  }
+
+  @GetMapping("/apprvCommitPage")
+  public ModelAndView apprvCommitPage(@AuthenticationPrincipal UserInfo loginUser, BoardPlan boardPlan){
+    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": // 작성 // 자신의 관서 내에서 작성한 문서만 열람가능
+        boardPlan.setWrtOrgan(loginUser.getOgCd());
+        break;
+      case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능
+        boardPlan.setOrganCdList(loginUser.getOrganCdList());
+        mav.addObject("mgtOrganList", loginUser.getOrganCdList());
+        break;
+    }
+    //결재권한 확인
+    String apprvAuth = authMgtService.selectApprovalConfigList(params).get(0).getApprovalAuth();
+    switch (apprvAuth){
+      case "ACC004": // 계장대행
+      case "ACC003": // 계장 // 계장반려, 계장승인 문서 조회
+        boardPlan.setPlanState("DST002");
+        break;
+      case "ACC002": // 부장대행
+      case "ACC001": // 부장 // 부장반려, 부장승인 문서 조회
+        boardPlan.setPlanState("DST004");
+        break;
+    }
+    mav.addObject("accessAuth", accessAuth);
+    mav.addObject("apprvAuth", apprvAuth);
+    boardPlan.setQueryInfo();
+    mav.addObject("planList", monthPlanService.selectBoardPlanList(boardPlan));
+    boardPlan.setContentCnt(monthPlanService.selectBoardPlanListCnt(boardPlan));
+    boardPlan.setPaginationInfo();
+    mav.addObject("searchParams", boardPlan);
+    return mav;
+  }
 }

src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/BoardPlan.java

@@ -26,8 +26,6 @@ public class BoardPlan extends BaseModel {
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Column(name = "plan_key")
   private Integer planKey;
-  @Column(name = "plan_state")
-  private String planState;
   @Column(name = "content_title")
   private String contentTitle;
   @Column(name = "plan_dt")
@@ -47,11 +45,15 @@ public class BoardPlan extends BaseModel {
   private String headEtc;
   @Column(name = "wrt_organ")
   private String wrtOrgan;
-  @Column(name = "wrt_nm")
+  @Column(name = "wrt_user_nm")
-  private String wrtNm;
+  private String wrtUserNm;
   @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 Integer fileCnt;

src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/service/MonthPlanService.java

@@ -44,7 +44,7 @@ public class MonthPlanService extends BaseService {
     Integer planKey = boardPlanRepository.save(boardPlan).getPlanKey();
     Integer infoSeq = savePlanMainInfos(planKey,0, "S", planInfos);//요약 summery
     savePlanMainInfos(planKey, infoSeq, "D", detailPlanInfos);//상세 detail
-    if(deleteFileSeq.size()>0){
+    if(deleteFileSeq != null && deleteFileSeq.size()>0){
       deletePlanFile(planKey, deleteFileSeq);
     }
     if(boardPlan.getMultipartFileList()!=null){

src/main/resources/mybatisMapper/AuthMgtMapper.xml

@@ -4,7 +4,7 @@
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.dbnt.faisp.authMgt.mapper.AuthMgtMapper">
-  <select id="selectAccessConfigList" resultType="AccessConfig" parameterType="UserInfo">
+  <select id="selectAccessConfigList" resultType="AccessConfig" parameterType="hashMap">
     select a.menu_key,
            a.cat1_cd as cat1Cd,
            a.cat2_cd as cat2Cd,
@@ -13,10 +13,15 @@
     from menu_mgt a
            left outer join access_config b
                            on a.menu_key = b.menu_key and b.user_seq = #{userSeq}
+    <where>
+      <if test='menuUrl != null and menuUrl != ""'>
+        and a.menu_url = #{menuUrl}
+      </if>
+    </where>
     order by cat1_cd, cat2_cd, cat3_cd
   </select>
 
-  <select id="selectApprovalConfigList" resultType="ApprovalConfig" parameterType="UserInfo">
+  <select id="selectApprovalConfigList" resultType="ApprovalConfig" parameterType="hashMap">
     select a.menu_key,
            a.cat1_cd as cat1Cd,
            a.cat2_cd as cat2Cd,
@@ -26,6 +31,9 @@
            left outer join approval_config b
                            on a.menu_key = b.menu_key and b.user_seq = #{userSeq}
     where a.approval_chk = 'T'
+    <if test='menuUrl != null and menuUrl != ""'>
+      and a.menu_url = #{menuUrl}
+    </if>
     order by cat1_cd, cat2_cd, cat3_cd
   </select>
 </mapper>

src/main/resources/mybatisMapper/MonthPlanMapper.xml

@@ -4,6 +4,47 @@
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.dbnt.faisp.fpiMgt.monthPlan.mapper.MonthPlanMapper">
+  <sql id="selectBoardPlanListWhere">
+    <where>
+      <if test='wrtUserSeq != null and wrtUserSeq != ""'>
+        and a.wrt_user_seq = #{wrtUserSeq}
+      </if>
+      <if test='wrtUserNm != null and wrtUserNm != ""'>
+        and a.wrt_user_nm like '%'||#{wrtUserNm}||'%'
+      </if>
+      <if test='wrtOrgan != null and wrtOrgan != ""'>
+        and a.wrt_organ = #{wrtOrgan}
+      </if>
+      <if test='contentTitle != null and contentTitle != ""'>
+        and a.content_title like '%'||#{contentTitle}||'%'
+      </if>
+      <if test='planState != null and planState != ""'>
+        and a.plan_state = #{planState}
+      </if>
+      <if test='dateSelector == "planDt"'>
+        <if test='startDate != null and startDate != ""'>
+          and a.plan_dt >= #{startDate}::date
+        </if>
+        <if test='endDate != null and endDate != ""'>
+          and a.plan_dt &lt;= #{endDate}::date
+        </if>
+      </if>
+      <if test='dateSelector == "wrtDt"'>
+        <if test='startDate != null and startDate != ""'>
+          and a.wrt_dt >= #{startDate}::date
+        </if>
+        <if test='endDate != null and endDate != ""'>
+          and a.wrt_dt &lt;= #{endDate}::date
+        </if>
+      </if>
+      <if test="organCdList != null">
+        and a.wrt_organ in
+        <foreach collection="organCdList" item="organCd" separator="," open="(" close=")">
+          #{organCd}
+        </foreach>
+      </if>
+    </where>
+  </sql>
   <select id="selectBoardPlanList" resultType="BoardPlan" parameterType="BoardPlan">
     select a.plan_key,
            a.content_title,
@@ -12,7 +53,7 @@
            a.section_apprv,
            a.head_apprv,
            a.wrt_organ,
-           a.wrt_nm,
+           a.wrt_user_nm,
            a.wrt_dt,
            b.fileCnt
     from board_plan a
@@ -21,21 +62,13 @@
                             from plan_file
                             group by plan_key) b
              on a.plan_key = b.plan_key
-    <where>
+    <include refid="selectBoardPlanListWhere"></include>
-      <if test='wrtNm != null and wrtNm != ""'>
-        and a.wrt_nm = #{wrtNm}
-      </if>
-    </where>
     order by plan_key desc
     limit #{rowCnt} offset #{firstIndex}
   </select>
   <select id="selectBoardPlanListCnt" resultType="int" parameterType="BoardPlan">
     select count(*)
     from board_plan a
-    <where>
+    <include refid="selectBoardPlanListWhere"></include>
-      <if test='wrtNm != null and wrtNm != ""'>
-        and a.wrt_nm = #{wrtNm}
-      </if>
-    </where>
   </select>
 </mapper>

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

@@ -0,0 +1,24 @@
+$(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/monthPlan.js

@@ -1,10 +1,18 @@
 let files = [];
 
+$(function(){
+  $("#dateSelectorDiv").datepicker({
+    format: "yyyy-mm-dd",
+    language: "ko"
+  });
+})
+
 $(document).on('click', '#addPlanBtn', function (){
   getEditModal(null)
 })
-
 $(document).on('click', '.planTr', function (){
+  $(".trChkBox").prop("checked", false);
+  $(this).find(".trChkBox").prop("checked", true);
   getViewModal(Number($(this).find(".planKey").val()));
 })
 $(document).on('click', '#editPlanBtn', function (){
@@ -35,28 +43,12 @@ $(document).on('click', '#detailPlanAddBtn', function (){
 })
 
 $(document).on('click', '#savePlanBtn', function (){
-  savePlan('S')
+  savePlan('DST002')
 })
 $(document).on('click', '#saveTempBtn', function (){
-  savePlan('T')
+  savePlan('DST001')
 })
 
-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(){
-
-    }
-  });
-}
-
 function getEditModal(planKey){
   $.ajax({
     url: '/fpiMgt/planEditModal',

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

@@ -0,0 +1,176 @@
+<!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>
+</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" id="monthPlanTab" data-bs-toggle="tab" data-bs-target="#monthPlanPanel" type="button" role="tab" aria-controls="monthPlanPanel" aria-selected="false">월간 계획</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 active" id="apprvCommitTab" data-bs-toggle="tab" data-bs-target="#apprvCommitPanel" type="button" role="tab" aria-controls="apprvCommitPanel" aria-selected="true">결재처리목록</button>
+            </li>
+          </ul>
+          <div class="tab-content border border-top-0 p-2" id="planContent">
+            <form method="get" th:action="@{/fpiMgt/apprvCommitPage}">
+              <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>
+                        </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>
+                          <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="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">
+        <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" id="planViewBody">
+
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-warning" id="editPlanBtn" th:unless="${accessAuth eq 'ACC001'}">수정</button>
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+</html>

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

@@ -3,11 +3,13 @@
       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">
-    <h4>운영계획서</h4>
+    <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">
@@ -15,7 +17,7 @@
         <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>
+              <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>
@@ -37,8 +39,40 @@
                 </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">
+                      <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>
@@ -65,18 +99,18 @@
                         <tbody>
                         <tr class="planTr" th:each="plan:${planList}">
                           <input type="hidden" class="planKey" th:value="${plan.planKey}">
-                          <td><input type="checkbox"></td>
+                          <td><input type="checkbox" class="trChkBox"></td>
                           <td th:text="${plan.contentTitle}"></td>
                           <td th:text="${#temporals.format(plan.planDt, 'yyyy-MM-dd')}"></td>
-                          <td th:text="${plan.wrtNm}"></td>
+                          <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.sectionApprv eq 'T'}">계장결재</td>
+                          <td th:if="${plan.planState eq 'DST001'}">임시저장</td>
-                          <td th:if="${plan.sectionApprv eq 'F'}">계장반려</td>
+                          <td th:if="${plan.planState eq 'DST002'}">결재대기</td>
-                          <td th:if="${plan.headApprv eq 'T'}">부장결재</td>
+                          <td th:if="${plan.planState eq 'DST003'}">계장반려</td>
-                          <td th:if="${plan.headApprv eq 'F'}">부장반려</td>
+                          <td th:if="${plan.planState eq 'DST004'}">계장결재</td>
-                          <td th:if="${plan.planState eq 'T'}">임시저장</td>
+                          <td th:if="${plan.planState eq 'DST005'}">부장반려</td>
-                          <td th:if="${#strings.isEmpty(plan.sectionApprv) and #strings.isEmpty(plan.headApprv) and plan.planState eq 'S'}">결재대기</td>
+                          <td th:if="${plan.planState eq 'DST006'}">부장결재</td>
                         </tr>
                         </tbody>
                       </table>
@@ -109,7 +143,7 @@
                         </nav>
                       </div>
                       <div class="col-auto">
-                        <input type="button" class="btn btn-success" value="등록" id="addPlanBtn">
+                        <input type="button" class="btn btn-success" value="등록" id="addPlanBtn" th:unless="${accessAuth eq 'ACC001'}">
                       </div>
                     </div>
                   </div>
@@ -140,8 +174,8 @@
 
         </div>
         <div class="modal-footer">
+          <button type="button" class="btn btn-warning" id="editPlanBtn" th:unless="${accessAuth eq 'ACC001'}">수정</button>
           <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
-          <button type="button" class="btn btn-warning" id="editPlanBtn">수정</button>
         </div>
       </div>
     </div>

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

@@ -10,11 +10,12 @@
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <input type="hidden" name="planKey" th:value="${plan.planKey}">
     <input type="hidden" name="wrtOrgan" th:value="${plan.wrtOrgan}">
+    <input type="hidden" name="wrtUserSeq" th:value="${plan.wrtUserSeq}">
     <input type="hidden" name="planState" id="planState" th:value="${plan.planState}">
     <div class="mb-3 row">
-      <label for="wrtNm" class="col-sm-2 col-form-label text-center">작성자</label>
+      <label for="wrtUserNm" class="col-sm-2 col-form-label text-center">작성자</label>
       <div class="col-sm-2">
-        <input type="text" class="form-control" id="wrtNm" name="wrtNm" th:value="${plan.wrtNm}" readonly>
+        <input type="text" class="form-control" id="wrtUserNm" name="wrtUserNm" th:value="${plan.wrtUserNm}" readonly>
       </div>
       <label for="wrtDt" class="col-sm-2 col-form-label text-center">작성일시</label>
       <div class="col-sm-2">

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

@@ -4,9 +4,9 @@
 <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="wrtNm" class="col-sm-1 col-form-label text-center">작성자</label>
+  <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="wrtNm" name="wrtNm" th:value="${plan.wrtNm}" readonly>
+    <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">
@@ -18,24 +18,24 @@
   </div>
   <label for="planState" class="col-sm-1 col-form-label text-center">상태</label>
   <div class="col-sm-2">
-    <th:block th:if="${plan.sectionApprv eq 'T'}">
+    <th:block th:if="${plan.planState eq 'DST001'}">
-      <input type="text" class="form-control border-0" value="계장결재" readonly>
-    </th:block>
-    <th:block th:if="${plan.sectionApprv eq 'F'}">
-      <input type="text" class="form-control border-0" value="계장반려" readonly>
-    </th:block>
-    <th:block th:if="${plan.headApprv eq 'T'}">
-      <input type="text" class="form-control border-0" value="부장결재" readonly>
-    </th:block>
-    <th:block th:if="${plan.headApprv eq 'F'}">
-      <input type="text" class="form-control border-0" value="부장반려" readonly>
-    </th:block>
-    <th:block th:if="${plan.planState eq 'T'}">
       <input type="text" class="form-control border-0" value="임시저장" readonly>
     </th:block>
-    <th:block th:if="${#strings.isEmpty(plan.sectionApprv) and #strings.isEmpty(plan.headApprv) and plan.planState eq 'S'}">
+    <th:block th:if="${plan.planState eq 'DST002'}">
       <input type="text" class="form-control border-0" value="결재대기" readonly>
     </th:block>
+    <th:block th:if="${plan.planState eq 'DST003'}">
+      <input type="text" class="form-control border-0" value="계장결재" readonly>
+    </th:block>
+    <th:block th:if="${plan.planState eq 'DST004'}">
+      <input type="text" class="form-control border-0" value="계장반려" readonly>
+    </th:block>
+    <th:block th:if="${plan.planState eq 'DST005'}">
+      <input type="text" class="form-control border-0" value="부장결재" readonly>
+    </th:block>
+    <th:block th:if="${plan.planState eq 'DST006'}">
+      <input type="text" class="form-control border-0" value="부장반려" readonly>
+    </th:block>
   </div>
 </div>
 <hr>

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

@@ -0,0 +1,183 @@
+<!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>
+</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" id="monthPlanTab" data-bs-toggle="tab" data-bs-target="#monthPlanPanel" type="button" role="tab" aria-controls="monthPlanPanel" aria-selected="false">월간 계획</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>
+            </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/apprvStayPage}">
+              <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>
+                        </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>
+                          <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">
+        <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" id="planViewBody">
+
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-warning" id="editPlanBtn" th:unless="${accessAuth eq 'ACC001'}">수정</button>
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+</html>

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

@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko" xmlns:th="http://www.thymeleaf.org">
-<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">
-          <input type="text" class="form-control form-control-sm">
-        </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>
-            </tr>
-            </thead>
-            <tbody>
-            <tr class="planTr" th:each="plan:${planList}">
-              <input type="hidden" class="planKey" th:value="${plan.planKey}">
-              <td><input type="checkbox"></td>
-              <td th:text="${plan.contentTitle}"></td>
-              <td th:text="${#temporals.format(plan.planDt, 'yyyy-MM-dd')}"></td>
-              <td th:text="${plan.wrtNm}"></td>
-              <td th:text="${#temporals.format(plan.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
-              <td></td>
-              <td th:if="${plan.sectionApprv eq 'T'}">계장결재</td>
-              <td th:if="${plan.sectionApprv eq 'F'}">계장반려</td>
-              <td th:if="${plan.headApprv eq 'T'}">부장결재</td>
-              <td th:if="${plan.headApprv eq 'F'}">부장반려</td>
-              <td th:if="${plan.planState eq 'T'}">임시저장</td>
-              <td th:if="${#strings.isEmpty(plan.sectionApprv) and #strings.isEmpty(plan.headApprv) and plan.planState eq 'S'}">결재대기</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">
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-</html>

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

@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko" xmlns:th="http://www.thymeleaf.org">
-<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">
-          <input type="text" class="form-control form-control-sm">
-        </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>
-            </tr>
-            </thead>
-            <tbody>
-            <tr class="planTr" th:each="plan:${planList}">
-              <input type="hidden" class="planKey" th:value="${plan.planKey}">
-              <td><input type="checkbox"></td>
-              <td th:text="${plan.contentTitle}"></td>
-              <td th:text="${#temporals.format(plan.planDt, 'yyyy-MM-dd')}"></td>
-              <td th:text="${plan.wrtNm}"></td>
-              <td th:text="${#temporals.format(plan.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
-              <td></td>
-              <td th:if="${plan.sectionApprv eq 'T'}">계장결재</td>
-              <td th:if="${plan.sectionApprv eq 'F'}">계장반려</td>
-              <td th:if="${plan.headApprv eq 'T'}">부장결재</td>
-              <td th:if="${plan.headApprv eq 'F'}">부장반려</td>
-              <td th:if="${plan.planState eq 'T'}">임시저장</td>
-              <td th:if="${#strings.isEmpty(plan.sectionApprv) and #strings.isEmpty(plan.headApprv) and plan.planState eq 'S'}">결재대기</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">
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-</html>

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

@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko" xmlns:th="http://www.thymeleaf.org">
-<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">
-          <input type="text" class="form-control form-control-sm">
-        </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>
-            </tr>
-            </thead>
-            <tbody>
-            <tr class="planTr" th:each="plan:${planList}">
-              <input type="hidden" class="planKey" th:value="${plan.planKey}">
-              <td><input type="checkbox"></td>
-              <td th:text="${plan.contentTitle}"></td>
-              <td th:text="${#temporals.format(plan.planDt, 'yyyy-MM-dd')}"></td>
-              <td th:text="${plan.wrtNm}"></td>
-              <td th:text="${#temporals.format(plan.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
-              <td></td>
-              <td th:if="${plan.sectionApprv eq 'T'}">계장결재</td>
-              <td th:if="${plan.sectionApprv eq 'F'}">계장반려</td>
-              <td th:if="${plan.headApprv eq 'T'}">부장결재</td>
-              <td th:if="${plan.headApprv eq 'F'}">부장반려</td>
-              <td th:if="${plan.planState eq 'T'}">임시저장</td>
-              <td th:if="${#strings.isEmpty(plan.sectionApprv) and #strings.isEmpty(plan.headApprv) and plan.planState eq 'S'}">결재대기</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">
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-</html>