Merge branch 'hylee'

2024-02-06 18:42:51 +09:00 · 2024-02-06 18:42:51 +09:00 · 418dcc934e
commit 418dcc934e
parent a2acf7e42b 6c84726f7e
13 changed files with 490 additions and 6 deletions
--- a/src/main/java/kcc/kccadr/adjCs/service/AdjCsService.java
+++ b/src/main/java/kcc/kccadr/adjCs/service/AdjCsService.java
@ -0,0 +1,23 @@
+package kcc.kccadr.adjCs.service;
+
+import java.util.List;
+
+public interface AdjCsService {
+
+	List<AdjCsVO> selectDetailList(AdjCsVO adjCsVO);
+
+	AdjCsVO selectAdjCsDetail(AdjCsVO adjCsVO);
+
+//	public int insertGlossary(AdjCsVO glossaryVO) throws Exception;
+//	
+//	public List<AdjCsVO> selectGlossaryList(AdjCsVO glossaryVO) throws Exception;
+//	
+//	public AdjCsVO selectGlossaryDetail(AdjCsVO glossaryVO) throws Exception;
+//	
+//	public void updateGlossaryModify(AdjCsVO glossaryVO) throws Exception;
+//	
+//	public void deleteGlossary(AdjCsVO glossaryVO) throws Exception;
+//	
+//	public List<AdjCsVO> selectGlossaryListForWeb(AdjCsVO glossaryVO) throws Exception;
+	
+}
--- a/src/main/java/kcc/kccadr/adjCs/service/AdjCsVO.java
+++ b/src/main/java/kcc/kccadr/adjCs/service/AdjCsVO.java
@ -0,0 +1,93 @@
+package kcc.kccadr.adjCs.service;
+
+import java.io.Serializable;
+
+import kcc.com.cmm.ComDefaultVO;
+
+public class AdjCsVO extends ComDefaultVO implements Serializable{
+
+	private static final long serialVersionUID = 1L;
+	
+	private String cnt;
+	private String csSeq;
+	private String csCategory;
+	private String csSubject;
+	private String csCn;
+	private String frstRegisterId;
+	private String frstRegistPnttm;
+	private String lastUpdusrId;
+	private String lastUpdtPnttm;
+	private String useYn;
+	private String searchKeywordSearch;
+	
+
+	
+	public String getCnt() {
+		return cnt;
+	}
+	public void setCnt(String cnt) {
+		this.cnt = cnt;
+	}
+	public String getCsSeq() {
+		return csSeq;
+	}
+	public void setCsSeq(String csSeq) {
+		this.csSeq = csSeq;
+	}
+	public String getCsCategory() {
+		return csCategory;
+	}
+	public void setCsCategory(String csCategory) {
+		this.csCategory = csCategory;
+	}
+	public String getCsSubject() {
+		return csSubject;
+	}
+	public void setCsSubject(String csSubject) {
+		this.csSubject = csSubject;
+	}
+	public String getCsCn() {
+		return csCn;
+	}
+	public void setCsCn(String csCn) {
+		this.csCn = csCn;
+	}
+	public String getFrstRegisterId() {
+		return frstRegisterId;
+	}
+	public void setFrstRegisterId(String frstRegisterId) {
+		this.frstRegisterId = frstRegisterId;
+	}
+	public String getFrstRegistPnttm() {
+		return frstRegistPnttm;
+	}
+	public void setFrstRegistPnttm(String frstRegistPnttm) {
+		this.frstRegistPnttm = frstRegistPnttm;
+	}
+	public String getLastUpdusrId() {
+		return lastUpdusrId;
+	}
+	public void setLastUpdusrId(String lastUpdusrId) {
+		this.lastUpdusrId = lastUpdusrId;
+	}
+	public String getLastUpdtPnttm() {
+		return lastUpdtPnttm;
+	}
+	public void setLastUpdtPnttm(String lastUpdtPnttm) {
+		this.lastUpdtPnttm = lastUpdtPnttm;
+	}
+	public String getUseYn() {
+		return useYn;
+	}
+	public void setUseYn(String useYn) {
+		this.useYn = useYn;
+	}
+	public String getSearchKeywordSearch() {
+		return searchKeywordSearch;
+	}
+	public void setSearchKeywordSearch(String searchKeywordSearch) {
+		this.searchKeywordSearch = searchKeywordSearch;
+	}
+	
+	
+}
--- a/src/main/java/kcc/kccadr/adjCs/service/impl/AdjCsDAO.java
+++ b/src/main/java/kcc/kccadr/adjCs/service/impl/AdjCsDAO.java
@ -0,0 +1,24 @@
+package kcc.kccadr.adjCs.service.impl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
+import kcc.kccadr.adjCs.service.AdjCsVO;
+import kcc.kccadr.glossary.service.GlossaryVO;
+import kcc.kccadr.textsense.service.TextSenseVO;
+
+@Repository("AdjCsDAO")
+public class AdjCsDAO extends EgovAbstractDAO{
+
+
+	public List<AdjCsVO> selectDetailList(AdjCsVO adjCsVO) {
+		return (List<AdjCsVO>) list("adjCsDAO.selectDetailList", adjCsVO);
+	}
+
+	public AdjCsVO selectAdjCsDetail(AdjCsVO adjCsVO) {
+		return (AdjCsVO) select("adjCsDAO.selectAdjCsDetail", adjCsVO);
+	}
+	
+}
--- a/src/main/java/kcc/kccadr/adjCs/service/impl/AdjCsServiceImpl.java
+++ b/src/main/java/kcc/kccadr/adjCs/service/impl/AdjCsServiceImpl.java
@ -0,0 +1,45 @@
+package kcc.kccadr.adjCs.service.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import egovframework.rte.fdl.idgnr.EgovIdGnrService;
+import kcc.kccadr.adjCs.service.AdjCsService;
+import kcc.kccadr.adjCs.service.AdjCsVO;
+import kcc.kccadr.glossary.service.GlossaryService;
+import kcc.kccadr.glossary.service.GlossaryVO;
+
+@Service("AdjCsService")
+public class AdjCsServiceImpl  implements AdjCsService{
+
+	/** ID Generation */    
+	@Resource(name="adjCsIdgenService")
+	private EgovIdGnrService adjCsIdgenService;
+	
+	
+	@Resource(name = "AdjCsDAO")
+	private AdjCsDAO adjCsDAO;
+
+
+	@Override
+	public List<AdjCsVO> selectDetailList(AdjCsVO adjCsVO) {
+		return adjCsDAO.selectDetailList(adjCsVO);
+	}
+
+
+	@Override
+	public AdjCsVO selectAdjCsDetail(AdjCsVO adjCsVO) {
+		
+		
+		AdjCsVO adjCsInfoVO = adjCsDAO.selectAdjCsDetail(adjCsVO);
+		if(adjCsInfoVO != null) {
+			
+			adjCsInfoVO.setCsCn(adjCsInfoVO.getCsCn().replace("\r\n","<br>"));
+		}
+		
+		return adjCsInfoVO;
+	}
+}
--- a/src/main/java/kcc/web/MainController.java
+++ b/src/main/java/kcc/web/MainController.java
@ -1,6 +1,5 @@
 package kcc.web;

-import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
@ -22,7 +21,6 @@ import javax.mail.BodyPart;
 import javax.mail.Message;
 import javax.mail.MessagingException;
 import javax.mail.Multipart;
-import javax.mail.Part;
 import javax.mail.Session;
 import javax.mail.Transport;
 import javax.mail.internet.InternetAddress;
@ -76,7 +74,8 @@ import kcc.com.uss.ion.pwm.service.MainzoneVO;
 import kcc.com.uss.ion.pwm.service.PopupManageVO;
 import kcc.com.uss.ion.pwm.service.PopupzoneVO;
 import kcc.com.utl.fcc.service.EgovStringUtil;
-import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO;
+import kcc.kccadr.adjCs.service.AdjCsService;
+import kcc.kccadr.adjCs.service.AdjCsVO;
 import kcc.kccadr.glossary.service.GlossaryService;
 import kcc.kccadr.glossary.service.GlossaryVO;
 import kcc.let.cop.bbs.service.BoardMasterVO;
@ -86,6 +85,7 @@ import kcc.let.cop.bbs.service.EgovBBSManageService;
 import kcc.let.cop.bbs.service.SearchTotalVO;
 import kcc.let.solr.sys.service.ResearchService;
 import kcc.let.sts.cst.service.EgovConectStatsService;
+import kcc.let.sym.ccm.cde.service.EgovCcmCmmnDetailCodeManageService;
 import kcc.let.sym.log.clg.service.EgovLoginLogService;
 import kcc.let.sym.log.clg.service.LoginLog;
 import kcc.let.sym.mnu.mcm.service.EgovMenuCreateManageService;
@ -185,6 +185,9 @@ public class MainController {
 	@Resource(name = "GlossaryService")
 	private GlossaryService glossaryService;
 	
+	@Resource(name = "AdjCsService")
+	private AdjCsService adjCsService;
+	
 	@Value("#{globalSettings['Globals.email.host']}")
 	private String Globals_email_host; 
 	@Value("#{globalSettings['Globals.email.port']}")
@ -216,6 +219,10 @@ public class MainController {
    @Value("#{globalSettings['Globals.sso.pwFindUrl']}")
    private String pwFindUrl_Global;
 	
+
+	@Resource(name = "CmmnDetailCodeManageService")
+    private EgovCcmCmmnDetailCodeManageService cmmnDetailCodeManageService;
+    
 	@RequestMapping(value = "/{siteId}/web/main/mainPage_keri.do")
 	public String siteMainPage_keri(@PathVariable("siteId") String siteId , HttpServletRequest request, ModelMap model) throws Exception{
 		//메인이미지
@ -1818,6 +1825,41 @@ public class MainController {
      	return "web/com/webCommonQuickMenu";
    }
    
+    //조정사례 팝업
+    @RequestMapping(value = "/web/com/popup/quickWrapAdjCsPop.do")
+    public String quickWrapAdjCsPop(@ModelAttribute("searchVO") GlossaryVO glossaryVO, ModelMap model) throws Exception {
+    	
+    	
+
+	    ComDefaultCodeVO vo = new ComDefaultCodeVO();
+	    vo.setCodeId("CC201");
+	    List<?>  category = cmmUseService.selectCmmCodeDetail(vo);
+  		model.addAttribute("category", category);
+    	return "web/com/pop/quickWrapAdjCsPop";
+    }
+
+  	//조정사례 팝업 상세
+  	@RequestMapping(value = "/web/com/popup/quickWrapAdjCsPopDetail.do")
+  	public String quickWrapAdjCsPopDetail(@ModelAttribute("searchVO") AdjCsVO adjCsVO, ModelMap model) throws Exception {
+  		model.addAttribute("list", adjCsService.selectDetailList(adjCsVO));
+  		return "web/com/pop/quickWrapAdjCsPopDetail";
+  	}
+		
+	//조정사례 팝업 상세
+	@RequestMapping(value = "/web/com/popup/quickWrapAdjCsPopDetailCn.do")
+	public String quickWrapAdjCsPopDetailCn(@ModelAttribute("searchVO") AdjCsVO adjCsVO, ModelMap model) throws Exception {
+		try {
+			model.addAttribute("adjCsVO", adjCsService.selectAdjCsDetail(adjCsVO));
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+			// TODO: handle exception
+		}
+		
+		return "web/com/pop/quickWrapAdjCsPopDetailCn";
+	}
+
+    
    //용어해설 팝업
  	@RequestMapping(value = "/web/com/popup/quickWrapGlossaryPop.do")
  	public String quickWrapGlossaryPop(@ModelAttribute("searchVO") GlossaryVO glossaryVO, ModelMap model) throws Exception {
--- a/src/main/resources/egovframework/spring/com/context-idgen.xml
+++ b/src/main/resources/egovframework/spring/com/context-idgen.xml
@ -2953,4 +2953,23 @@
        <property name="fillChar" value="0" />
    </bean>
            
+    
+    <!-- cs_seq 조정사례 Generation  Config-->
+    <bean name="adjCsIdgenService"
+        class="egovframework.rte.fdl.idgnr.impl.EgovTableIdGnrServiceImpl"
+        destroy-method="destroy">
+        <property name="dataSource" ref="dataSource" />
+        <property name="strategy" ref="adjCsStrategy" /><!-- strategy 값 수정 -->
+        <property name="blockSize"  value="10"/>
+        <property name="table"      value="IDS"/>
+        <property name="tableName"  value="GLSSR_ID"/><!-- tableName 값 수정 -->
+    </bean>
+    <!-- cs_seq 조정사례 Generation  Strategy Config -->
+    <bean name="adjCsStrategy"
+        class="egovframework.rte.fdl.idgnr.impl.strategy.EgovIdGnrStrategyImpl">
+        <property name="prefix" value="ADJCS_" />
+        <property name="cipers" value="14" />
+        <property name="fillChar" value="0" />
+    </bean>
+            
 </beans>
--- a/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-cubrid-adjCs.xml
+++ b/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-cubrid-adjCs.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sqlMapConfig PUBLIC "-//iBATIS.com//DTD SQL Map Config 2.0//EN"
+    "http://www.ibatis.com/dtd/sql-map-config-2.dtd">
+
+<sqlMapConfig>
+    <sqlMap resource="egovframework/sqlmap/kccadr/adjCs/AdjCs_SQL_Cubrid.xml"/>
+</sqlMapConfig>
--- a/src/main/resources/egovframework/sqlmap/kccadr/adjCs/AdjCs_SQL_Cubrid.xml
+++ b/src/main/resources/egovframework/sqlmap/kccadr/adjCs/AdjCs_SQL_Cubrid.xml
@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">
+<sqlMap namespace="AdjCsDAO">
+	<typeAlias  alias="AdjCsVO" type="kcc.kccadr.adjCs.service.AdjCsVO"/>
+	
+	<select id="adjCsDAO.selectDetailList" parameterClass="AdjCsVO" resultClass="AdjCsVO">
+	/* adjCsDAO.selectDetailList */
+		SELECT	 COUNT(1) over()	AS cnt
+				, cs_seq			as	csSeq
+				, cs_category		as	csCategory
+				, cs_subject		as	csSubject
+				, cs_cn				as	csCn
+				, frst_register_id	as	frstRegisterId
+				, DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d %H:%i') AS frstRegistPnttm
+				, last_updusr_id	as	lastUpdusrId
+				, last_updt_pnttm	as	lastUpdtPnttm
+				, use_yn			as	use_yn
+		FROM     adr_cs a
+		WHERE    a.use_yn = 'Y'
+		<isNotEmpty property="csCategory">
+				AND cs_category = #csCategory#
+		</isNotEmpty>
+		<isNotEmpty property="searchKeywordSearch">
+				AND cs_subject LIKE CONCAT('%' , #searchKeywordSearch#, '%')
+		</isNotEmpty>
+		
+		
+	</select>
+	
+	<select id="adjCsDAO.selectAdjCsDetail" parameterClass="AdjCsVO" resultClass="AdjCsVO">
+	/* adjCsDAO.selectAdjCsDetail */
+		SELECT	 cs_seq			as	csSeq
+				, cs_category		as	csCategory
+				, cs_subject		as	csSubject
+				, cs_cn				as	csCn
+				, frst_register_id	as	frstRegisterId
+				, DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d %H:%i') AS frstRegistPnttm
+				, last_updusr_id	as	lastUpdusrId
+				, last_updt_pnttm	as	lastUpdtPnttm
+				, use_yn			as	use_yn
+		FROM     adr_cs a
+		WHERE   cs_seq = #csSeq#
+		
+		
+		
+	</select>
+	
+</sqlMap>
--- a/src/main/webapp/WEB-INF/decorators.xml
+++ b/src/main/webapp/WEB-INF/decorators.xml
@ -67,6 +67,7 @@
 		
 		<pattern>*/web/kccadr/pdf/pdfview.do*</pattern>
 		<pattern>/web/com/popup/quickWrapGlossaryPop*.do*</pattern>
+		<pattern>/web/com/popup/quickWrapAdjCsPop*.do*</pattern>
 		
 		<pattern>*/uat/uia/EgovLoginCourt.do*</pattern>
 		
--- a/src/main/webapp/WEB-INF/jsp/web/com/pop/quickWrapAdjCsPop.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/pop/quickWrapAdjCsPop.jsp
@ -0,0 +1,110 @@
+<%@ page contentType="text/html; charset=utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+
+<!DOCTYPE html>
+<html lang="ko">
+
+<head>
+	<meta charset="UTF-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>저작권 전자조정시스템 > 퀵메뉴 > 조정사례</title>
+
+	<!-- css -->
+	<link rel="stylesheet" href="/kccadrPb/usr/css/reset.css">
+	<link rel="stylesheet" href="/kccadrPb/usr/css/font.css">
+	<link rel="stylesheet" href="/kccadrPb/usr/css/common.css">
+	<link rel="stylesheet" href="/kccadrPb/usr/css/content.css">
+	<link rel="stylesheet" href="/kccadrPb/usr/css/content_media.css">
+	<link rel="stylesheet" href="/kccadrPb/usr/css/popup.css">
+
+	<!-- script -->
+	<script src="/kccadrPb/usr/script/jquery-3.5.0.js"></script>
+	<script src="/kccadrPb/usr/script/common.js"></script>
+	<script src="/kccadrPb/usr/script/content.js"></script>
+	<script src="/kccadrPb/usr/script/popup.js"></script>
+	
+	<style>
+		.popup_wrap{display:block !important;}
+	</style>
+</head>
+
+
+<body>
+	
+	
+	<script type="text/javaScript" language="javascript">
+		$(document).ready(function(){
+			
+			$(".tooltip-close").click(function(){
+				window.close();
+			});
+			
+			$('.popup_tab_wrap .tab_ul .tab_li, ul li').on('click',function(){
+				$(this).addClass('on').siblings().removeClass('on');
+			});
+			
+			$("#tab_ul li > button").on("click", function(e) {
+				var csCategory = $(this).data('info');
+				tabPageLoad2(csCategory);
+			});
+			
+			tabPageLoad2("");
+			
+		});
+		
+		function tabPageLoad2(csCategory) {
+			var url = '/web/com/popup/quickWrapAdjCsPopDetail.do';
+			console.log('csCategory : ', csCategory);
+			console.log('url : ', url);
+			$('#csDetail').load(url, {
+				"csCategory" : csCategory,
+				"searchKeywordSearch" : $('#searchKeywordSearch').val()
+			}, function(res, status, xhr) {
+				console.log(status);
+			});
+		}
+		
+		function search(){
+			var csCategory = $('#tab_ul').find('.tab_li.on .tab').data('info');
+			tabPageLoad2(csCategory);
+		}
+	    
+	</script>
+
+	<!-- 저작권 용어사전 -->
+	<div class="tooltip-wrap">
+		<div class="popup_wrap glossary_popup">
+			<div class="popup_tit">
+				<p>저작권 조정사례</p>
+			</div>
+			<div class="popup_cont">
+				<div class="popup_search type02">
+					<p class="search_title">조정사례검색</p>
+					<input type="text" id="searchKeywordSearch" placeholder="검색어를 입력해주세요" title="용어 검색어 입력" onkeypress="if(event.keyCode==13) {search();}">
+					<button type="button" class="btnTYpe01" onclick="search();">조회</button>
+				</div>
+				<div class="popup_tab_wrap">
+					<ul class="tab_ul" id="tab_ul">
+						<li class="tab_li on"><button type="button" class="tab" data-info="">전체</button></li>
+						<c:forEach items="${category }" var="item">
+							<li class="tab_li"><button type="button" class="tab" data-info="${item.code }">${item.codeNm }</button></li>
+						</c:forEach>
+					</ul>
+				</div>
+				<div class="popup_tab_content" id="csDetail">
+				</div>
+				<div class="btn_wrap">
+					<button type="button" class="btnType03 tooltip-close">닫기</button>
+				</div>
+			</div>
+		</div>
+	</div>
+	<!-- //저작권 용어사전 -->
+</body>
+</html>
--- a/src/main/webapp/WEB-INF/jsp/web/com/pop/quickWrapAdjCsPopDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/pop/quickWrapAdjCsPopDetail.jsp
@ -0,0 +1,44 @@
+<%@ page contentType="text/html; charset=utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<script type="text/javaScript" language="javascript">
+		$(document).ready(function(){
+			$('.glossary_left_area ul li').on('click',function(){
+				$(this).addClass('on').siblings().removeClass('on');
+				tabPageLoad3($(this).children('button').attr('value'));
+			});
+			
+// 			$("#tab_ul li > button").on("click", function(e) {
+// 				var searchKeyword = $(this).text();
+// 				tabPageLoad2(searchKeyword);
+// 			});
+			
+			tabPageLoad3('${list[0].csSeq}');
+			
+		});
+		
+		function tabPageLoad3(csSeq) {
+			var url = '/web/com/popup/quickWrapAdjCsPopDetailCn.do';
+		
+			$('#adjCsDetailCn').load(url, {
+				"csSeq" : csSeq
+			}, function(res, status, xhr) {
+				console.log(status);
+			});
+		}
+</script>
+	
+	<div class="glossary_left_area" >
+		<p class="result_text">전체 : <span class="t_bold"><c:out value="${list[0].cnt}"/></span>건</p>
+		<ul>
+			<c:forEach var="list" items="${list}" varStatus="status">
+				<li <c:if test="${status.index eq 0}">class="on"</c:if>><button type="button" value="<c:out value='${list.csSeq}'/>"><c:out value="${list.csSubject}"/></button></li>
+			</c:forEach>
+		</ul>
+	</div>
+	<div class="glossary_right_area" id="adjCsDetailCn">
+	</div>
--- a/src/main/webapp/WEB-INF/jsp/web/com/pop/quickWrapAdjCsPopDetailCn.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/pop/quickWrapAdjCsPopDetailCn.jsp
@ -0,0 +1,24 @@
+<%@ page contentType="text/html; charset=utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%pageContext.setAttribute("crlf", "\r\n"); %>
+<%pageContext.setAttribute("crlt", "&lt;"); %>
+<%pageContext.setAttribute("crgt", "&gt;"); %>
+		<dl>
+			<dt>
+				<p>
+					<c:out value="${adjCsVO.csSubject}"/>
+				</p>
+			</dt>
+			<dd>
+				<p>
+<%-- 		             	   <c:out value="${fn:replace(fn:replace(fn:replace(adjCsVO.csCn, crlt , '<'), crgt , '>'), crlf , '<br />')}"  escapeXml="false"/> --%>
+		             	   <c:out value="${fn:replace(fn:replace(fn:replace(adjCsVO.csCn, crlt , '<'), crgt , '>'), crlf , '<br />')}"  escapeXml="false"/>
+<%-- 					<c:out value="${adjCsVO.csCn}"/> --%>
+				</p>
+			</dd>
+		</dl>
--- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonQuickMenu.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonQuickMenu.jsp
@ -4,9 +4,10 @@

 <script type="text/javascript">

-	function glossaryPop2() {
+// 	function glossaryPop2() {
+	function cmmPop(url) {
 		commonPopWindowopenForm(
-	        "/web/com/popup/quickWrapGlossaryPop.do"
+	        url
 	        , "998"
 	        , "700"
 	        , ""
@ -24,11 +25,14 @@
 	</div>
 	<ul class="quick_ul">
 		<li class="quick_li">
-			<a href="#none" onclick="glossaryPop2(); return false;" ><i class="icon_quickmenu_glossary"></i>용어해설</a>
+			<a href="#none" onclick="cmmPop('/web/com/popup/quickWrapGlossaryPop.do'); return false;" ><i class="icon_quickmenu_glossary"></i>용어해설</a>
 		</li>
 		<li class="quick_li">
 			<a href="/web/cop/bbsWeb/selectBoardList.do?bbsId=BBSMSTR_000000000651"><i class="icon_quickmenu_adj_case"></i>조정사례</a>
 		</li>
+		<li class="quick_li">
+			<a href="#none" onclick="cmmPop('/web/com/popup/quickWrapAdjCsPop.do'); return false;" ><i class="icon_quickmenu_adj_case"></i>조정사례</a>
+		</li>
 		<li class="quick_li">
 			<a href="/web/kccadr/adjst/adjstReqRegistInformation.do"><i class="icon_quickmenu_apl_form"></i>조정신청</a>
 		</li>