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

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

강석 최 2022-09-27 18:24:29 +09:00
parent 4b65f8d699 78bc358c87
commit def5ba68a4
14 changed files with 65 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,6 @@ public class PublicBoardController {
publicBoard.setDownOrganCdList(loginUser.getDownOrganCdList());
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
}
publicBoard.setUpOrganCdList(loginUser.getUpOrganCdList());
mav.addObject("qnaList", publicBoardService.selectContentList(publicBoard));
publicBoard.setContentCnt(publicBoardService.selectContentListCnt(publicBoard));
publicBoard.setPaginationInfo();

1
src/main/java/com/dbnt/faisp/publicBoard/mapper/PublicBoardMapper.java
View File

@ -8,6 +8,7 @@ import java.util.List;
@Mapper
public interface PublicBoardMapper {
List<PublicBoard> selectContentList(PublicBoard publicBoard);
List<PublicBoard> selectContentListWhere(PublicBoard publicBoard);
Integer selectContentListCnt(PublicBoard publicBoard);
}

4
src/main/java/com/dbnt/faisp/translator/TranslatorController.java
View File

@ -74,6 +74,8 @@ public class TranslatorController {
ModelAndView mav = new ModelAndView("translator/translatorEditModal");
//메뉴권한 확인
String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/translator/info").get(0).getAccessAuth();
mav.addObject("wrtId", translatorSevice.selectTrFristId(translator.getTranslatorKey()));
mav.addObject("userId", loginUser.getUserId());
mav.addObject("trInfo", translatorSevice.selectTranslatorView(translator));
mav.addObject("accessAuth", accessAuth);
return mav;
@ -109,6 +111,8 @@ public class TranslatorController {
mav.addObject("policeCrr", translatorSevice.selectMaritimePoliceCareer(translatorCrr));
mav.addObject("anotherCrr", translatorSevice.selectAnotherOrganizationCareer(translatorCrr));
mav.addObject("trKey", translatorCrr.getTranslatorKey());
mav.addObject("wrtId", translatorSevice.selectTrFristId(translatorCrr.getTranslatorKey()));
mav.addObject("userId", loginUser.getUserId());
mav.addObject("accessAuth", accessAuth);
return mav;
}

3
src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java
View File

@ -2,7 +2,6 @@ package com.dbnt.faisp.translator.mapper;
import com.dbnt.faisp.translator.model.Translator;
import com.dbnt.faisp.translator.model.TranslatorCrr;
import com.dbnt.faisp.userInfo.model.UserInfo;
import com.dbnt.faisp.util.ParamMap;
import org.apache.ibatis.annotations.Mapper;
@ -28,4 +27,6 @@ public interface TranslatorMapper {
List<ParamMap> selectTranslatorListEx(Translator translator);
String selectTrFristId(int translatorKey);
}

4
src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java
View File

@ -140,4 +140,8 @@ public class TranslatorService {
return translatorMapper.selectTranslatorListEx(translator);
}
public String selectTrFristId(int translatorKey) {
return translatorMapper.selectTrFristId(translatorKey);
}
}

5
src/main/resources/mybatisMapper/PublicBoardMapper.xml
View File

@ -9,12 +9,16 @@
<if test='publicType != null and publicType != ""'>
and a.public_type = #{publicType}
</if>
<if test="title != null and title != ''">
AND a.title LIKE CONCAT('%', #{title}, '%')
</if>
<if test='startDate != null and startDate != ""'>
and a.wrt_dt >= #{startDate}::date
</if>
<if test='endDate != null and endDate != ""'>
and a.wrt_dt &lt;= #{endDate}::date+1
</if>
<if test="downOrganCdList != null or upOrganCdList != null">
and a.public_key in (
<if test="downOrganCdList != null">
select public_key from public_board where wrt_organ in
@ -32,6 +36,7 @@
</foreach>
</if>
)
</if>
</where>
</sql>
<select id="selectContentList" resultType="PublicBoard" parameterType="PublicBoard">

8
src/main/resources/mybatisMapper/TranslatorMapper.xml
View File

@ -313,4 +313,12 @@
order by translator_key desc
</select>
<select id="selectTrFristId" resultType="String" parameterType="int">
select wrt_nm
from translator_info
where translator_key = #{translatorKey}
order by version_no asc
limit 1
</select>
</mapper>

7
src/main/resources/static/js/publicBoard/notice.js
View File

@ -1,5 +1,12 @@
let files = [];
$(function(){
$("#dateSelectorDiv").datepicker({
format: "yyyy-mm-dd",
language: "ko"
});
})
$(document).on('click', '#addNoticeBtn', function (){
getEditModal(null, "PLB001")
})

7
src/main/resources/static/js/publicBoard/publicBoard.js
View File

@ -35,6 +35,13 @@ $(document).on('click', '#commentSaveBtn', function (){
}
})
$(function(){
$("#dateSelectorDiv").datepicker({
format: "yyyy-mm-dd",
language: "ko"
});
})
$(document).on('click', '.childCommentBtn', function (){
const childCommentDiv = $(this).parents(".commentRow").find(".childCommentDiv")
childCommentDiv.show();

2
src/main/resources/templates/publicBoard/notice/noticePage.html
View File

@ -15,7 +15,7 @@
<div class="row mx-0">
<div class="col-12 card text-center">
<div class="card-body">
<form method="get" th:action="@{/affairPlan/monthPlanPage}">
<form method="get" th:action="@{/publicBoard/noticePage}">
<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">

5
src/main/resources/templates/publicBoard/qna/qnaPage.html
View File

@ -6,6 +6,7 @@
<th:block layout:fragment="script">
<script type="text/javascript" th:src="@{/js/publicBoard/publicBoard.js}"></script>
<script type="text/javascript" th:src="@{/js/publicBoard/qna.js}"></script>
<script type="text/javascript" th:src="@{/js/common.js}"></script>
</th:block>
<div layout:fragment="content">
<main class="pt-3">
@ -15,7 +16,7 @@
<div class="row mx-0">
<div class="col-12 card text-center">
<div class="card-body">
<form method="get" th:action="@{/affairPlan/monthPlanPage}">
<form method="get" th:action="@{/publicBoard/qnaPage}">
<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">
@ -116,7 +117,7 @@
</nav>
</div>
<div class="col-auto">
<input type="button" class="btn btn-success" value="등록" id="addQnaBtn" sec:authorize="hasRole('ROLE_SUB_ADMIN')">
<input type="button" class="btn btn-success" value="등록" id="addQnaBtn">
</div>
</div>
</div>

8
src/main/resources/templates/translator/translator.html
View File

@ -133,12 +133,8 @@
<td th:text="${trInfo.trEdu}"></td>
<td th:text="${trInfo.trCft}"></td>
<td th:text="${trInfo.trVisa}"></td>
<th:block th:if="${trInfo.dmlYn == 'O'}">
<td>●</td>
</th:block>
<th:block th:if="${trInfo.dmlYn == 'X'}">
<td></td>
</th:block>
<td th:if="${trInfo.dmlYn == 'O'}">●</td>
<td th:unless="${trInfo.dmlYn == 'O'}"></td>
<td th:text="${trInfo.aptDt}"></td>
<td th:text="${trInfo.trPhone}"></td>
</tr>

6
src/main/resources/templates/translator/translatorCareerModal.html
View File

@ -29,7 +29,7 @@
<td th:text="${crrInfo.tcDt}">ㅇ</td>
<td th:text="${crrInfo.contents}"></td>
<td th:text="${crrInfo.remark}"></td>
<td><button type="button" class="btn btn-danger m-0" id="deleteCareerBtn" th:onclick="|javascript:deleteCareerBtn('${crrInfo.careerSeq}','${crrInfo.translatorKey}')|" th:unless="${accessAuth eq 'ACC001'}">삭제</button></td>
<td><button type="button" class="btn btn-danger m-0" id="deleteCareerBtn" th:onclick="|javascript:deleteCareerBtn('${crrInfo.careerSeq}','${crrInfo.translatorKey}')|" th:if="${accessAuth eq 'ACC003'} or ${wrtId eq userId}">삭제</button></td>
</tr>
</tbody>
</table>
@ -52,7 +52,7 @@
<td th:text="${crrInfo.tcDt}"></td>
<td th:text="${crrInfo.contents}"></td>
<td th:text="${crrInfo.remark}"></td>
<td><button type="button" class="btn btn-danger m-0" id="deleteCareerBtn" th:onclick="|javascript:deleteCareerBtn('${crrInfo.careerSeq}','${crrInfo.translatorKey}')|" th:unless="${accessAuth eq 'ACC001'}">삭제</button></td>
<td><button type="button" class="btn btn-danger m-0" id="deleteCareerBtn" th:onclick="|javascript:deleteCareerBtn('${crrInfo.careerSeq}','${crrInfo.translatorKey}')|" th:if="${accessAuth eq 'ACC003'} or ${wrtId eq userId}">삭제</button></td>
</tr>
</tbody>
</table>
@ -61,7 +61,7 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" id="crrInsertBtn" th:unless="${accessAuth eq 'ACC001'}">이력등록</button>
<button type="button" class="btn btn-primary" id="crrInsertBtn" th:if="${accessAuth eq 'ACC003'} or ${wrtId eq userId}">이력등록</button>
</div>
</div>
</div>

2
src/main/resources/templates/translator/translatorEditModal.html
View File

@ -113,7 +113,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" id="trDeleteBtn" th:unless="${accessAuth eq 'ACC001'}">해임</button>
<button type="button" class="btn btn-primary" id="updateBtn" th:unless="${accessAuth eq 'ACC001'}">수정</button>
<button type="button" class="btn btn-primary" id="updateBtn" th:if="${accessAuth eq 'ACC003'} or ${wrtId eq userId}">수정</button>
</div>
</form>
</div>