Merge branch 'tolag'
This commit is contained in:
commit
731af7d398
@ -436,7 +436,9 @@ public class MainController {
|
||||
List<BoardVO> vo = bbsMngService.selectMainBoardRecent(boardVO);
|
||||
//게시글 내용 html 태그 삭제
|
||||
for(int i=0; i<vo.size(); i++) {
|
||||
vo.get(i).setNttCn(vo.get(i).getNttCn().replaceAll("<(/)?([a-zA-Z]*)(\\s[a-zA-Z]*=[^>]*)?(\\s)*(/)?>", "").split("<")[0]);
|
||||
System.out.println("before count "+ i + " :: " + vo.get(i).getNttCn());
|
||||
// vo.get(i).setNttCn(vo.get(i).getNttCn().replaceAll("<(/)?([a-zA-Z]*)(\\s[a-zA-Z]*=[^>]*)?(\\s)*(/)?>", "").split("<")[0]);
|
||||
System.out.println("after count "+ i + " :: " + vo.get(i).getNttCn());
|
||||
}
|
||||
|
||||
model.addAttribute("bbsList", vo);
|
||||
|
||||
@ -291,7 +291,20 @@
|
||||
WHEN COUNT(*) <![CDATA[ <= ]]> 1 THEN GROUP_CONCAT(RPPL_NM SEPARATOR ',')
|
||||
ELSE RPPL_NM || '외' || (COUNT(*)-1) || '명'
|
||||
END RPPL_NMS
|
||||
FROM ADR_RPPL S1
|
||||
FROM (SELECT
|
||||
CASE
|
||||
WHEN ttt1.RPPL_USR_TY = '01'
|
||||
THEN ttt1.RPPL_NM
|
||||
WHEN ttt1.RPPL_USR_TY = '02'
|
||||
THEN ttt1.RPPL_BIZ_NM
|
||||
ELSE '3'
|
||||
END RPPL_NM,
|
||||
ttt1.RPPL_TY,
|
||||
ttt1.adr_seq,
|
||||
ttt1.frst_regist_pnttm
|
||||
FROM ADR_RPPL ttt1
|
||||
)
|
||||
S1
|
||||
WHERE 1=1
|
||||
AND S1.adr_seq = T1.adr_seq
|
||||
AND S1.RPPL_TY = '20'
|
||||
|
||||
@ -452,8 +452,29 @@
|
||||
<th class="">
|
||||
<p>피신청인</p>
|
||||
</th>
|
||||
<td><c:out value="${list.rpplNm}"/></td>
|
||||
<c:choose>
|
||||
<c:when test="${list.rpplUsrTy eq '02'}">
|
||||
<td>
|
||||
<c:out value="${list.rpplBizNm}"/>
|
||||
</td>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<td>
|
||||
<c:out value="${list.rpplNm}"/>
|
||||
</td>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</tr>
|
||||
<c:if test="${list.rpplUsrTy eq '02'}">
|
||||
<tr>
|
||||
<th class="">
|
||||
<p>피신청인 대표자명</p>
|
||||
</th>
|
||||
<td>
|
||||
<c:out value="${list.rpplNm}"/>
|
||||
</td>
|
||||
</tr>
|
||||
</c:if>
|
||||
<tr>
|
||||
<th class="">
|
||||
<p>주소</p>
|
||||
|
||||
@ -104,12 +104,12 @@ function goExpPage(num) {
|
||||
frm.searchStatus.value = '';
|
||||
}
|
||||
else if(num==4)
|
||||
{// 열랍 발급
|
||||
{// 기록 열람
|
||||
goUrl = "<c:url value='/web/kccadr/adjstExp/docIssReqList.do'/>";
|
||||
frm.searchStatus.value = 'C';
|
||||
}
|
||||
else if(num==5)
|
||||
{// 열랍 발급
|
||||
{// 조정결과
|
||||
goUrl = "<c:url value='/web/kccadr/adjstExp/adjstIncidentEndList.do'/>";
|
||||
frm.searchStatus.value = 'C';
|
||||
}
|
||||
@ -231,7 +231,7 @@ function goExpPage(num) {
|
||||
<p class="tooltip_tit02">(정보입력, 불러오기, 제출하기 기능 제공)</p>
|
||||
</div>
|
||||
<!-- <button type="button" title="페이지 이동">전자조정 등록</button> -->
|
||||
<button type="button" title="페이지 이동" onclick="goExpPage(6);">전자신청 바로가기</button>
|
||||
<button type="button" title="페이지 이동" onclick="goExpPage(6);">조정신청 바로가기</button>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
@ -268,8 +268,8 @@ function goExpPage(num) {
|
||||
</div>
|
||||
</a>
|
||||
|
||||
<a href="#" onclick="goExpPage(4);" title="열람·발급 페이지 바로가기"><i></i>
|
||||
<p>사건기록 열람·발급</p>
|
||||
<a href="#" onclick="goExpPage(4);" title="기록발급 바로가기"><i></i>
|
||||
<p>기록발급</p>
|
||||
<div class="tooltip_box">
|
||||
<div class="tooltip_type01">
|
||||
<div class="text_area">
|
||||
|
||||
@ -1,6 +1,15 @@
|
||||
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
|
||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
|
||||
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
|
||||
<%pageContext.setAttribute("crlf", "\r\n"); %>
|
||||
<%pageContext.setAttribute("crlt", "<"); %>
|
||||
<%pageContext.setAttribute("crgt", ">"); %>
|
||||
<%
|
||||
response.setHeader("Cache-Control","no-store");
|
||||
response.setHeader("Pragma","no-cache");
|
||||
response.setDateHeader("Expires",0);
|
||||
if (request.getProtocol().equals("HTTP/1.1")) response.setHeader("Cache-Control", "no-cache");
|
||||
%>
|
||||
<!DOCTYPE html>
|
||||
<html lang="ko">
|
||||
<head>
|
||||
@ -178,8 +187,8 @@ function fn_egov_inqire_notice(bbsId, nttId) {
|
||||
<a href="/web/kccadr/accdnt/ai/adjstIncidentList.do" title="진행상황 페이지 바로가기"><i></i>
|
||||
<p>진행상황</p>
|
||||
</a>
|
||||
<a href="/web/kccadr/payment/inipay/accdnt/ai/docIssReqList.do" title="열람·발급 페이지 바로가기"><i></i>
|
||||
<p>열람·발급</p>
|
||||
<a href="/web/kccadr/payment/inipay/accdnt/ai/docIssReqList.do" title="기록발급 페이지 바로가기"><i></i>
|
||||
<p>기록발급</p>
|
||||
</a>
|
||||
<a href="/web/cop/bbsWeb/selectBoardList.do?bbsId=BBSMSTR_000000000654" title="문의 게시판 페이지 바로가기"><i></i>
|
||||
<p>문의게시판</p>
|
||||
@ -237,11 +246,20 @@ function fn_egov_inqire_notice(bbsId, nttId) {
|
||||
<li onclick="javascript:fn_egov_inqire_notice('<c:out value="${result.bbsId}"/>', '<c:out value="${result.nttId}"/>');">
|
||||
<a href="#" title="현재창 상세이동">
|
||||
<p class="list_top">
|
||||
<span class="list_tit"><c:if test="${status.count ne '1'}">·</c:if><c:out value="${result.nttSj}" /></span>
|
||||
<span class="list_tit">
|
||||
<c:if test="${status.count ne '1'}">
|
||||
·
|
||||
</c:if>
|
||||
<c:out value="${result.nttSj}" />
|
||||
</span>
|
||||
<span class="list_date"><c:out value="${result.frstRegisterPnttm}" /></span>
|
||||
</p>
|
||||
<c:if test="${status.count eq '1'}">
|
||||
<p class="list_info"><c:out value="${result.nttCn}" escapeXml="false;"/></p>
|
||||
<%-- <p class="list_info"><c:out value="${result.nttCn}" escapeXml="false;"/></p> --%>
|
||||
<div class="list_info"><c:out value="${fn:replace(fn:replace(fn:replace(result.nttCn, crlt , '<'), crgt , '>'), crlf , '<br/>')}" escapeXml="false"/></div>
|
||||
<%-- <div class="list_info"><c:out value="${fn:replace(fn:replace(fn:replace(result.nttCn, crlt , '<'), crgt , '>'), crlf , '<br/>')}" escapeXml="false"/></div> --%>
|
||||
<!-- <div class="list_info">사건 개요 -->
|
||||
<!-- 신청인은 외국 출판사와 본 건 관련 외국 서적 『BOOK』에 대하여 한국어판 독점출판계약을 </div> -->
|
||||
</c:if>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user