Merge branch 'master' of http://118.219.150.34:50501/DBNT/FAISP

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

@@ -3,6 +3,7 @@ package com.dbnt.faisp.config;
 import com.dbnt.faisp.menuMgt.model.MenuMgt;
 import com.dbnt.faisp.menuMgt.service.MenuMgtService;
 import com.dbnt.faisp.userInfo.model.UserInfo;
+import com.dbnt.faisp.userInfo.service.UserInfoService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,6 +18,7 @@ import org.springframework.web.servlet.ModelAndView;
 public class ModalController {
 
   private final MenuMgtService menuMgtService;
+  private final UserInfoService userInfoService;
 
   @GetMapping("/menuModal")
   public ModelAndView menuModalPage(@AuthenticationPrincipal UserInfo loginUser, MenuMgt menuMgt){
@@ -30,4 +32,17 @@ public class ModalController {
     return mav;
   }
 
+  @GetMapping("/userModal")
+  public ModelAndView userMoadlPage(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo){
+    ModelAndView mav = new ModelAndView("commonModal/userModal");
+    userInfo.setQueryInfo();
+    if(userInfo.getUserStatus() == null || userInfo.getUserStatus().equals("")) {
+      userInfo.setUserStatus("USC003");
+    }
+    mav.addObject("userInfoList", userInfoService.selectUserInfoList(userInfo));
+    userInfo.setContentCnt(userInfoService.selectUserInfoListCnt(userInfo));
+    userInfo.setPaginationInfo();
+    mav.addObject("searchParams", userInfo);
+    return mav;
+  }
 }

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

@@ -84,6 +84,7 @@ public class SecurityConfig{
               "/myInfo/**",
               "/modal/**",
               "/publicBoard/**",
+              "/faRpt/**",
               "/affairPlan/**",
               "/affair/**",
               "/affairResult/**",

src/main/java/com/dbnt/faisp/faRpt/FaRptController.java

@@ -1,6 +1,7 @@
 package com.dbnt.faisp.faRpt;
 
 import com.dbnt.faisp.authMgt.service.AuthMgtService;
+import com.dbnt.faisp.codeMgt.service.CodeMgtService;
 import com.dbnt.faisp.faRpt.model.FaRptBoard;
 import com.dbnt.faisp.faRpt.service.FaRptService;
 import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard;
@@ -20,6 +21,7 @@ import java.util.List;
 public class FaRptController {
   private final FaRptService faRptService;
   private final AuthMgtService authMgtService;
+  private final CodeMgtService codeMgtService;
 
   @GetMapping("/faRptBoard")
   public ModelAndView faRptBoard(@AuthenticationPrincipal UserInfo loginUser, FaRptBoard faRptBoard){
@@ -71,6 +73,7 @@ public class FaRptController {
       faRptBoard.setWrtUserNm(loginUser.getUserNm());
       faRptBoard.setWrtDt(LocalDateTime.now());
     }
+    mav.addObject("frCategoryList", codeMgtService.selectCodeMgtList("FRC"));
     mav.addObject("faRpt", faRptBoard);
     return mav;
   }
@@ -87,7 +90,7 @@ public class FaRptController {
     return mav;
   }
 
-  @PostMapping("/savePlan")
+  @PostMapping("/saveFaRpt")
   public Integer saveFaRpt(FaRptBoard faRptBoard,
                           MultipartHttpServletRequest request,
                           @RequestParam(value = "fileSeq", required = false) List<Integer> deleteFileSeq){

src/main/java/com/dbnt/faisp/faRpt/model/FaRptBoard.java

@@ -51,6 +51,8 @@ public class FaRptBoard extends BaseModel {
   @Column(name = "ref_key")
   private Integer refKey;
 
+  @Transient
+  private String hashTags;
   @Transient
   private Integer receiveUserSeq;
   @Transient

src/main/java/com/dbnt/faisp/userInfo/userMgtController.java

@@ -23,7 +23,7 @@ public class userMgtController {
   public ModelAndView codeMgtPage(UserInfo userInfo) {
     ModelAndView mav = new ModelAndView("adminPage/userMgt/userMgt");
     userInfo.setQueryInfo();
-    if(userInfo.getUserStatus().equals("") || userInfo.getUserStatus() == null) {
+    if(userInfo.getUserStatus() == null || userInfo.getUserStatus().equals("")) {
     	userInfo.setUserStatus("USC003");
     }
     mav.addObject("userInfoList", userInfoService.selectUserInfoList(userInfo));

src/main/resources/mybatisMapper/menuMgtMapper.xml

@@ -5,6 +5,15 @@
 
 <mapper namespace="com.dbnt.faisp.menuMgt.mapper.MenuMgtMapper">
   <sql id="selectMenuMgtListWhere">
+    <if test='useChk == "T"'>
+      and use_chk = 'T'
+    </if>
+    <if test='useChk == "F"'>
+      and (use_chk is null or use_chk = '')
+    </if>
+    <if test='cat1Cd != null and cat1Cd != ""'>
+      and cat1_cd = #{cat1Cd}
+    </if>
     <if test='cat1Cd != null and cat1Cd != ""'>
       and cat1_cd = #{cat1Cd}
     </if>

src/main/resources/static/js/common.js

@@ -29,7 +29,7 @@ function searchFormSubmit(pageIndex){
   $("#searchBtn").click();
 }
 function searchModalSubmit(pageIndex){
-  $("#pageIndex").val(pageIndex);
+  $("#modalPageIndex").val(pageIndex);
   $.ajax({
     url: $("#modalUrl").val(),
     data : $("#modalSearchForm").serialize(),
@@ -38,7 +38,7 @@ function searchModalSubmit(pageIndex){
     dataType:"html",
     success: function(html){
       $("#modalBody").empty().append(html)
-      if(selectedList !== undefined){
+      if(selectedList !== undefined && selectedList.length>0){
         setSelectedChkBox();
       }
     },

src/main/resources/static/js/faRpt/faRpt.js

@@ -1,4 +1,4 @@
-
+let selectedList = [];
 $(function(){
   $("#dateSelectorDiv").datepicker({
     format: "yyyy-mm-dd",
@@ -24,26 +24,9 @@ $(document).on('click', '#editFaRptBtn', function (){
   getFaRptEditModal(Number($("#faRptViewBody").find("[name='faRptKey']").val()));
 })
 
-$(document).on('click', '#faRptAddBtn', function (){
+$(document).on('click', '#addReadUserBtn', function (){
-  $("#faRptDiv").append("<input type='text' class='form-control' name='faRptInfos'>")
+  searchModalSubmit(1);
-})
+  $("#userModal").modal('show');
-
-$(document).on('click', '#detailFaRptAddBtn', function (){
-  const detailFaRptDiv = $("#detailFaRptDiv");
-  detailFaRptDiv.append("<textarea type='text' name='detailFaRptInfos'></textarea>");
-  const lastAppendTextarea = detailFaRptDiv.children()[detailFaRptDiv.children().length-1];
-  $(lastAppendTextarea).summernote({
-    lang:'ko-KR',
-    height: 120,
-    disableDragAndDrop: true,
-    toolbar: [
-      ['style', ['style']],
-      ['font', ['bold', 'underline', 'clear']],
-      ['color', ['color']],
-      ['para', ['ul', 'ol', 'paragraph']],
-      ['table', ['table']]
-    ]
-  });
 })
 
 $(document).on('click', '#saveFaRptBtn', function (){
@@ -63,33 +46,6 @@ $(document).on('click', '.faRptTr', function (){
   getFaRptViewModal(Number($(this).find(".faRptKey").val()));
 })
 
-$(document).on('click', '.apprvBtn', function (){
-  $("#apprvFormFaRptKey").val($("#viewModalFaRptKey").val());
-  $("#viewModalApprvValue").val($(this).attr("data-faRptstate"));
-  if(confirm($(this).val()+"하시겠습니까?")){
-    const formData = new FormData($("#apprvForm")[0]);
-    contentFade("in")
-    $.ajax({
-      type : 'POST',
-      data : formData,
-      url : "/faRpt/faRptStateChange",
-      processData: false,
-      contentType: false,
-      beforeSend: function (xhr){
-        xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
-      },
-      success : function(result) {
-        alert("저장되었습니다")
-        getFaRptViewModal(result);
-        contentFade("out");
-      },
-      error : function(xhr, status) {
-        alert("저장에 실패하였습니다.");
-        contentFade("out");
-      }
-    })
-  }
-})
 
 function getFaRptViewModal(faRptKey){
   $.ajax({
@@ -122,7 +78,7 @@ function getFaRptEditModal(faRptKey){
       });
       $("#content").summernote({
         lang:'ko-KR',
-        height: 360,
+        height: 300,
         disableDragAndDrop: true,
         toolbar: [
           ['style', ['style']],
@@ -139,6 +95,7 @@ function getFaRptEditModal(faRptKey){
     }
   });
 }
+
 function saveFaRpt(faRptState){
   if(contentCheck()){
     if(confirm("저장하시겠습니까?")){
@@ -176,10 +133,18 @@ function saveFaRpt(faRptState){
 
 function contentCheck(){
   let flag = true;
-  if(!$("#contentTitle").val()){
+  if(!$("#faRptType").val()){
+    alert("분류를 선택해주세요.")
+    flag = false;
+  }
+  if(!$("#title").val()){
     alert("제목을 입력해주세요.")
     flag = false;
   }
+  if($("#readUserRow").children().length===0){
+    alert("수신자를 입력해주세요.")
+    flag = false;
+  }
   flag = fileCheck(flag, files);
   return flag;
 }

src/main/resources/templates/adminPage/menuMgt/menuMgt.html

@@ -25,6 +25,13 @@
               </div>
               <div class="col-auto">
                 <div class="row justify-content-end">
+                  <div class="col-auto">
+                    <select class="form-select form-select-sm" name="useChk">
+                      <option value="">전체</option>
+                      <option value="T">O</option>
+                      <option value="F">X</option>
+                    </select>
+                  </div>
                   <div class="col-auto">
                     <select class="form-select form-select-sm" name="cat1Cd">
                       <option value="">대분류 선택</option>

src/main/resources/templates/commonModal/userModal.html

@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+
+<div class="row">
+  <div class="col-12">
+    <form method="get" action="#" id="modalSearchForm">
+      <input type="hidden" name="userStatus" id="userStatus" th:value="${searchParams.userStatus}">
+      <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==num*10}"></option>
+            </th:block>
+          </select>
+        </div>
+        <div class="col-auto">
+          <div class="row justify-content-end">
+            <div class="col-auto">
+              <select class="form-select form-select-sm" name="ogCd">
+                <option value="">관서 선택</option>
+                <th:block th:each="commonCode:${session.commonCode.get('OG')}">
+                  <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.ogCd==commonCode.itemCd}"></option>
+                </th:block>
+              </select>
+            </div>
+            <div class="col-auto">
+              <select class="form-select form-select-sm" name="ofcCd">
+                <option value="">부서 선택</option>
+                <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                  <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.ofcCd==commonCode.itemCd}"></option>
+                </th:block>
+              </select>
+            </div>
+            <div class="col-auto">
+              <input type="text" class="form-control form-control-sm" name="userNm" placeholder="사용자명" th:value="${searchParams.userNm}">
+            </div>
+            <div class="col-auto">
+              <input type="text" class="form-control form-control-sm" name="userId" placeholder="사용자 아이디" th:value="${searchParams.userId}">
+            </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-striped">
+                <thead>
+                <tr>
+                  <th> <input type="checkbox" id="chk-all" class="userInfoCheckBox"></th>
+                  <th>소속</th>
+                  <th>부서</th>
+                  <th>계급</th>
+                  <th>성명</th>
+                  <th>아이디</th>
+                  <th>등록일</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr class="userInfoTr" th:each="userInfo:${userInfoList}">
+                  <input type="hidden" name="userSeq" class="userSeq" th:value="${userInfo.userSeq}">
+                  <td>
+                    <input type="checkbox" id="userChk" name="userChk" class="userInfoCheckBox" th:value="${userInfo.userSeq}">
+                  </td>
+                  <th:block th:each="commonCode:${session.commonCode.get('OG')}">
+                    <th:block th:if="${commonCode.itemCd == userInfo.ogCd}">
+                      <td th:text="${commonCode.itemValue}"></td>
+                    </th:block>
+                  </th:block>
+                  <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                    <th:block th:if="${commonCode.itemCd == userInfo.ofcCd}">
+                      <td th:text="${commonCode.itemValue}"></td>
+                    </th:block>
+                  </th:block>
+                  <td></td>
+                  <td th:text="${userInfo.userNm}"></td>
+                  <td th:text="${userInfo.userId}"></td>
+                  <td th:text="${#temporals.format(userInfo.wrtDt, 'yyyy-MM-dd HH:mm:ss')}"></td>
+                </tr>
+                </tbody>
+              </table>
+            </div>
+            <div class="row justify-content-center">
+              <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==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>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+</html>

src/main/resources/templates/faRpt/faRptBoard.html

@@ -145,7 +145,7 @@
   </main>
 
   <div class="modal fade" id="faRptEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="faRptEditModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-xl modal-dialog-scrollable">
+    <div class="modal-dialog modal-xxl modal-dialog-scrollable">
       <div class="modal-content" id="faRptEditModalContent">
 
       </div>
@@ -158,5 +158,30 @@
       </div>
     </div>
   </div>
+  <div class="modal fade" id="userModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xxl modal-dialog-scrollable">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title" id="menuModalLabel">수신자 검색</h5>
+          <input type="hidden" id="modalUrl" value="/modal/userModal">
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+        </div>
+        <div class="modal-body" id="modalBody">
+          <div class="row">
+            <div class="col-12">
+              <form method="get" action="#" id="modalSearchForm">
+                <input type="hidden" name="pageIndex" id="modalPageIndex" value="1">
+                <input type="hidden" name="rowCnt" value="10">
+              </form>
+            </div>
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-primary" id="getMenuBtn">추가</button>
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
 </html>

src/main/resources/templates/faRpt/faRptEditModal.html

@@ -15,31 +15,49 @@
     <input type="hidden" name="wrtUserGrd" th:value="${faRpt.wrtUserGrd}">
     <input type="hidden" name="status" id="status" th:value="${faRpt.status}">
     <div class="row">
-      <div class="col-7">
+      <div class="col-8">
         <div class="mb-3 row">
-          <label for="wrtUserNm" class="col-sm-2 col-form-label text-center">작성자</label>
+          <label for="wrtUserNm" class="col-sm-2 col-form-label col-form-label-sm text-center">작성자</label>
           <div class="col-sm-4">
-            <input type="text" class="form-control" id="wrtUserNm" name="wrtUserNm" th:value="${faRpt.wrtUserNm}" readonly>
+            <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" th:value="${faRpt.wrtUserNm}" readonly>
           </div>
-          <label for="wrtDt" class="col-sm-2 col-form-label text-center">작성일시</label>
+          <label for="wrtDt" class="col-sm-2 col-form-label col-form-label-sm text-center">작성일시</label>
           <div class="col-sm-4">
-            <input type="text" class="form-control" id="wrtDt" name="wrtDt" th:value="${#temporals.format(faRpt.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
+            <input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" th:value="${#temporals.format(faRpt.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
           </div>
         </div>
         <div class="mb-3 row">
-          <label for="title" class="col-sm-2 col-form-label text-center">제목</label>
+          <label for="faRptType" class="col-sm-2 col-form-label col-form-label-sm text-center">분류</label>
+          <div class="col-sm-4">
+            <select class="form-select form-select-sm" id="faRptType" name="faRptType">
+              <option value="">선택해주세요.</option>
+              <th:block th:each="frCategory:${frCategoryList}">
+                <option th:value="${frCategory.itemCd}" th:text="${frCategory.itemValue}" th:selected="${frCategory.itemCd eq faRpt.faRptType}"></option>
+              </th:block>
+            </select>
+          </div>
+        </div>
+        <div class="mb-3 row">
+          <label for="title" class="col-sm-2 col-form-label col-form-label-sm text-center">제목</label>
           <div class="col-sm-10">
-            <input type="text" class="form-control" id="title" name="title" th:value="${faRpt.title}">
+            <input type="text" class="form-control form-control-sm" id="title" name="title" th:value="${faRpt.title}">
           </div>
         </div>
         <div class="mb-3 row justify-content-center">
-          <label for="content" class="col-sm-2 col-form-label text-center">내용</label>
+          <label for="content" class="col-sm-2 col-form-label col-form-label-sm text-center">내용</label>
           <div class="col-sm-10">
             <textarea type='text' id="content" name='content' th:utext="${faRpt.content}"></textarea>
           </div>
         </div>
+        <div class="mb-3 row">
+          <label for="hashTags" class="col-sm-2 col-form-label col-form-label-sm text-center">해시태그</label>
+          <div class="col-sm-10">
+            <input type="text" class="form-control form-control-sm" id="hashTags" name="hashTags"
+                   placeholder="띄어쓰기로 각 태그를 구분합니다. 한 태그 내에서는 띄어쓰기 없이 입력해주세요. ex)태그1 태그2">
+          </div>
+        </div>
         <div class="row mb-3">
-          <label for="fileInputer" class="col-sm-2 col-form-label text-center">업로드 자료</label>
+          <label for="fileInputer" class="col-sm-2 col-form-label col-form-label-sm text-center">업로드 자료</label>
           <div class="col-sm-10" style="min-height: 70px;">
             <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
               <th:block th:if="${#arrays.isEmpty(faRpt.fileList)}">
@@ -56,12 +74,12 @@
           <input type="file" class="d-none" id="fileInputer" multiple>
         </div>
       </div>
-      <div class="col-5">
+      <div class="col-4">
         <div class="row">
           <div class="col-12 pb-2">
             <div class="row justify-content-between">
               <div class="col-auto">■ 수신자</div>
-              <div class="col-auto"><button type="button" class="btn btn-sm btn-info">추가</button></div>
+              <div class="col-auto"><button type="button" class="btn btn-sm btn-info" id="addReadUserBtn">추가</button></div>
             </div>
           </div>
           <div class="col-1">no</div>

src/main/resources/templates/user/myInfo.html

@@ -129,6 +129,7 @@
       </div>
     </div>
   </div>
+
   <div class="modal fade" id="menuModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="menuModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-xl modal-dialog-scrollable">
       <div class="modal-content">
@@ -141,7 +142,7 @@
           <div class="row">
             <div class="col-12">
               <form method="get" action="#" id="modalSearchForm">
-                <input type="hidden" name="pageIndex" id="pageIndex" value="1">
+                <input type="hidden" name="pageIndex" id="modalPageIndex" value="1">
                 <div class="row justify-content-between pe-3 py-1">
                   <div class="col-auto">
                     <input type="hidden" name="rowCnt" value="10">
@@ -158,6 +159,7 @@
       </div>
     </div>
   </div>
+
   <div class="modal fade" id="questionModal" tabindex="-1" aria-labelledby="questionModalLabel" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">