Merge branch 'jsp'

src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java

@@ -284,15 +284,15 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG
 			
 			MberGrdVO mberGrdVO = new MberGrdVO();		
 			// Step 1. 등급제 시행 ON 일경우
+			System.out.println("Step 1. 등급제 시행 ON 일경우");
 			MberGrdVO mberGrdVO1 = new MberGrdVO();
 			mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
-			System.out.println("Step 1. 등급제 시행 ON 일경우");
 			if (mberGrdVO1.getGrdNoti().equals("Y")) {
 				mberGrdVO = new MberGrdVO();
 				
 				// Step 2. 등급 정보 조회
-				mberGrdVO = selectMberGrdInfo(mberId);
 				System.out.println("Step 2. 등급 정보 조회");
+				mberGrdVO = selectMberGrdInfo(mberId);
 				if (mberGrdVO != null) {	
 					if(mberGrdVO.getShortPrice() > 1 && mberGrdVO.getLongPrice() > 1 && mberGrdVO.getPicturePrice() > 1 && mberGrdVO.getPicture2Price() > 1 && mberGrdVO.getPicture3Price() > 1) {
 						sysJoinSetVO.setShortPrice(mberGrdVO.getShortPrice());

src/main/java/itn/web/ContentController.java

@@ -7,6 +7,7 @@ import java.net.URL;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Resource;
@@ -35,6 +36,8 @@ import itn.com.uss.olh.hpc.service.HackIpVO;
 import itn.let.lett.service.LetterVO;
 import itn.let.mjo.pay.service.MjonPayVO;
 import itn.let.schdlr.service.SchdlrManageService;
+import itn.let.sym.grd.service.MberGrdService;
+import itn.let.sym.grd.service.MberGrdVO;
 import itn.let.uss.ion.cnt.service.CntManageVO;
 import itn.let.uss.ion.cnt.service.EgovCntManageService;
 
@@ -691,4 +694,79 @@ public class ContentController{
 
 		return modelAndView;
 	} 			
+	
+	@Resource(name = "mberGrdService")
+	MberGrdService mberGrdService;
+	
+	/*
+	// test
+	@RequestMapping(value= {"/web/main/testAjax.do"})
+	public ModelAndView testAjax(HttpServletRequest request,
+			ModelMap model) throws Exception{
+		
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+		
+		boolean isSuccess = true;
+		String msg = "";
+		
+		try {
+
+			
+			MberGrdVO mberGrdVO = new MberGrdVO();
+			mberGrdVO.setFirstIndex(0);
+			mberGrdVO.setLastIndex(1000);
+			mberGrdVO.setRecordCountPerPage(1000);
+	    	
+			if("".equals(mberGrdVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
+				mberGrdVO.setSearchSortCnd("regDate");
+				mberGrdVO.setSearchSortOrd("desc");
+			}
+			
+			List<MberGrdVO> resultList = mberGrdService.selectMberGrdList(mberGrdVO);			
+			for (MberGrdVO item : resultList) {
+				mberGrdVO.setGrdNewDate("2022-01-01");
+				mberGrdVO.setMberId(item.getMberId());
+				// System.out.println("Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회");
+				MberGrdVO mberGrdVO3 = new MberGrdVO();				
+				mberGrdVO3 = mberGrdService.selectMberGrdAmtDetail(mberGrdVO);
+				System.out.println("MberId : " + item.getMberId());
+				System.out.println("MberGrdVO3 : " + mberGrdVO3);
+				if (null != mberGrdVO3) {
+					System.out.println("GrdSetNo() : " + mberGrdVO3.getGrdSetNo());
+				}
+				System.out.println("");
+			}			
+			
+			/*
+			MberGrdVO mberGrdVO1 = new MberGrdVO();				
+			if (!StringUtils.isEmpty(mberGrdVO1.getMberId())) {
+				System.out.println("mberGrdVO1 : NOT NULL");
+			}
+			else {
+				System.out.println("mberGrdVO1 : NULL");
+			}
+			
+			MberGrdVO mberGrdVO2 = new MberGrdVO();	
+			mberGrdVO2.setMberId("nopay");
+			if (!StringUtils.isEmpty(mberGrdVO2.getMberId())) {
+				System.out.println("mberGrdVO2 : NOT NULL");
+			}
+			else {
+				System.out.println("mberGrdVO2 : NULL");
+			}
+			*/
+    	}
+		catch(Exception e) {
+			isSuccess = false;
+    		msg = e.getMessage();
+    	}
+			
+		modelAndView.addObject("isSuccess", isSuccess);        		
+		modelAndView.addObject("msg", msg);
+
+		return modelAndView;
+	} 	
+	*/
+	
 }

src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeInqire.jsp

@@ -22,6 +22,8 @@
 <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%pageContext.setAttribute("crlf", "\r\n"); %>
+<%pageContext.setAttribute("ltChar", "&lt;"); %>
+<%pageContext.setAttribute("gtChar", "&gt;"); %>
 <head>
 <script src="/publish/js/content.js"></script>
 <script type="text/javascript">
@@ -235,7 +237,11 @@ function fn_egov_select_commentList(pageNo) {
                             <div class="view_cont">
                                 <div class="cont_in"> 
                                 	<!-- 엔터적용 -->
-                                    <c:out value="${fn:replace(result.nttCn , crlf , '<br/>')}" escapeXml="false" />
+                           			<c:set var="nttCn1" value="${fn:replace(result.nttCn , crlf , '<br/>')}" />
+                           			<c:set var="nttCn2" value="${fn:replace(nttCn1 , ltChar , '<')}" />
+                           			<c:set var="nttCn3" value="${fn:replace(nttCn2 , gtChar , '>')}" />
+                               		<c:out value="${nttCn3}" escapeXml="false" />	                                    	                                    	                                	
+
                                 </div>
                                 <c:if test="${result.atchFileCnt > 0}">
 				            		<c:import url="/cmm/fms/selectBBSFileInfsMjon.do" charEncoding="utf-8">
@@ -272,7 +278,10 @@ function fn_egov_select_commentList(pageNo) {
 	                                    <div class="answer_title"><i></i><span>RE</span></div>
 	                                    <div class="answer_cont">
                                 			<!-- 엔터적용 -->
-                                    		<c:out value="${fn:replace(resultList.commentCn , crlf , '<br/>')}" escapeXml="false" />	                                    	                                    	
+                                			<c:set var="commentCn1" value="${fn:replace(resultList.commentCn , crlf , '<br/>')}" />
+                                			<c:set var="commentCn2" value="${fn:replace(commentCn1 , ltChar , '<')}" />
+                                			<c:set var="commentCn3" value="${fn:replace(commentCn2 , gtChar , '>')}" />
+                                    		<c:out value="${commentCn3}" escapeXml="false" />	                                    	                                    	
 	                                    </div>
 	                                </div>
 		                        </div>