대시보드 수정

가입양식 수정
권한부여 방식 수정

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

@@ -105,13 +105,6 @@ public class BaseController {
     mav.addObject("affair1List", affairService.selectDashboardAffairList(affair));
     affair.setAffairApprv(authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affair/affairMgt/myReport?affairCategory=CAT216").get(0).getApprovalAuth());
     mav.addObject("affair2List", affairService.selectDashboardIntelligenceNetworkList(affair));
-    /*AffairBoard affair = new AffairBoard();
-    affair.setAffairCategory("CAT215");
-    affair.setRatingOrgan(loginUser.getOgCd());
-    affair.setRowCnt(8);
-    mav.addObject("affair1List", affairService.selectAffairBoardList(affair));
-    affair.setAffairCategory("CAT216");
-    mav.addObject("affair2List", affairService.selectAffairBoardList(affair));*/
     return mav;
   }
 

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

@@ -9,6 +9,7 @@ import com.dbnt.faisp.main.authMgt.repository.ApprovalConfigRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,8 +37,27 @@ public class AuthMgtService {
   }
 
   public void saveAuth(AuthMgt authMgt) {
-    accessConfigRepository.saveAll(authMgt.getAccessConfigList());
-    approvalConfigRepository.saveAll(authMgt.getApprovalConfigList());
+    List<ApprovalConfig> approvalConfigList = authMgt.getApprovalConfigList();
+    List<AccessConfig> accessConfigList = authMgt.getAccessConfigList();
+    List<AccessConfig> tempList = new ArrayList<>();
+    for(ApprovalConfig approvalConfig: approvalConfigList){
+      boolean menuFlag = false;
+      for(AccessConfig accessConfig: accessConfigList){
+        if (accessConfig.getAccessAuth() != null && approvalConfig.getApprovalAuth() != null && accessConfig.getMenuKey().equals(approvalConfig.getMenuKey())){
+          menuFlag = true;
+        }
+      }
+      if(!menuFlag){
+        AccessConfig temp = new AccessConfig();
+        temp.setMenuKey(approvalConfig.getMenuKey());
+        temp.setUserSeq(approvalConfig.getUserSeq());
+        temp.setAccessAuth("ACC002");
+        tempList.add(temp);
+      }
+    }
+    accessConfigList.addAll(tempList);
+    approvalConfigRepository.saveAll(approvalConfigList);
+    accessConfigRepository.saveAll(accessConfigList);
   }
 
   public List<Integer> selectApprvUserList(String wrtOrgan, Integer menuKey, String apprvAuth) {

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

@@ -1,6 +1,5 @@
 package com.dbnt.faisp.main.fpiMgt.affair.model;
 
-import com.dbnt.faisp.config.BaseModel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -8,7 +7,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @NoArgsConstructor
-public class DashboardAffair extends BaseModel {
+public class DashboardAffair{
   private String board;
   private Integer key;
   private String title;

src/main/resources/mybatisMapper/AffairMapper.xml

@@ -658,31 +658,31 @@
   </select>
 
   <select id="selectDashboardAffairList" parameterType="DashboardAffair" resultType="DashboardAffair">
-    select 'plan' as board,
+    select 'plan1' as board,
           a.plan_key as key,
           a.content_title as title,
           a.wrt_user_grd as wrtUserGrd,
           a.wrt_user_nm as wrtUserNm,
           a.wrt_dt
-    from plan_board a inner join plan_apprv b on a.plan_key = b.plan_key
+    from plan_board a
     <where>
       <choose>
         <when test='planApprv == null or planApprv == ""'>
           and a.wrt_user_seq = #{userSeq}
         </when>
         <when test='planApprv == "APC004APC001" or planApprv == "APC003APC002"'>
-          and a.wrt_organ = #{ogCd} and (b.state = 'DST002' or b.state = 'DST004')
+          and a.wrt_organ = #{ogCd} and (a.plan_state = 'DST002' or a.plan_state = 'DST004')
         </when>
         <when test='planApprv == "APC004" or planApprv == "APC003"'>
-          and a.wrt_organ = #{ogCd} and b.state = 'DST002'
+          and a.wrt_organ = #{ogCd} and a.plan_state = 'DST002'
         </when>
         <when test='planApprv == "APC002" or planApprv == "APC001"'>
-          and a.wrt_organ = #{ogCd} and b.state = 'DST004'
+          and a.wrt_organ = #{ogCd} and a.plan_state = 'DST004'
         </when>
       </choose>
     </where>
     union all
-    select 'affair' as board,
+    select 'affair1' as board,
           a.affair_key as key,
           a.title as title,
           a.wrt_user_grd as wrtUserGrd,
@@ -713,20 +713,20 @@
           a.wrt_user_grd as wrtUserGrd,
           a.wrt_user_nm as wrtUserNm,
           a.wrt_dt
-    from result_board a inner join result_apprv b on a.result_key = b.result_key
+    from result_board a
     <where>
       <choose>
         <when test='resultApprv == null or resultApprv == ""'>
           and a.wrt_user_seq = #{userSeq}
         </when>
         <when test='resultApprv == "APC004APC001" or resultApprv == "APC003APC002"'>
-          and a.wrt_organ = #{ogCd} and (b.state = 'DST002' or b.state = 'DST004')
+          and a.wrt_organ = #{ogCd} and (a.result_state = 'DST002' or a.result_state = 'DST004')
         </when>
         <when test='resultApprv == "APC004" or resultApprv == "APC003"'>
-          and a.wrt_organ = #{ogCd} and b.state = 'DST002'
+          and a.wrt_organ = #{ogCd} and a.result_state = 'DST002'
         </when>
         <when test='resultApprv == "APC002" or resultApprv == "APC001"'>
-          and a.wrt_organ = #{ogCd} and b.state = 'DST004'
+          and a.wrt_organ = #{ogCd} and a.result_state = 'DST004'
         </when>
       </choose>
     </where>
@@ -734,7 +734,7 @@
     limit 8
   </select>
   <select id="selectDashboardIntelligenceNetworkList" parameterType="DashboardAffair" resultType="DashboardAffair">
-    select 'affair' as board,
+    select 'affair2' as board,
           a.affair_key as key,
           a.title as title,
           a.wrt_user_grd as wrtUserGrd,

src/main/resources/static/js/authMgt/authMgt.js

@@ -1,24 +1,9 @@
 
 $(document).on('click', '.userInfoTr', function (){
-  $.ajax({
-    url: '/authMgt/authEditModal',
-    data: {
-      userSeq: Number($(this).find(".userSeq").val()),
-      userNm: $(this).find(".userNm").val()
-    },
-    type: 'GET',
-    dataType:"html",
-    success: function(html){
-      $("#authEditModalContent").empty().append(html)
-      $("#accessTab").click();
-      $("#authEditModal").modal('show');
-    },
-    error:function(e){
-      ajaxErrorAction(e);
-    }
-  });
+  getAuthEditModal(Number($(this).find(".userSeq").val()), $(this).find(".userNm").val());
 })
 
+
 $(document).on('click', '.selectTh', function (){
   const type = $(this).attr("data-type");
   const target = $(this).attr("data-target");
@@ -132,6 +117,8 @@ $(document).on('click', '#saveAuthBtn', function (){
       },
       success : function(data) {
         alert("저장되었습니다.");
+        const authEditModalBody = $("#authEditModalBody")
+        getAuthEditModal(authEditModalBody.find("#userSeq").val(), authEditModalBody.find("#userNm").val())
         contentFade("out");
       },
       error : function(xhr, status) {
@@ -140,4 +127,25 @@ $(document).on('click', '#saveAuthBtn', function (){
       }
     })
   }
-})
+})
+
+
+function getAuthEditModal(userSeq, userNm){
+  $.ajax({
+    url: '/authMgt/authEditModal',
+    data: {
+      userSeq: userSeq,
+      userNm: userNm
+    },
+    type: 'GET',
+    dataType:"html",
+    success: function(html){
+      $("#authEditModalContent").empty().append(html)
+      $("#accessTab").click();
+      $("#authEditModal").modal('show');
+    },
+    error:function(e){
+      ajaxErrorAction(e);
+    }
+  });
+}

src/main/resources/static/js/dashboard.js

@@ -3,5 +3,27 @@ $(document).on('click', '.faRptTr', function (){
 })
 
 $(document).on('click', '.affairTr', function (){
-  location.href = $($(this).parents(".card")[0]).find("a").attr("href")+"&refDocKey="+$(this).find('.affairKey').val();
+  switch ($(this).find('.board').val()){
+    case "plan1":
+      location.href = "/affairPlan/planMgt?refDocKey="+$(this).find(".key").val();
+      break;
+    case "affair1":
+      location.href = "/affair/affairMgt/myReport?affairCategory=CAT215&refDocKey="+$(this).find(".key").val();
+      break;
+    case "result":
+      location.href = "/affairResult/resultMgt?refDocKey="+$(this).find(".key").val();
+      break;
+    case "plan2":
+      /*location.href = "/affairPlan/planMgt?refDocKey="+$(this).find(".key").val();*/
+      break;
+    case "affair2":
+      location.href = "/affair/affairMgt/myReport?affairCategory=CAT215&refDocKey="+$(this).find(".key").val();
+      break;
+    case "analyze":
+      /*location.href = "/affairPlan/planMgt?refDocKey="+$(this).find(".key").val();*/
+      break;
+    case "fire":
+      /*location.href = "/affairPlan/planMgt?refDocKey="+$(this).find(".key").val();*/
+      break;
+  }
 })

src/main/resources/templates/adminPage/authMgt/authEditModal.html

@@ -4,8 +4,9 @@
   <h5 class="modal-title text-white" id="menuEditModalLabel" th:text="|${userInfo.userNm} 권한 편집|"></h5>
   <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
-<div class="modal-body">
+<div class="modal-body" id="authEditModalBody">
   <input type="hidden" id="userSeq" th:value="${userInfo.userSeq}">
+  <input type="hidden" id="userNm" th:value="${userInfo.userNm}">
   <ul class="nav nav-tabs" id="userTab" role="tablist">
     <li class="nav-item" role="presentation">
       <button class="nav-link active" id="accessTab" data-bs-toggle="tab" data-bs-target="#accessTabPanel" type="button" role="tab" aria-controls="accessTabPanel" aria-selected="true">메뉴</button>

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

@@ -171,7 +171,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="addPlanBtn" th:unless="${accessAuth eq 'ACC001'}">
               </div>
             </div>
           </div>

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

@@ -138,8 +138,8 @@
 
 
     </div>
-    <div class="col-12" th:if="${(apprvAuth eq 'APC003' or apprvAuth eq 'APC004') and plan.planState eq 'DST002'
-                                or (apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and plan.planState eq 'DST004'}">
+    <div class="col-12" th:if="${(#strings.contains(apprvAuth, 'APC003') or #strings.contains(apprvAuth, 'APC004')) and plan.planState eq 'DST002'
+                                or (#strings.contains(apprvAuth, 'APC001') or #strings.contains(apprvAuth, 'APC002')) and plan.planState eq 'DST004'}">
       <form action="#" method="post" id="apprvForm">
         <div class="row">
           <div class="col-10">
@@ -150,11 +150,13 @@
           </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="승인">
+                   th:data-planstate="${(#strings.contains(apprvAuth, 'APC003') or #strings.contains(apprvAuth, 'APC004'))
+                                        and plan.planState eq 'DST002'?'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="반려">
+                   th:data-planstate="${(#strings.contains(apprvAuth, 'APC003') or #strings.contains(apprvAuth, 'APC004'))
+                                        and plan.planState eq 'DST002'?'DST003':'DST005'}" value="반려">
           </div>
         </div>
       </form>

src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html

@@ -168,7 +168,7 @@
                 </nav>
               </div>
               <div class="col-auto">
-                <input type="button" class="btn btn-success" value="등록" id="addResultBtn" th:unless="${accessAuth eq 'ACC001'}">
+                <input type="button" class="btn btn-success" value="작성" id="addResultBtn" th:unless="${accessAuth eq 'ACC001'}">
               </div>
             </div>
           </div>

src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html

@@ -232,8 +232,8 @@
       </th:block>
     </th:block>
     <div class="col-12 mt-2" th:if="${apprvAuth ne null}">
-      <th:block th:if="${result.resultState eq 'DST002' and (apprvAuth eq 'APC004'||apprvAuth eq 'APC003')
-                        or result.resultState eq 'DST004' and (apprvAuth eq 'APC002'||apprvAuth eq 'APC001')}">
+      <th:block th:if="${result.resultState eq 'DST002' and (#strings.contains(apprvAuth, 'APC003') or #strings.contains(apprvAuth, 'APC004'))
+                        or result.resultState eq 'DST004' and (#strings.contains(apprvAuth, 'APC002') or #strings.contains(apprvAuth, 'APC001'))}">
         <form action="#" method="post" id="apprvForm">
           <div class="row">
             <div class="col-10">
@@ -243,10 +243,14 @@
               <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-resultstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST004':'DST006'}" value="승인">
+              <input type="button" class="btn btn-sm btn-success apprvBtn"
+                     th:data-resultstate="${(#strings.contains(apprvAuth, 'APC003') or #strings.contains(apprvAuth, 'APC004'))
+                                            and result.resultState eq 'DST002'?'DST004':'DST006'}" value="승인">
             </div>
             <div class="col-auto">
-              <input type="button" class="btn btn-sm btn-danger apprvBtn" th:data-resultstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST003':'DST005'}" value="반려">
+              <input type="button" class="btn btn-sm btn-danger apprvBtn"
+                     th:data-resultstate="${(#strings.contains(apprvAuth, 'APC003') or #strings.contains(apprvAuth, 'APC004'))
+                                            and result.resultState eq 'DST002'?'DST003':'DST005'}" value="반려">
             </div>
           </div>
         </form>

src/main/resources/templates/login/dashboard.html

@@ -137,10 +137,11 @@
                     </thead>
                     <tbody>
                     <tr class="affairTr" th:each="affair:${affair1List}">
-                      <input type="hidden" class="affairKey" th:value="${affair.key}">
+                      <input type="hidden" class="board" th:value="${affair.board}">
+                      <input type="hidden" class="key" th:value="${affair.key}">
                       <td>
-                        <th:block th:if="${affair.board eq 'plan'}">계획수립</th:block>
-                        <th:block th:if="${affair.board eq 'affair'}">견문관리</th:block>
+                        <th:block th:if="${affair.board eq 'plan1'}">계획수립</th:block>
+                        <th:block th:if="${affair.board eq 'affair1'}">견문관리</th:block>
                         <th:block th:if="${affair.board eq 'result'}">청산보고서</th:block>
                       </td>
                       <td ><i class="bi bi-dot" style="color: #3d73d7"></i>
@@ -179,8 +180,8 @@
                     <tr class="affairTr" th:each="affair:${affair2List}">
                       <input type="hidden" class="affairKey" th:value="${affair.key}">
                       <td>
-                        <th:block th:if="${affair.board eq 'plan'}">운영계획</th:block>
-                        <th:block th:if="${affair.board eq 'affair'}">견문관리</th:block>
+                        <th:block th:if="${affair.board eq 'plan2'}">운영계획</th:block>
+                        <th:block th:if="${affair.board eq 'affair2'}">견문관리</th:block>
                         <th:block th:if="${affair.board eq 'analyze'}">운영실적</th:block>
                         <th:block th:if="${affair.board eq 'fire'}">해고/연장보고</th:block>
                       </td>

src/main/resources/templates/login/joinForm.html

@@ -56,8 +56,8 @@
         <label for="sex" class="col-sm-2 col-form-label col-form-label-sm text-center">성별</label>
         <div class="col-sm-2">
           <select class="form-select form-select-sm" id="sex" name="sex" disabled>
-            <option value="SEX002" th:selected="${userInfo.sex eq 'M'}">남</option>
-            <option value="SEX001" th:selected="${userInfo.sex eq 'F'}">여</option>
+            <option value="SEX002" th:selected="${userInfo.sex eq 'SEX002'}">남</option>
+            <option value="SEX001" th:selected="${userInfo.sex eq 'SEX001'}">여</option>
           </select>
         </div>
         <label for="phoneNo" class="col-sm-2 col-form-label col-form-label-sm text-center">휴대전화</label>

src/main/resources/templates/print/affair.html

@@ -34,15 +34,33 @@
         </colgroup>
         <tr>
           <td>수신</td>
-          <td class="text-start ps-2"></td>
+          <td class="text-start ps-2">
+            <th:block th:if="${affairRating.ratingOrgan eq 'OG001'}">해양경찰청장</th:block>
+            <th:block th:if="${affairRating.ratingOrgan eq 'OG027'}">서해5도특별경비단장</th:block>
+            <th:block th:unless="${affairRating.ratingOrgan eq 'OG001' or affairRating.ratingOrgan eq 'OG027'}">
+              <th:block th:each="code:${session.commonCode.get('OG')}">
+                <th:block th:if="${code.itemCd eq affairRating.ratingOrgan}">
+                  <th:block th:if="${#strings.contains(code.itemValue, '청')}">
+                    <th:block th:text="|${#strings.substringBefore(code.itemValue, '청')}지방청장|"></th:block>
+                  </th:block>
+                  <th:block th:if="${!#strings.contains(code.itemValue, '청') and #strings.contains(code.itemValue, '서')}">
+                    <th:block th:text="|${#strings.substringBefore(code.itemValue, '서')}경찰서장|"></th:block>
+                  </th:block>
+                </th:block>
+              </th:block>
+            </th:block>
+          </td>
           <td class="align-middle" rowspan="3">결재</td>
           <td>계장</td>
           <td>과장</td>
         </tr>
         <tr>
           <td>참조</td>
-          <td class="text-start ps-2"></td>
-          <td class="align-middle" rowspan="2" th:text="${affairRating.sectionNm eq affairRating.headNm ? '전결':affairRating.sectionNm}"></td>
+          <td class="text-start ps-2">
+            <th:block th:if="${affairRating.ratingOrgan ne 'OG027'}">정보외사과장</th:block>
+            <th:block th:if="${affairRating.ratingOrgan eq 'OG027'}">경비작전과장</th:block>
+          </td>
+          <td class="align-middle" rowspan="2" th:text="${affairRating.sectionNm ne '' and affairRating.sectionNm eq affairRating.headNm ? '전결':affairRating.sectionNm}"></td>
           <td class="align-middle" rowspan="2" th:text="${affairRating.headNm}"></td>
         </tr>
         <tr>