Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

src/main/java/seed/com/gtm/faqbbs/faqBpardService.java

@@ -1,5 +1,6 @@
 package seed.com.gtm.faqbbs;
 
+import java.sql.Clob;
 import java.util.List;
 import java.util.Map;
 
@@ -25,6 +26,26 @@ public class faqBpardService {
 	
 	public Map<String,Object> boardView(Map<String, Object> paramMap){
 		Map<String,Object> boardView = dao.boardView(paramMap);
+		//FAQ_CONT가 CLOB 타입이며, SELECT에서 문자열로 변경 시 varchar2(4000)을 초과하여 오류 발생.
+		//CLOB 타입으로 조회 후 java에서 문자열로 변환 처리
+		try {
+			if(boardView.get("FAQ_CONT") != null) {
+				Clob faqContClob = (Clob) boardView.get("FAQ_CONT");
+				System.out.println(faqContClob);
+				StringBuilder sb = new StringBuilder();
+				long length = faqContClob.length();
+				java.io.Reader reader = faqContClob.getCharacterStream();
+				char[] buffer = new char[1024];
+				int bytesRead;
+				while ((bytesRead = reader.read(buffer)) != -1) {
+					sb.append(buffer, 0, bytesRead);
+				}
+				boardView.put("FAQ_CONT",sb.toString());
+				reader.close();
+			}
+		}catch(Exception e) {
+			e.printStackTrace();
+		}
 		return boardView;
 	}
 	

src/main/resources/egovframework/sqlmap/config/mappers/faqBbs/faqbbs_sql.xml

@@ -82,7 +82,8 @@
 		SELECT FAQ_SEQ_NUMBER, 
 			FAQ_SETIDX,
 			FAQ_SUBJ,
-			dbms_lob.substr(FAQ_CONT, dbms_lob.getlength(FAQ_CONT), 1) AS FAQ_CONT ,
+			<!-- dbms_lob.substr(FAQ_CONT, dbms_lob.getlength(FAQ_CONT), 1) AS FAQ_CONT , -->
+			FAQ_CONT,
 			MNGR_RPL_CONT,
 			VIEW_CNT,
 			REG_MBER_ID,

src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/trublprocessmngList.jsp

@@ -166,7 +166,7 @@ function clipCall(crfNm){
 							<option value="companyCeo" <c:if test="${searchType == 'companyCeo'}">selected="selected"</c:if>>신청인</option>
 							<option value="respondentCeo" <c:if test="${searchType == 'respondentCeo'}">selected="selected"</c:if>>피신청인</option>
 							<option value="process" <c:if test="${searchType == 'process'}">selected="selected"</c:if>>경과여부</option>
-							<c:if test="${memberPosition == '0911000000' || memberPosition == '0910000000'}">
+							<c:if test="${memberPosition == '0911000000' || memberPosition == '0910000000' || memberPosition == '0915000000'}">
 								<option value="examinerSearch" <c:if test="${searchType == 'examinerSearch'}">selected="selected"</c:if>>조사관</option>
 							</c:if>
 							<option value="rceptNoSearch" <c:if test="${searchType == 'rceptNoSearch'}">selected="selected"</c:if>>문서등록번호</option>
@@ -204,7 +204,7 @@ function clipCall(crfNm){
 					<col class="title5">
 					<col class="title5">
 					<col class="title7">
-					<c:if test="${memberPosition == '0911000000' || memberPosition == '0910000000'}">
+					<c:if test="${memberPosition == '0911000000' || memberPosition == '0910000000' || memberPosition == '0915000000'}">
 						<col class="title7">
 					</c:if>
 				</colgroup>
@@ -223,7 +223,7 @@ function clipCall(crfNm){
 							<th scope="col" rowspan="2">보완기일</th>
 							<th scope="col" rowspan="2">기간연장여부</th>
 							<th scope="col" rowspan="2">기간경과여부</th>
-							<c:if test="${memberPosition == '0911000000' || memberPosition == '0910000000'}">
+							<c:if test="${memberPosition == '0911000000' || memberPosition == '0910000000' || memberPosition == '0915000000'}">
 								<th scope="col" rowspan="2">조사관</th>
 							</c:if>
 						</tr>
@@ -305,7 +305,7 @@ function clipCall(crfNm){
                                         <td><c:if test='${list.caseExtend != null}'>연장</c:if>
                                             <c:if test='${list.caseExtend == null}'>N</c:if></td>
 										<td>${list.termCheck}</td>
-										<c:if test="${memberPosition == '0911000000' || memberPosition == '0910000000'}">
+										<c:if test="${memberPosition == '0911000000' || memberPosition == '0910000000' || memberPosition == '0915000000'}">
 											<td>${list.caseExaminerNm}</td>
 										</c:if>
 									</tr>
@@ -314,7 +314,7 @@ function clipCall(crfNm){
 						<c:otherwise>
 							<tr>
 								<c:choose>
-									<c:when test="${memberPosition == '0911000000' || memberPosition == '0910000000'}">
+									<c:when test="${memberPosition == '0911000000' || memberPosition == '0910000000' || memberPosition == '0915000000'}">
 										<td colspan="9">검색된 데이터가 없습니다.</td>
 									</c:when>
 									<c:otherwise>

src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administList.jsp

@@ -279,7 +279,7 @@
 					<col width="10%">
 					<!--소속 : 유통팀, 한국공정거래조정원, 민원상담센터 -->
 					<c:if
-						test="${(memberDept == SeedConstants.YUTONG || memberDept == SeedConstants.HANGUK || memberDept == SeedConstants.MINWON) }">
+						test="${(memberDept == SeedConstants.YUTONG || memberDept == SeedConstants.HANGUK || memberDept == SeedConstants.MINWON || memberPosition == SeedConstants.GWANRIJA) }">
 						<col width="10%">
 					</c:if>
 				</colgroup>
@@ -305,7 +305,7 @@
 						<th scope="col" rowspan="2">분쟁유형</th>
 						<!--소속 : 유통팀, 한국공정거래조정원, 민원상담센터 -->
 						<c:if
-							test="${(memberDept == SeedConstants.YUTONG || memberDept == SeedConstants.HANGUK || memberDept == SeedConstants.MINWON) }">
+							test="${(memberDept == SeedConstants.YUTONG || memberDept == SeedConstants.HANGUK || memberDept == SeedConstants.MINWON || memberPosition == SeedConstants.GWANRIJA) }">
 							<th scope="col" rowspan="2">조사관</th>
 						</c:if>
 					</tr>
@@ -356,14 +356,11 @@
 							<td>${list.regDt}</td>
 							<td>${list.caseGubun}</td>
 							<c:if
-								test="${(memberDept == SeedConstants.YUTONG || memberDept == SeedConstants.HANGUK || memberDept == SeedConstants.MINWON) }">
+								test="${(memberDept == SeedConstants.YUTONG || memberDept == SeedConstants.HANGUK || memberDept == SeedConstants.MINWON || memberPosition == SeedConstants.GWANRIJA) }">
 								<c:choose>
-									<c:when test="${searchMa == 'Y'}">
+									<c:when test="${list.memberName != null}">
 										<td>${list.memberName}</td>
 									</c:when>
-									<c:when test="${searchMa == 'P'}">
-										<td>배정중</td>
-									</c:when>
 									<c:otherwise>
 										<td>미배정</td>
 									</c:otherwise>