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:
KNKIM 2021-11-16 13:56:11 +09:00
commit 0d4ece6dd7
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/nlib/sch/web/NlibSearchController.java
View File

@ -265,6 +265,7 @@ public class NlibSearchController extends NlibCommonController {
String masterId = request.getParameter("masterId"); String masterId = request.getParameter("masterId");
String mbInfoId = getMbInfoId(request); String mbInfoId = getMbInfoId(request);
List<String> mngOrgList = new ArrayList<>(); List<String> mngOrgList = new ArrayList<>();
List<String> keywordList = new ArrayList<>();
//사용자 정보를 가져온다. //사용자 정보를 가져온다.
NlibLoginVO loginVO = getNlibLoginVO(authentication); NlibLoginVO loginVO = getNlibLoginVO(authentication);
@ -275,7 +276,7 @@ public class NlibSearchController extends NlibCommonController {
vo = collectionService.getItemInfo(vo,NlibProperty.getString("thumbnail.image.url.big")); vo = collectionService.getItemInfo(vo,NlibProperty.getString("thumbnail.image.url.big"));
String councilCd = (String)session.getAttribute("councilCd"); String councilCd = (String)session.getAttribute("councilCd");
vo.setMngOrgCd(councilCd); vo.setMngOrgCd(councilCd);
//함께 볼만한 자료 //함께 볼만한 자료
@ -305,6 +306,17 @@ public class NlibSearchController extends NlibCommonController {
String strNewDtFormat = newDtFormat.format(formatDate); String strNewDtFormat = newDtFormat.format(formatDate);
vo.setRtnExpctDd(strNewDtFormat); vo.setRtnExpctDd(strNewDtFormat);
} }
//키워드 편집
if(!(vo == null) && !StringUtil.getString(vo.getKeyword(),"").equals(""))
{
String keyword_arr[] = vo.getKeyword().replace(',',';').split(";");
for(int i = 0; keyword_arr.length > i; i++)
{
keywordList.add(keyword_arr[i]);
}
}
model.addAttribute("keywordList",keywordList);
model.addAttribute("result", vo); model.addAttribute("result", vo);
model.addAttribute("searchVO", searchVO); model.addAttribute("searchVO", searchVO);
model.addAttribute("loginVO", loginVO); model.addAttribute("loginVO", loginVO);

4
src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
View File

@ -235,7 +235,9 @@ function goList(){
</div> </div>
<div class="keyword"> <div class="keyword">
<span class="first">키워드</span> <span class="first">키워드</span>
<span><c:out value="${result.keyword}"/></span> <c:forEach var="keyword" items="${keywordList }">
<span><c:out value="${keyword}"/></span>
</c:forEach>
</div> </div>
</div> </div>
</div> </div>

6
src/main/webapp/js/search/reference.js
View File

@ -168,8 +168,8 @@ function reference_filterDel(){
}else if($(this).attr('id').indexOf('j_cate_theme')>= 0 ){ }else if($(this).attr('id').indexOf('j_cate_theme')>= 0 ){
filter_mylist_clk = 'category_'+ s_cate_id +','; filter_mylist_clk = 'category_'+ s_cate_id +',';
}else if($(this).attr('name').indexOf('first_agency_del')>= 0 ){ }else if($(this).attr('name').indexOf('first_agency_del')>= 0 ){
filter_mylist_clk = 'agency_'+ $(this).val() +','; filter_mylist_clk = 'agency_'+ s_cate_id +',';
filter_agency_clk = $(this).val() +','; filter_agency_clk = s_cate_id +',';
} }
filter_agency = filter_agency.replace(filter_agency_clk,''); filter_agency = filter_agency.replace(filter_agency_clk,'');
filter_mylist = filter_mylist.replace(filter_mylist_clk,''); filter_mylist = filter_mylist.replace(filter_mylist_clk,'');
@ -309,7 +309,7 @@ function fnLabel_reference(){
$("#reference_fillter_append").append("<li>생산년도 &#62; " + $("#creatYyyyStart").val() + "~" + $("#creatYyyyEnd").val() +"<button type=\"button\" class=\"btn-del-filter\" id=\""+second_cate_id+"\">삭제</button></li>").text(); $("#reference_fillter_append").append("<li>생산년도 &#62; " + $("#creatYyyyStart").val() + "~" + $("#creatYyyyEnd").val() +"<button type=\"button\" class=\"btn-del-filter\" id=\""+second_cate_id+"\">삭제</button></li>").text();
}else if(mylist_arr[j].indexOf("agency") >= 0){ }else if(mylist_arr[j].indexOf("agency") >= 0){
var second_cate_nm = mylist_arr[j].substring(mylist_arr[j].indexOf("_")+1); var second_cate_nm = mylist_arr[j].substring(mylist_arr[j].indexOf("_")+1);
$("#reference_fillter_append").append("<li>생산기관 &#62; "+ second_cate_nm + "<button type=\"button\" class=\"btn-del-filter\" id=\"\" name=\"first_agency_del\" >삭제</button></li>").text(); $("#reference_fillter_append").append("<li>생산기관 &#62; "+ second_cate_nm + "<button type=\"button\" class=\"btn-del-filter\" id=\"" + second_cate_nm + "\" name=\"first_agency_del\" >삭제</button></li>").text();
}else if(mylist_arr[j].indexOf("search_query") >= 0){ }else if(mylist_arr[j].indexOf("search_query") >= 0){
$("#reference_fillter_append").append("<li>검색어 &#62; "+ $("#realQuery").val() + "<button type=\"button\" class=\"btn-del-filter detailFilter\" id=\"\" name=\"search_query\">삭제</button></li>").text(); $("#reference_fillter_append").append("<li>검색어 &#62; "+ $("#realQuery").val() + "<button type=\"button\" class=\"btn-del-filter detailFilter\" id=\"\" name=\"search_query\">삭제</button></li>").text();
}else if(mylist_arr[j].indexOf("search_bookIndex") >= 0){ }else if(mylist_arr[j].indexOf("search_bookIndex") >= 0){