DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no message

master
강석 최 2023-08-18 19:04:19 +09:00
parent 574ab57567
commit 27a3d9fcd9
7 changed files with 71 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java
View File

@ -196,8 +196,7 @@ public class AffairService extends BaseService { // 견문보고
savedRating.setAffairStatus(rating.getHeadApprv());
if(rating.getHeadApprv().equals("DST006")){
AffairBoard affairBoard = affairBoardRepository.findById(savedRating.getAffairKey()).orElse(null);
if(Utils.isEmpty(affairBoard.getDocNo())
&& affairBoard.getWrtOrgan().equals(savedRating.getRatingOrgan())){
if(Utils.isEmpty(affairBoard.getDocNo()) ){/*&& affairBoard.getWrtOrgan().equals(savedRating.getRatingOrgan())*/
affairBoard.setDocNo(makeDocNo(affairBoard.getWrtOrgan(), affairBoard.getReportDt().getYear(), i));
}
i++;
@ -291,8 +290,7 @@ public class AffairService extends BaseService { // 견문보고
rating.setAffairStatus(rating.getHeadApprv());
if(rating.getHeadApprv().equals("DST006")){
AffairBoard affairBoard = affairBoardRepository.findById(rating.getAffairKey()).orElse(null);
if(affairBoard.getDocNo() == null
&& affairBoard.getWrtOrgan().equals(rating.getRatingOrgan())){
if(affairBoard.getDocNo() == null ){/*&& affairBoard.getWrtOrgan().equals(rating.getRatingOrgan())*/
affairBoard.setDocNo(makeDocNo(affairBoard.getWrtOrgan(), affairBoard.getReportDt().getYear(), 0));
}
}

2
src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java
View File

@ -25,7 +25,7 @@ public class PublicBoardController {
@GetMapping("/findPage")
public ModelAndView findPublicBoardPage(@AuthenticationPrincipal UserInfo loginUser, PublicBoard publicBoard){
publicBoard = publicBoardService.selectPublicBoard(publicBoard.getPublicKey());
publicBoard = publicBoardService.selectPublicBoard(publicBoard.getRefDocKey());
ModelAndView mav = new ModelAndView();
switch (publicBoard.getPublicType()){
case "PLB001":

2
src/main/java/com/dbnt/faisp/main/searchEngine/SearchEngineController.java
View File

@ -29,6 +29,8 @@ public class SearchEngineController {
public ModelAndView searchPage(@AuthenticationPrincipal UserInfo loginUser, SearchParams params) {
ModelAndView mav = new ModelAndView("searchEngine/searchPage");
mav.addObject("accessMenuList", menuMgtService.selectAccessMenuList(loginUser.getUserSeq()));
mav.addObject("userOrgan", loginUser.getOgCd());
mav.addObject("userSeq", loginUser.getUserSeq());
mav.addObject("downOrganList", loginUser.getDownOrganCdList());
if(Utils.isEmpty(params.getKeyword())){
mav.setViewName("common/keywordRequest");

2
src/main/resources/mybatisMapper/AffairMapper.xml
View File

@ -153,7 +153,7 @@
select count(*)+1 as cnt
from affair_board a
inner join affair_rating b
on a.affair_key = b.affair_key and a.wrt_organ = b.rating_organ and b.affair_status = 'DST006'
on a.affair_key = b.affair_key and b.affair_status = 'DST006' --and a.wrt_organ = b.rating_organ
where wrt_organ = #{wrtOrgan}
and a.doc_no is not null
and EXTRACT(YEAR FROM report_dt) = #{year}::numeric

14
src/main/resources/static/js/searchEngine/searchPage.js
View File

@ -79,18 +79,14 @@ $(document).on('click', '.boardLink', function (event){
const menuUrlEl = $(this).find(".menuUrl");
if(menuUrlEl.length !== 0){
let menuUrl = menuUrlEl.val()
if(menuUrl === undefined){
location.href = "/publicBoard/findPage?publicKey="+$(this).find(".refDocKey").val()
if(menuUrl.includes("?")){
menuUrl += "&refDocKey="
}else{
if(menuUrl.includes("?")){
menuUrl += "&refDocKey="
}else{
menuUrl += "?refDocKey="
}
location.href = menuUrl+$(this).find(".refDocKey").val()
menuUrl += "?refDocKey="
}
location.href = menuUrl+$(this).find(".refDocKey").val()
}else{
alert("메뉴 접근 권한이 없습니다.")
alert("게시물 접근 권한이 없습니다.")
}
}
})

2
src/main/resources/templates/fragments/header.html
View File

@ -66,7 +66,7 @@
<div id="alarmCntDiv" class="position-absolute text-center rounded-circle bg-danger text-light fs-11" th:text="${alarmListCnt>10?'9+':alarmListCnt}"></div>
<div id="alarmListDiv" class="position-absolute bg-white card d-none">
<div class="card-body">
<table class="table table-sm table-bordered table-hover">
<table class="table table-sm table-bordered table-hover mx-0 my-2">
<thead>
<tr class="table-secondary">
<th>메시지</th>

69
src/main/resources/templates/searchEngine/searchPage.html
View File

@ -153,15 +153,47 @@
<li th:each="board:${boardResult.rowList}">
<dl class="boardLink">
<dt>
<th:block th:if="${board.menu_key eq 0}">
<input type="hidden" class="refDocKey" th:value="${board.main_key}">
<input type="hidden" class="menuUrl" value="/publicBoard/findPage">
</th:block>
<th:block th:each="accessMenu:${accessMenuList}">
<th:block th:if="${board.menu_key eq accessMenu.menuKey and !#strings.isEmpty(accessMenu.accessAuth)}">
<!--메뉴 접근 권한이 있는경우-->
<th:block th:each="code:${session.commonCode.get('OG')}">
<th:block th:if="${#strings.equals(#strings.trim(board.wrt_organ), code.itemValue)}">
<!--관리권한이라면 하위 관서 문서 열람 허용-->
<th:block th:if="${accessMenu.accessAuth eq 'ACC003'}">
<th:block th:if="${#lists.contains(downOrganList, code.itemCd)}">
<input type="hidden" class="refDocKey" th:value="${board.main_key}">
<input type="hidden" class="menuUrl" th:value="${accessMenu.menuUrl}">
</th:block>
</th:block>
<th:block th:if="${accessMenu.accessAuth ne 'ACC003'}">
<!--조회, 작성 권한-->
<th:block th:if="${userSeq eq board.wrt_user_seq}">
<!--본인이 작성한 게시물-->
<input type="hidden" class="refDocKey" th:value="${board.main_key}">
<input type="hidden" class="menuUrl" th:value="${accessMenu.menuUrl}">
</th:block>
<th:block th:if="${userSeq ne board.wrt_user_seq}">
<!--본인이 작성한 게시물이 아니라면 -->
<th:block th:with="readUser=${#strings.listSplit(board.readableuser, ' / ')}">
<th:block th:if="${#lists.contains(readUser, #strings.toString(userSeq))}">
<!--열람 허용된 사용자인지 확인-->
<input type="hidden" class="refDocKey" th:value="${board.main_key}">
<input type="hidden" class="menuUrl" th:value="${accessMenu.menuUrl}">
</th:block>
</th:block>
</th:block>
</th:block>
</th:block>
</th:block>
</th:block>
</th:block>
<th:block th:if="${board.menu_key ne 0}">
[<th:block th:each="menu:${menuList}">
<th:block th:if="${menu.menuKey eq board.menu_key}">
<th:block th:each="accessMenu:${accessMenuList}">
<th:block th:if="${board.menu_key eq accessMenu.menuKey and !#strings.isEmpty(accessMenu.accessAuth)}">
<input type="hidden" class="refDocKey" th:value="${board.main_key}">
<input type="hidden" class="menuUrl" th:value="${menu.menuUrl}">
</th:block>
</th:block>
<th:block th:if="${!#strings.isEmpty(menu.cat3Cd)}">
<th:block th:each="code:${session.commonCode.get('CAT3')}">
<th:block th:if="${menu.cat3Cd eq code.itemCd}" th:text="${code.itemValue}"></th:block>
@ -239,11 +271,19 @@
<ul class="boardList boardFileList">
<li th:each="file:${fileResult.rowList}">
<dl class="boardLink">
<input type="hidden" class="refDocKey" th:value="${file.main_key}">
<th:block th:if="${file.menu_key ne null}">
<th:block th:if="${file.menu_key eq 0}">
<input type="hidden" class="refDocKey" th:value="${file.main_key}">
<input type="hidden" class="menuUrl" value="/publicBoard/findPage">
</th:block>
<!--<th:block th:each="accessMenu:${accessMenuList}">
<th:block th:if="${file.menu_key eq accessMenu.menuKey and !#strings.isEmpty(accessMenu.accessAuth)}">
<input type="hidden" class="refDocKey" th:value="${board.main_key}">
<input type="hidden" class="menuUrl" th:value="${accessMenu.menuUrl}">
</th:block>
</th:block>-->
<th:block th:if="${file.menu_key ne 0}">
<th:block th:each="menu:${menuList}">
<th:block th:if="${menu.menuKey eq file.menu_key}">
<input type="hidden" class="menuUrl" th:value="${menu.menuUrl}">
[<th:block th:if="${!#strings.isEmpty(menu.cat3Cd)}">
<th:block th:each="code:${session.commonCode.get('CAT3')}">
<th:block th:if="${menu.cat3Cd eq code.itemCd}" th:text="${code.itemValue}"></th:block>
@ -264,7 +304,16 @@
</th:block>
<dt>
<a href="#" th:text="${#strings.concat(file.orig_nm, '.', file.file_extn)}"></a>
<a href="#" class="downBtn fileLink" th:data-menukey="${file.menu_key eq null?'0':file.menu_key}" th:data-mainkey="${file.main_key}" th:data-fileseq="${file.file_seq}">내려받기</a>
<th:block th:if="${file.menu_key eq 0}">
<a href="#" class="downBtn fileLink" th:data-menukey="${file.menu_key eq null?'0':file.menu_key}" th:data-mainkey="${file.main_key}" th:data-fileseq="${file.file_seq}">내려받기</a>
</th:block>
<th:block th:if="${file.menu_key ne 0}">
<th:block th:each="accessMenu:${accessMenuList}">
<th:block th:if="${file.menu_key eq accessMenu.menuKey and !#strings.isEmpty(accessMenu.accessAuth)}">
<a href="#" class="downBtn fileLink" th:data-menukey="${file.menu_key}" th:data-mainkey="${file.main_key}" th:data-fileseq="${file.file_seq}">내려받기</a>
</th:block>
</th:block>
</th:block>
</dt>
<dd th:text="${file.file_content}"></dd>
</dl>