견문관리 요청사항 반영.

src/main/resources/mybatisMapper/AffairMapper.xml

@@ -108,6 +108,7 @@
            a.wrt_user_seq,
            a.wrt_dt,
            b.fileCnt,
+           c.rating_organ,
            c.affair_status,
            c.affair_rate,
            c.organ_up,

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

@@ -1,33 +1,7 @@
-$(function (){
+$(document).on('click', '.faRptTr', function (){
-  $.ajax({
+  location.href = "/faRpt/faRptBoard?activeTab=receive&refDocKey="+$(this).find('.faRptKey').val();
-    type : 'GET',
-    url : "/myInfo/getDashBoardConfig",
-    dataType:"json",
-    success : function(data) {
-      data = [{menuUrl:"/publicBoard/noticePage"}].concat(data)
-      getSubPage(data)
-    },
-    error : function(xhr, status) {
-
-    }
-  })
 })
 
-function getSubPage(menuList){
+$(document).on('click', '.affairTr', function (){
-  $.each(menuList, function(idx, menu){
+  location.href = $($(this).parents(".card")[0]).find("a").attr("href")+"&refDocKey="+$(this).find('.affairKey').val();
-    if(idx<6){
-      const url = menu.menuUrl+(menu.menuUrl.includes('?')?'&dashboardFlag=true':'?dashboardFlag=true');
-      $.ajax({
-        type : 'GET',
-        url : url,
-        dataType:"html",
-        success : function(html) {
-          $("#subPage"+idx).append(html);
-        },
-        error : function(xhr, status) {
-
-        }
 })
-    }
-  })
-}

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

@@ -91,7 +91,7 @@ $(document).on('change', '.organUp', function (){
     for(let i=affairRatingRow.length-1; i>=0; i--){
       const row = $(affairRatingRow[i]);
       if(nextRowFlag){
-        row.find("input, select").removeAttr("disabled")
+        //row.find("input, select").removeAttr("disabled")
       }
       if(row.find('.organUp')[0] !== undefined){
         nextRowFlag = row.find('.organUp')[0].checked;
@@ -226,7 +226,7 @@ $(document).on('click', '#fileDownBtn', function (){
 })
 
 $(document).on('click', '#printBtn', function (){
-  window.open("http://118.219.150.34:50570/ClipReport5/report.jsp")
+  /*window.open("http://118.219.150.34:50570/ClipReport5/report.jsp")*/
 })
 
 function getAffairViewModal(affairKey){
@@ -299,9 +299,10 @@ function saveAffair(affairStatus){
         contentType: false,
         success : function(result) {
           alert("저장되었습니다.");
-          contentFade("out");
+          location.href = "/affair/affairMgt/"+$(".reportTypeTab.active").attr("data-reporttype")+"?affairCategory="+$("#affairCategory").val()+"&refDocKey="+result;
+          /*contentFade("out");
           $("#affairEditModal").modal('hide');
-          getAffairViewModal(result);
+          getAffairViewModal(result);*/
         },
         error : function(xhr, status) {
           alert("저장에 실패하였습니다.")
@@ -350,8 +351,9 @@ function modifyAffairRating(){
       },
       success : function(result) {
         alert("수정되었습니다.");
-        contentFade("out");
+        location.href = "/affair/affairMgt/"+$(".reportTypeTab.active").attr("data-reporttype")+"?affairCategory="+$("#affairCategory").val()+"&refDocKey="+result;
-        getAffairViewModal(result);
+        /*contentFade("out");
+        getAffairViewModal(result);*/
       },
       error : function(xhr, status) {
         alert("수정에 실패하였습니다.")
@@ -375,7 +377,8 @@ function affairStateChange(ratingList){
       alert("저장되었습니다")
       contentFade("out");
       if(result !== 0){
-        getAffairViewModal(result);
+        location.href = "/affair/affairMgt/"+$(".reportTypeTab.active").attr("data-reporttype")+"?affairCategory="+$("#affairCategory").val()+"&refDocKey="+result;
+        /*getAffairViewModal(result);*/
       }else{
         location.reload()
       }

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

@@ -23,7 +23,8 @@
       </div>
       <label th:for="${accessAuth eq 'ACC003'?'reportDt': ''}" class="col-sm-1 col-form-label col-form-label-sm text-center">보고일자</label>
       <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm" th:id="${accessAuth eq 'ACC003'?'reportDt': ''}" name="reportDt" th:value="${#temporals.format(affair.reportDt, 'yyyy-MM-dd')}" readonly>
+        <input type="text" class="form-control form-control-sm" th:id="${userOrgan eq 'OG001' and accessAuth eq 'ACC003'?'reportDt': ''}"
+               name="reportDt" th:value="${#temporals.format(affair.reportDt, 'yyyy-MM-dd')}" readonly>
       </div>
       <label for="viewStatus" class="col-sm-1 col-form-label col-form-label-sm text-center">공개여부</label>
       <div class="col-sm-2">
@@ -123,5 +124,5 @@
   <th:block th:if="${affair.affairKey eq null or (affair.affairStatus eq 'DST001' or affair.affairStatus eq 'DST002')}">
     <button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>
   </th:block>
-  <button type="button" class="btn btn-primary" id="saveAffairBtn" th:data-status="${(affair.affairStatus eq 'DST004' or affair.affairStatus eq 'DST006')?affair.affairStatus:'DST002'}">저장</button>
+  <button type="button" class="btn btn-primary" id="saveAffairBtn" th:data-status="${(affair.affairStatus eq 'DST004' or affair.affairStatus eq 'DST006')?affair.affairStatus:'DST002'}" th:text="${affair.affairKey eq null?'제출':'수정'}"></button>
 </div>

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

@@ -200,16 +200,16 @@
                         <th:block th:if="${affair.affairStatus eq code.itemCd}" th:text="${code.itemValue}"></th:block>
                       </th:block>
                     </td>
-                    <th:block th:unless="${page eq 'stayReport'}">
+                    <th:block th:if="${page ne 'stayReport'}">
                       <td>
                         <th:block th:each="code:${session.commonCode.get('AAR')}">
                           <th:block th:if="${code.itemCd eq affair.affairRate}" th:text="${code.itemValue}"></th:block>
                         </th:block>
                       </td>
-                      <td th:text="${affair.organUp eq 'T'?'O':'X'}"></td>
+                      <td th:text="${affair.organUp eq 'T'?'O':(affair.wrtOrgan ne affair.ratingOrgan?'O':'X')}"></td>
                     </th:block>
                     <th:block th:if="${page eq 'stayReport'}">
-                      <th:block th:if="${(#strings.contains(apprvAuth, 'APC004') or #strings.contains(apprvAuth, 'APC003')) and affair.affairStatus eq 'DST002'}">
+                      <th:block th:if="${apprvAuth ne null and (#strings.contains(apprvAuth, 'APC004') or #strings.contains(apprvAuth, 'APC003')) and affair.affairStatus eq 'DST002'}">
                         <td colspan="2" class="apprvTd">
                           <input type="hidden" class="affairKey" th:value="${affair.affairKey}">
                           <input type="radio" class="apprvChkbox" th:id="|apprvChkbox${affair.affairKey}DST004|" th:name="|apprvChkbox${affair.affairKey}|" value="DST004">
@@ -220,7 +220,7 @@
                           <label th:for="|apprvChkbox${affair.affairKey}|">해제</label>
                         </td>
                       </th:block>
-                      <th:block th:if="${(#strings.contains(apprvAuth, 'APC002') or #strings.contains(apprvAuth, 'APC001')) and affair.affairStatus eq 'DST004'}">
+                      <th:block th:if="${apprvAuth ne null and (#strings.contains(apprvAuth, 'APC002') or #strings.contains(apprvAuth, 'APC001')) and affair.affairStatus eq 'DST004'}">
                         <td colspan="2" class="apprvTd">
                           <input type="hidden" class="affairKey" th:value="${affair.affairKey}">
                           <div class="row justify-content-center">
@@ -283,7 +283,7 @@
                 </nav>
               </div>
               <div class="col-auto">
-                <input type="button" class="btn btn-success" value="등록" id="addAffairBtn" th:unless="${accessAuth eq 'ACC001'}">
+                <input type="button" class="btn btn-success" value="제출" id="addAffairBtn" th:if="${page eq 'myReport' and accessAuth ne 'ACC001'}">
                 <input type="button" class="btn btn-warning" value="결재" id="tableApprvBtn" th:if="${page eq 'stayReport' and apprvAuth ne null}" th:data-apprvauth="${apprvAuth}">
               </div>
             </div>

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

@@ -271,7 +271,7 @@
                     <input type="hidden" class="sectionTitle" th:value="${rate.sectionTitle}">
                     <input type="hidden" class="sectionNm" th:value="${rate.sectionNm}">
                     <input type="hidden" class="sectionApprvDt" th:value="${#temporals.format(rate.sectionApprvDt, 'yyyy-MM-dd HH:mm:ss')}">
-                    <select class="form-select form-select-sm sectionApprv w-30">
+                    <select class="form-select form-select-sm sectionApprv w-30" disabled>
                       <option value="">미결재</option>
                       <option value="DST003" th:selected="${rate.sectionApprv eq 'DST003'}">반려</option>
                       <option value="DST004" th:selected="${rate.sectionApprv eq 'DST004'}">승인</option>
@@ -298,7 +298,7 @@
                     <input type="hidden" class="headTitle" th:value="${rate.headTitle}">
                     <input type="hidden" class="headNm" th:value="${rate.headNm}">
                     <input type="hidden" class="headApprvDt" th:value="${#temporals.format(rate.headApprvDt, 'yyyy-MM-dd HH:mm:ss')}">
-                    <select class="form-select form-select-sm headApprv w-30">
+                    <select class="form-select form-select-sm headApprv w-30" disabled>
                       <option value="">미결재</option>
                       <option value="DST005" th:selected="${rate.headApprv eq 'DST005'}">반려</option>
                       <option value="DST006" th:selected="${rate.headApprv eq 'DST006'}">승인</option>
@@ -343,8 +343,8 @@
     <!--본청 관리자가 아닌경우-->
     <th:block th:unless="${affair.affairStatus eq 'DST004' or affair.affairStatus eq 'DST006'}">
       <!--승인 상태가 아닐 때-->
-      <th:block th:if="${userSeq eq affair.wrtUserSeq or accessAuth eq 'ACC003'}">
+      <th:block th:if="${userSeq eq affair.wrtUserSeq}">
-        <!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
+        <!--작성자일 경우 수정 허용-->
         <button type="button" class="btn btn-warning" id="editAffairBtn">본문 수정</button>
       </th:block>
     </th:block>

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

@@ -3,7 +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/dashboard.js}"></script>-->
+  <script type="text/javascript" th:src="@{/js/dashboard.js}"></script>
 </th:block>
 <div layout:fragment="content">
   <main>
@@ -90,7 +90,6 @@
             <div class="col-4 py-1" id="subPage2">
             </div>
             <div class="col-4 py-1" id="subPage3">
-              <script type="text/javascript" th:src="@{/js/faRpt/faRpt.js}"></script>
               <div class="card">
                 <div class="card-header bg-white">
                   <div class="row justify-content-between">
@@ -120,7 +119,6 @@
               </div>
             </div>
             <div class="col-4 py-1" id="subPage4">
-              <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/affair/affairMgt.js}"></script>
               <div class="card">
                 <div class="card-header bg-white">
                   <div class="row justify-content-between">