diff --git a/src/main/java/com/dbnt/faisp/config/ModalController.java b/src/main/java/com/dbnt/faisp/config/ModalController.java index f8568d0c..9e666da3 100644 --- a/src/main/java/com/dbnt/faisp/config/ModalController.java +++ b/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; + } } diff --git a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java index 7d0b6e7b..1939c123 100644 --- a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java +++ b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java @@ -84,6 +84,7 @@ public class SecurityConfig{ "/myInfo/**", "/modal/**", "/publicBoard/**", + "/faRpt/**", "/affairPlan/**", "/affair/**", "/affairResult/**", diff --git a/src/main/java/com/dbnt/faisp/faRpt/FaRptController.java b/src/main/java/com/dbnt/faisp/faRpt/FaRptController.java index 4ca0c3af..c7dda051 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/FaRptController.java +++ b/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 deleteFileSeq){ diff --git a/src/main/java/com/dbnt/faisp/faRpt/model/FaRptBoard.java b/src/main/java/com/dbnt/faisp/faRpt/model/FaRptBoard.java index 192d33da..166c473a 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/model/FaRptBoard.java +++ b/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 diff --git a/src/main/java/com/dbnt/faisp/userInfo/userMgtController.java b/src/main/java/com/dbnt/faisp/userInfo/userMgtController.java index f79a79f6..1b17c4d5 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/userMgtController.java +++ b/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)); diff --git a/src/main/resources/mybatisMapper/menuMgtMapper.xml b/src/main/resources/mybatisMapper/menuMgtMapper.xml index 214e5da5..cc0c6040 100644 --- a/src/main/resources/mybatisMapper/menuMgtMapper.xml +++ b/src/main/resources/mybatisMapper/menuMgtMapper.xml @@ -5,6 +5,15 @@ + + and use_chk = 'T' + + + and (use_chk is null or use_chk = '') + + + and cat1_cd = #{cat1Cd} + and cat1_cd = #{cat1Cd} diff --git a/src/main/resources/static/js/common.js b/src/main/resources/static/js/common.js index b7f890a2..504652c4 100644 --- a/src/main/resources/static/js/common.js +++ b/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(); } }, diff --git a/src/main/resources/static/js/faRpt/faRpt.js b/src/main/resources/static/js/faRpt/faRpt.js index c1f2e3a6..1ed0b408 100644 --- a/src/main/resources/static/js/faRpt/faRpt.js +++ b/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 (){ - $("#faRptDiv").append("") -}) - -$(document).on('click', '#detailFaRptAddBtn', function (){ - const detailFaRptDiv = $("#detailFaRptDiv"); - detailFaRptDiv.append(""); - 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', '#addReadUserBtn', function (){ + searchModalSubmit(1); + $("#userModal").modal('show'); }) $(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; } \ No newline at end of file diff --git a/src/main/resources/templates/adminPage/menuMgt/menuMgt.html b/src/main/resources/templates/adminPage/menuMgt/menuMgt.html index 8487921f..d8246927 100644 --- a/src/main/resources/templates/adminPage/menuMgt/menuMgt.html +++ b/src/main/resources/templates/adminPage/menuMgt/menuMgt.html @@ -25,6 +25,13 @@
+
+ +
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
소속부서계급성명아이디등록일
+ +
+
+
+
+ +
+
+
+
+
+
+
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/faRpt/faRptBoard.html b/src/main/resources/templates/faRpt/faRptBoard.html index 75f01bd5..5b604ae8 100644 --- a/src/main/resources/templates/faRpt/faRptBoard.html +++ b/src/main/resources/templates/faRpt/faRptBoard.html @@ -145,7 +145,7 @@ +
\ No newline at end of file diff --git a/src/main/resources/templates/faRpt/faRptEditModal.html b/src/main/resources/templates/faRpt/faRptEditModal.html index 42de6127..6cb0e918 100644 --- a/src/main/resources/templates/faRpt/faRptEditModal.html +++ b/src/main/resources/templates/faRpt/faRptEditModal.html @@ -15,31 +15,49 @@
-
+
- +
- +
- +
- +
- + +
+ +
+
+
+
- +
- +
+
+ +
+ +
+
- +
@@ -56,12 +74,12 @@
-
+
■ 수신자
-
+
no
diff --git a/src/main/resources/templates/user/myInfo.html b/src/main/resources/templates/user/myInfo.html index 2a431e89..89d0463c 100644 --- a/src/main/resources/templates/user/myInfo.html +++ b/src/main/resources/templates/user/myInfo.html @@ -129,6 +129,7 @@
+