somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib

Browse Source
This commit is contained in:
JSYOO 2021-12-01 17:19:19 +09:00
commit 03fbacd9e6
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/nlib/col/service/impl/ReadServiceImpl.java
View File

@ -190,8 +190,8 @@ public class ReadServiceImpl implements ReadService {
public DataApiResVO listReadItems(CollectionVO searchVO) {
if(searchVO == null || StringUtil.isEmpty(searchVO.getMbInfoId())) {
log.error("listRentItems > 대출 목록 조회 요청 정보가 없습니다.");
return new DataApiResVO("F", "대출 목록 조회 요청 정보가 없습니다.");
log.error("listRentItems > 열람 목록 조회 요청 정보가 없습니다.");
return new DataApiResVO("F", "열람 목록 조회 요청 정보가 없습니다.");
}
// API 호출

1
src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
View File

@ -369,7 +369,6 @@ function fn_listPops(typeDivCd) {
<div class="box"><p>${fn:substring(itemQna.regDd,8,10) }</p><p> ${fn:substring(itemQna.regDd,2,4) }.${fn:substring(itemQna.regDd,5,7) }</p></div>
<div class="text">
<p>${itemQna.title}
<c:if test='${itemQna.attachYn == "Y"}'><img src="/images/icon/icon-file.png" class="file" alt="파일 아이콘"></c:if>
<c:if test='${itemQna.secretYn == "Y"}'><img src="/images/icon/icon-password.png" class="pw" alt="잠금 아이콘"></c:if>
</p>
</div>

2
src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp
View File

@ -45,7 +45,7 @@
}
$("#mngOrgCd").on("change", function(e) {
fn_searchArticle($("#pageSize").val(), 1);
fn_searchArticle(1);
});
<sec:authorize access="isAuthenticated()">

2
src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp
View File

@ -221,7 +221,7 @@ $(document).ready(function() {
</div>
<div class="t-state"><p>${rent.useStatusNm }</p></div>
<div class="t-date">${rent.rtnExpctDd }</div>
<div class="t-reser poss">${rent.rsrvDivNm }
<div class="t-reser poss">${rent.rsrvDivNm } <br>
<c:if test='${not empty rent.rsrvDd }'>
(${rent.rsrvDd })
</c:if>

4
src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp
View File

@ -49,7 +49,7 @@
}
$("#mngOrgCd").on("change", function(e) {
fn_searchArticle($("#pageSize").val(), 1);
fn_searchArticle(1);
});
<sec:authorize access="isAuthenticated()">
@ -261,7 +261,7 @@ function fn_search(bookLtRvStatusCd) {
<div class="n-reservation">신청/예약일</div>
<div class="n-expiry">신청/예약 만료일</div>
<div class="n-return">반납예정일</div>
<div class="n-use">이용</div>
<div class="n-use">대출상태</div>
</div>
<div class="no-result" style="display:none;">
<span>자료가 없습니다.</span>

5
src/main/webapp/js/nlib.js
View File

@ -370,9 +370,10 @@ function gfn_makePaging(fnName,pageIndex, totRecordCount, startPage, endPage, la
}
function gfn_formatDateStr(yyyymmdd, defVal) {
if(gfn_isEmpty(yyyymmdd)) return defVal;
if(yyyymmdd.length == 8) {
return yyyymmdd.substr(0, 4) + "-" + yyyymmdd.substr(4,2) + "-" + yyyymmdd.substr(6);
if(yyyymmdd.length >= 8) {
return yyyymmdd.substr(0, 4) + "-" + yyyymmdd.substr(4,2) + "-" + yyyymmdd.substr(6, 2);
} else if(yyyymmdd.length == 6) {
return yyyymmdd.substr(0, 4) + "-" + yyyymmdd.substr(4,2);
} else if(yyyymmdd.length == 4) {