tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'JIWOO'

Browse Source
This commit is contained in:
JIWOO 2024-11-14 12:27:40 +09:00
commit 662fbadfae
6 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/kcc/web/MainController.java
View File

@ -1462,6 +1462,12 @@ public class MainController {
) {
menuUrl = "/web/user/mediation/case/01/154/mediationApp.do";
}
/*자주하는 질문 > (기타)절차종결 관련 질문*/
else if(
menuUrl.contains("/web/user/bbs/case/3/300/")
) {
menuUrl = "/web/user/bbs/case/3/300/bbsDataList.do";
}
// 상세화면 URL로 메뉴화면 매핑이 안되어, 문자열 치환으로 매핑...

8
src/main/java/seed/common/web/InnorixFileController.java
View File

@ -52,16 +52,20 @@ public class InnorixFileController {
String fileFuncType = (String)paramMap.get("fileFuncType");
String rootPath = null;
String directory = null;
if(fileFuncType.equals("trublchargermng")){
rootPath = globalRootPath;
SeedUtils.setSeedMkDirs(rootPath + "/"+siteIdx+"/upload/uploadFiles/"+fileFuncType);
directory = rootPath + "/"+siteIdx+"/upload/uploadFiles/"+"/"+fileFuncType+"/";
}else{
rootPath = globalRealPath;
SeedUtils.setSeedMkDirs(rootPath + "/"+siteIdx+"/"+ fileFuncType);
directory = rootPath + "/"+siteIdx+"/"+fileFuncType+"/";
}
SeedUtils.setSeedMkDirs(rootPath + "/"+siteIdx+"/"+ fileFuncType);
modelAndView.setViewName("jsonView");
modelAndView.addObject("directory", rootPath + "/"+siteIdx+"/"+fileFuncType+"/");
modelAndView.addObject("directory", directory);
modelAndView.addObject("result", "success");
}catch(Exception e) {
modelAndView.addObject("result", "fail");

1
src/main/java/seed/user/bbs/web/WebUserBbsController.java
View File

@ -914,6 +914,7 @@ public class WebUserBbsController {
map.put("tBbsDataDB", tBbsDataDB);
map.put("toDate", sdf.format(new Date()));
map.put("bbsSetIdx", bbsSetIdx);
map.put("page", paging.getPage());
map.put("pagec", paging.getPagec());

8
src/main/resources/egovframework/egovProps/globals_local.properties
View File

@ -202,7 +202,9 @@ http.url=
#\ud574\ub2f9 \uc0ac\uc774\ud2b8 URL
root.url=http://localhost
#\ud574\ub2f9 \uc11c\ubc84 SEED\uc11c\ubc84 \uacbd\ub85c
root.path=D:/project/git/case_seed/WebContent/WEB-INF/views/site
#root.path=D:/project/git/case_seed/WebContent/WEB-INF/views/site
#\ud14c\uc2a4\ud2b8\uc6a9
root.path=/usr/local/homepage/WEB-INF/views/site
#\ud574\ub2f9 \uc0ac\uc774\ud2b8 URL path
root.contextpath=
@ -210,7 +212,9 @@ root.contextpath=
file.temp.path=D:/project/git/case_seed/WebContent/WEB-INF/views/site/case/upload/tempFiles
#file.temp.path=C:/Project_Files/case_seed-v3.0/WebContent/WEB-INF/views/site/case/upload/tempFiles
#\ucca8\ubd80\ud30c\uc77c \uc5c5\ub85c\ub4dc\ud3f4\ub354
file.real.path=D:/project/git/case_seed/WebContent/WEB-INF/views/site/case/upload/uploadFiles
#file.real.path=D:/project/git/case_seed/WebContent/WEB-INF/views/site/case/upload/uploadFiles
#\ud14c\uc2a4\ud2b8\uc6a9
file.real.path=/usr/local/homepage/WEB-INF/views/site/case/upload/uploadFiles
#file.real.path=C:/Project_Files/case_seed-v3.0/WebContent/WEB-INF/views/site/case/upload/uploadFiles
#NICE

4
src/main/webapp/WEB-INF/jsp/web/user/bbs/bbs/bbsDataList.jsp
View File

@ -350,8 +350,8 @@
<option value="0800000000" <c:if test="${bbsDataCategory == '0800000000'}">selected="selected"</c:if>>기타</option>
</select>
<select name="search_type" id="" title="검색조건 선택" class="select">
<option value="search_type01">제목</option>
<select name="column" id="column" title="검색조건 선택" class="select">
<option value="bbsDataTitle">제목</option>
</select>
<input type="text" class="input_text" title="검색어 입력" name="search" id="search" value="<c:out escapeXml='true' value='${search}' />">

20
src/main/webapp/WEB-INF/jsp/web/user/bbs/bbs/faqDetail.jsp
View File

@ -8,7 +8,7 @@
<script type="text/javascript">
function moveFunc(type){
if(type == "list"){
$("#moveFrm").attr("action", "/web/user/bbs/case/${setIdx}/${siteMenuIdx}/bbsDataList.do");
$("#moveFrm").attr("action", "/web/user/bbs/case/${bbsSetIdx}/${siteMenuIdx}/bbsDataList.do");
$("#moveFrm").submit();
}
}
@ -21,7 +21,9 @@
<li><i class="icon home"></i></li>
<li>분쟁조정 안내</li>
<li>자주하는 질문</li>
<li>조정신청 관련 질문</li>
<c:if test="${bbsSetIdx eq 3}">
<li>(기타)절차종결 관련 질문</li>
</c:if>
</ul>
<!-- //page_location -->
@ -30,14 +32,16 @@
<input type="hidden" name="searchTilte" value="${param.searchTilte }">
<input type="hidden" name="page" id="page" value="${param.page }">
<h3 class="sub_con_tit">조정신청 관련 질문</h3>
<p class="sub_con_sub_tit">조정신청 관련 질문에 대한 궁금증을 풀어드립니다.</p>
<c:if test="${siteMenuIdx eq 300}">
<h3 class="sub_con_tit">(기타)절차종결 관련 질문</h3>
<p class="sub_con_sub_tit">절차종결 관련 질문에 대한 궁금증을 풀어드립니다.</p>
</c:if>
<div class="list_view">
<div class="list_view_wrap">
<h4 class="list_view_tit">
<c:out value="${bbsView.FAQ_SUBJ }"></c:out>
<c:out value="${tBbsDataDB.bbsDataTitle }"></c:out>
</h4>
<ul class="view_info">
<!--
@ -55,16 +59,16 @@
<li>
<p class="view_info_tit">· 작성일 : </p>
<i class="icon td_calendar"></i>
<c:out value="${bbsView.REG_DATE }"></c:out>
<c:out value="${tBbsDataDB.bbsDataRegDate}"></c:out>
</li>
<li>
<p class="view_info_tit">· 조회수 : </p>
<i class="icon td_view"></i>
<c:out value="${bbsView.VIEW_CNT }"></c:out>
<c:out value="${tBbsDataDB.bbsDataHit }"></c:out>
</li>
</ul>
<div class="view_content">
<c:out escapeXml='false' value="${bbsView.FAQ_CONT }"></c:out>
<c:out escapeXml='false' value="${tBbsDataDB.bbsDataContent }"></c:out>
</div>
<div class="btn_wrap right">