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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
JSYOO 2021-11-22 10:56:11 +09:00
commit d0f2bf7b80
11 changed files with 25 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/nlib/col/web/CartController.java
View File

@ -90,7 +90,7 @@ public class CartController extends NlibCommonController
list = cartService.listCartItemsFromCookie(request, response, cartTypeCd);
// 카트 목록 자료에 대한 상세자료 설정
collectionService.setDetailInfoForList(list, null, NlibProperty.getString("thumbnail.image.url.small"));
collectionService.setDetailInfoForList(list, null);
// 문화원별 정렬 처리
list = sortCollectionListByMngOrgCd(list);
@ -103,7 +103,7 @@ public class CartController extends NlibCommonController
list = cartService.listCartItems(mbInfoId, cartTypeCd);
// 카트 목록 자료에 대한 상세자료 설정
collectionService.setDetailInfoForList(list, getMbInfoId(request), NlibProperty.getString("thumbnail.image.url.small"));
collectionService.setDetailInfoForList(list, getMbInfoId(request));
// 카트 건수
cartTypeCd1Cnt = cartService.countCartItems(mbInfoId, "1");

6
src/main/java/nlib/user/web/UserInfoController.java
View File

@ -352,7 +352,7 @@ public class UserInfoController extends NlibCommonController {
List<CollectionVO> interestList = interestService.listInterests(searchCollectionVO);
int interestTotalCount = interestService.countListInterests(searchCollectionVO);
interestList = collectionService.setDetailInfoForList(interestList, searchCollectionVO.getMbInfoId(), NlibProperty.getString("thumbnail.image.url.small"));
interestList = collectionService.setDetailInfoForList(interestList, searchCollectionVO.getMbInfoId());
model.addAttribute("interestList", interestList);
model.addAttribute("interestTotalCount", interestTotalCount);
@ -361,14 +361,14 @@ public class UserInfoController extends NlibCommonController {
// 조회
// 대출상태구분코드("": 전체, A:신청, B:대출준비완료, C:취소, W:대출중, R0:정상반납, R1:연체반납, P:연체)
DataApiResVO resRentVO = rentService.listRentItems(searchCollectionVO);
List<CollectionVO> rentList = collectionService.setDetailInfoForHashList(resRentVO.getRecordList(), searchCollectionVO.getMbInfoId(), NlibProperty.getString("thumbnail.image.url.small"));
List<CollectionVO> rentList = collectionService.setDetailInfoForHashList(resRentVO.getRecordList(), searchCollectionVO.getMbInfoId());
model.addAttribute("rentList", rentList);
model.addAttribute("rentTotalCount", resRentVO.getRecordTotCount());
// 방문열람내역 (최근 5개)
searchCollectionVO.setReqStatusDivCd(null);
DataApiResVO resReadVO = readService.listReadItems(searchCollectionVO);
List<CollectionVO> readList = collectionService.setDetailInfoForHashList(resReadVO.getRecordList(), searchCollectionVO.getMbInfoId(), NlibProperty.getString("thumbnail.image.url.small"));
List<CollectionVO> readList = collectionService.setDetailInfoForHashList(resReadVO.getRecordList(), searchCollectionVO.getMbInfoId());
model.addAttribute("readList", readList);
model.addAttribute("readTotalCount", resReadVO.getRecordTotCount());

4
src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml
View File

@ -18,7 +18,7 @@
</if>
<if test='searchType != null and searchType.equals("C")'>
<if test="searchKeyword != null and !searchKeyword.equals('')">
AND IFNULL(S.CONTENT,'') LIKE CONCAT('%', #{escapeSearchKeyword}, '%')
AND IFNULL(CONVERT(S.CONTENT_LBL USING UTF8),'') LIKE CONCAT('%', #{escapeSearchKeyword}, '%')
</if>
</if>
AND IFNULL(S.DELETE_YN, 'N') = 'N'
@ -71,7 +71,7 @@
, A.MNG_ORG_CD
, B.DEPT_NM AS MNG_ORG_NM
, A.TITLE
, A.CONTENT
, CONVERT(A.CONTENT_LBL USING UTF8) AS CONTENT
, IF(IFNULL(A.NOTI_YN, 'N') = '', 'N', A.NOTI_YN) AS NOTI_YN
, A.OPEN_YN
, A.POST_START_DATE

6
src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml
View File

@ -19,7 +19,7 @@
</if>
<if test='searchType != null and searchType.equals("C")'>
<if test="searchKeyword != null and !searchKeyword.equals('')">
AND CONCAT(IFNULL(S.CONTENT,''), IFNULL(S.ANSWER,'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%')
AND CONCAT(IFNULL(CONVERT(S.CONTENT_LBL USING UTF8),''), IFNULL(CONVERT(S.ANSWER_LBL USING UTF8),'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%')
</if>
</if>
<if test='searchQuestionType != null and !searchQuestionType.equals("")'>
@ -80,9 +80,9 @@
, A.QUESTION_TYPE
, D.S_CODE_NM AS QUESTION_TYPE_NAME
, A.TITLE
, A.CONTENT
, CONVERT(A.CONTENT_LBL USING UTF8) AS CONTENT
, IFNULL(A.ANSWER_YN, 'N') AS ANSWER_YN
, A.ANSWER
, CONVERT(A.ANSWER_LBL USING UTF8) AS ANSWER
, IFNULL(A.USE_YN, 'Y') AS USE_YN
, A.VIEW_CNT
, A.BD_ATTACH_FILE_ID

12
src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml
View File

@ -18,7 +18,7 @@
</if>
<if test='searchType != null and searchType.equals("C")'>
<if test="searchKeyword != null and !searchKeyword.equals('')">
AND CONCAT(IFNULL(S.CONTENT,''), IFNULL(S.ANSWER,'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%')
AND CONCAT(IFNULL(CONVERT(S.CONTENT_LBL USING UTF8),''), IFNULL(CONVERT(S.ANSWER_LBL USING UTF8),'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%')
</if>
</if>
<if test='searchMbInfoId != null and !searchMbInfoId.equals("")'>
@ -86,10 +86,10 @@
, B.DEPT_NM AS MNG_ORG_NM
, A.QUESTION_TYPE
, A.TITLE
, A.CONTENT
, CONVERT(A.CONTENT_LBL USING UTF8) AS CONTENT
, IFNULL(A.ANSWER_YN, 'N') AS ANSWER_YN
, IFNULL(A.EMAIL_RECV_YN, 'N') AS EMAIL_RECV_YN
, A.ANSWER
, CONVERT(A.ANSWER_LBL USING UTF8) AS ANSWER
, IFNULL(A.USE_YN, 'Y') AS USE_YN
, IFNULL(A.SECRET_YN, 'N') AS SECRET_YN
, A.VIEW_CNT
@ -138,9 +138,9 @@
, BD_TYPE
, QUESTION_TYPE
, TITLE
, CONTENT
, CONTENT_LBL
, ANSWER_YN
, ANSWER
, ANSWER_LBL
, EMAIL_RECV_YN
, SECRET_YN
, USE_YN
@ -174,7 +174,7 @@
/* QNA : updateArticle : 삭제되지 않은 건 중 답변이 아직 없는 건에 한하여 수정 가능 */
UPDATE BD_NLIB_QNA
SET TITLE = #{title}
, CONTENT = #{content}
, CONTENT_LBL = #{content}
, EMAIL_RECV_YN = #{emailRecvYn}
, SECRET_YN = #{secretYn}
, BD_ATTACH_FILE_ID = #{bdAttachFileId}

46
src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml
View File

@ -86,21 +86,6 @@
AND IFNULL(M2.PE_STATUS, '') = '' /* 보존상태 */
ORDER BY M2.MOD_DD DESC, M2.REG_DD DESC
LIMIT 10 )
UNION
(/* DDDDDDDDDDDDDDDDDDDDDDDDDDDD 테스트 확인용 */
SELECT
2 AS RNK
, M2.MASTER_ID
, M2.TITLE
, M2.TYPE_DIV_CD
, TDC.S_CODE_NM AS TYPE_DIV_NM
, M2.RPRS_THUMB_URL
, M2.REG_DD
, M2.MOD_DD
FROM RG_MASTER M2
JOIN SM_CODE_S TDC ON M2.TYPE_DIV_CD = TDC.S_CODE_ID AND TDC.L_CODE_ID = 'MASTER_TYPE_DIV_CD'
ORDER BY M2.MOD_DD DESC, M2.REG_DD DESC
LIMIT 2 )
) T
ORDER BY RNK, T.MOD_DD DESC, T.REG_DD DESC
LIMIT 10
@ -156,7 +141,7 @@
<!-- 온라인자료관 -->
<select id="listOnline" parameterType="String" resultType="CollectionVO">
<![CDATA[
(SELECT
SELECT
M.MASTER_ID
, M.TITLE
, M.TYPE_DIV_CD
@ -188,34 +173,7 @@
AND IFNULL(M.M_INTERFACE_ID, '') != '' /* IF존재하는 건 */
AND IFNULL(M.RPRS_THUMB_URL, '') != '' /* 썸네일 존재하는 자료에 한정 : 2021.11.15 엑티버 김혜준대리 내부근무 과장님통해 요청 */
ORDER BY M.MOD_DD DESC, M.REG_DD DESC
LIMIT 10)
UNION
(/* DDDDDDDDDDDDDDDDDDDDDDDDDDDD 테스트 확인용 */
SELECT
M.MASTER_ID
, M.TITLE
, M.TYPE_DIV_CD
, C1.S_CODE_NM AS TYPE_DIV_NM
, M.DTLS_TYPE_DIV_CD
, C2.S_CODE_NM DTLS_TYPE_DIV_NM
, M.SUBJECT_CODE
, ( SELECT CLSF_NM
FROM CT_CLSF
WHERE CLSF_ID = (
SELECT UP_CLSF_ID FROM CT_CLSF
WHERE CLSF_ID = CAST(M.SUBJECT_CODE AS CHAR(35)) )
AND UP_CLSF_ID = '2') AS SUBJECT_NM_UP
, (SELECT CLSF_NM FROM CT_CLSF WHERE CLSF_ID = CAST(M.SUBJECT_CODE AS CHAR(35))) AS SUBJECT_NM
, M.MOD_DD
, M.ORG_NM
, M.CREAT_YYYY
, M.RPRS_THUMB_URL
, IFNULL(M.M_INTERFACE_ID, '') AS INTERFACE_ID
FROM RG_MASTER M
LEFT OUTER JOIN SM_CODE_S C1 ON M.TYPE_DIV_CD = C1.S_CODE_ID AND C1.L_CODE_ID = 'MASTER_TYPE_DIV_CD'
LEFT OUTER JOIN SM_CODE_S C2 ON M.DTLS_TYPE_DIV_CD = C2.S_CODE_ID AND C2.L_CODE_ID = 'DTLS_TYPE_DIV_CD'
ORDER BY M.MOD_DD DESC, M.REG_DD DESC
LIMIT 3)
LIMIT 10
]]>
</select>

1
src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml
View File

@ -10,7 +10,6 @@
, MNG_ORG_CD
, TITLE
, CONTENT
, BD_ATTACH_FILE_ATTACH_FILE_ID
FROM BD_NLIB_CONTENT_PAGE A
WHERE A.CONTENT_TYPE = #{contentType}
AND A.MNG_ORG_CD = #{mngOrgCd}

7
src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp
View File

@ -303,7 +303,6 @@ $(document).ready(function() {
<div class="img">${cart.interestYn }
<a href="javascript:void(0)"><img src="${cart.rprsThumbUrlWithDefaultSmall }" alt="썸네일" width="60" height="91" title="상세보기" onclick="gfn_getDetail('${cart.masterId }')"></a>
<sec:authorize access="isAuthenticated()">
<c:if test='${cart.MUseYn == "Y"}'>
<span id="favorites_${cart.masterId }" class="favorites" onclick="fn_changeInterestBtn('${cart.masterId }', 'off')" title="관심자료에서 삭제합니다.">
<img src="/images/icon/icon-cart-Favorites-on.png" class="off" alt="즐겨찾기 아이콘">
@ -319,15 +318,15 @@ $(document).ready(function() {
</sec:authorize>
</div>
<div class="type">
<c:if test="${cart.openDivCd != '3' }">
<c:if test="${cart.ableOnline}">
<span class="online">온라인열람</span>
</c:if>
<c:if test="${cart.operOutRangeCd == '01' }">
<c:if test="${cart.ableRent}">
<span class="loan">대출</span>
</c:if>
<c:if test="${cart.operReadRangeCd != '03' }">
<c:if test="${cart.ableRead}">
<span class="visit">방문열람</span>
</c:if>

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

@ -139,7 +139,7 @@ function fn_listCartItems() {
</c:if>
<c:if test='${fromCart != "Y" }'>
history.back();
location.href = "/";
</c:if>
}

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

@ -128,7 +128,7 @@ function fn_listCartItems() {
</c:if>
<c:if test='${fromCart != "Y" }'>
history.back();
location.href = "/";
</c:if>
}
@ -258,7 +258,7 @@ $(document).ready(function() {
</c:if>
</div>
<div class="type">
<c:if test="${rent.openDivCd != '3' }">
<c:if test="${rent.ableOnline }">
<span class="online">온라인열람</span>
</c:if>