Commit @8ae9ec146ecc4d334fb5af442a7d1989fb4e3373

itn 2023-08-18

< > 리플레이스 처리

@8ae9ec146ecc4d334fb5af442a7d1989fb4e3373

8bb6828

8ae9ec1

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

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

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


 			
 			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. 등급 정보 조회");
-				if (mberGrdVO != null) {
+				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());
 						sysJoinSetVO.setLongPrice(mberGrdVO.getLongPrice());

8bb6828

8ae9ec1

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

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

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


 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Resource;

 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;
 

 
 		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;
+	} 	
+	*/
+	
 }

8bb6828

8ae9ec1

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

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

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


 <%@ 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">

                             <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">

 	                                    <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>

Add a comment

Open 0
Closed 0

List

...	...	@@ -284,16 +284,16 @@
284	284
285	285	MberGrdVO mberGrdVO = new MberGrdVO();
286	286	// Step 1. 등급제 시행 ON 일경우
	287	+ System.out.println("Step 1. 등급제 시행 ON 일경우");
287	288	MberGrdVO mberGrdVO1 = new MberGrdVO();
288	289	mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
289		- System.out.println("Step 1. 등급제 시행 ON 일경우");
290	290	if (mberGrdVO1.getGrdNoti().equals("Y")) {
291	291	mberGrdVO = new MberGrdVO();
292	292
293	293	// Step 2. 등급 정보 조회
294		- mberGrdVO = selectMberGrdInfo(mberId);
295	294	System.out.println("Step 2. 등급 정보 조회");
296		- if (mberGrdVO != null) {
	295	+ mberGrdVO = selectMberGrdInfo(mberId);
	296	+ if (mberGrdVO != null) {
297	297	if(mberGrdVO.getShortPrice() > 1 && mberGrdVO.getLongPrice() > 1 && mberGrdVO.getPicturePrice() > 1 && mberGrdVO.getPicture2Price() > 1 && mberGrdVO.getPicture3Price() > 1) {
298	298	sysJoinSetVO.setShortPrice(mberGrdVO.getShortPrice());
299	299	sysJoinSetVO.setLongPrice(mberGrdVO.getLongPrice());

...	...	@@ -7,6 +7,7 @@
7	7	import java.net.URLEncoder;
8	8	import java.text.SimpleDateFormat;
9	9	import java.util.Date;
	10	+import java.util.List;
10	11	import java.util.Map;
11	12
12	13	import javax.annotation.Resource;
...	...	@@ -35,6 +36,8 @@
35	36	import itn.let.lett.service.LetterVO;
36	37	import itn.let.mjo.pay.service.MjonPayVO;
37	38	import itn.let.schdlr.service.SchdlrManageService;
	39	+import itn.let.sym.grd.service.MberGrdService;
	40	+import itn.let.sym.grd.service.MberGrdVO;
38	41	import itn.let.uss.ion.cnt.service.CntManageVO;
39	42	import itn.let.uss.ion.cnt.service.EgovCntManageService;
40	43
...	...	@@ -691,4 +694,79 @@
691	694
692	695	return modelAndView;
693	696	}
	697	+
	698	+ @Resource(name = "mberGrdService")
	699	+ MberGrdService mberGrdService;
	700	+
	701	+ /*
	702	+ // test
	703	+ @RequestMapping(value= {"/web/main/testAjax.do"})
	704	+ public ModelAndView testAjax(HttpServletRequest request,
	705	+ ModelMap model) throws Exception{
	706	+
	707	+ ModelAndView modelAndView = new ModelAndView();
	708	+ modelAndView.setViewName("jsonView");
	709	+
	710	+ boolean isSuccess = true;
	711	+ String msg = "";
	712	+
	713	+ try {
	714	+
	715	+
	716	+ MberGrdVO mberGrdVO = new MberGrdVO();
	717	+ mberGrdVO.setFirstIndex(0);
	718	+ mberGrdVO.setLastIndex(1000);
	719	+ mberGrdVO.setRecordCountPerPage(1000);
	720	+
	721	+ if("".equals(mberGrdVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
	722	+ mberGrdVO.setSearchSortCnd("regDate");
	723	+ mberGrdVO.setSearchSortOrd("desc");
	724	+ }
	725	+
	726	+ List<MberGrdVO> resultList = mberGrdService.selectMberGrdList(mberGrdVO);
	727	+ for (MberGrdVO item : resultList) {
	728	+ mberGrdVO.setGrdNewDate("2022-01-01");
	729	+ mberGrdVO.setMberId(item.getMberId());
	730	+ // System.out.println("Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회");
	731	+ MberGrdVO mberGrdVO3 = new MberGrdVO();
	732	+ mberGrdVO3 = mberGrdService.selectMberGrdAmtDetail(mberGrdVO);
	733	+ System.out.println("MberId : " + item.getMberId());
	734	+ System.out.println("MberGrdVO3 : " + mberGrdVO3);
	735	+ if (null != mberGrdVO3) {
	736	+ System.out.println("GrdSetNo() : " + mberGrdVO3.getGrdSetNo());
	737	+ }
	738	+ System.out.println("");
	739	+ }
	740	+
	741	+ /*
	742	+ MberGrdVO mberGrdVO1 = new MberGrdVO();
	743	+ if (!StringUtils.isEmpty(mberGrdVO1.getMberId())) {
	744	+ System.out.println("mberGrdVO1 : NOT NULL");
	745	+ }
	746	+ else {
	747	+ System.out.println("mberGrdVO1 : NULL");
	748	+ }
	749	+
	750	+ MberGrdVO mberGrdVO2 = new MberGrdVO();
	751	+ mberGrdVO2.setMberId("nopay");
	752	+ if (!StringUtils.isEmpty(mberGrdVO2.getMberId())) {
	753	+ System.out.println("mberGrdVO2 : NOT NULL");
	754	+ }
	755	+ else {
	756	+ System.out.println("mberGrdVO2 : NULL");
	757	+ }
	758	+ */
	759	+ }
	760	+ catch(Exception e) {
	761	+ isSuccess = false;
	762	+ msg = e.getMessage();
	763	+ }
	764	+
	765	+ modelAndView.addObject("isSuccess", isSuccess);
	766	+ modelAndView.addObject("msg", msg);
	767	+
	768	+ return modelAndView;
	769	+ }
	770	+ */
	771	+
694	772	}

...	...	@@ -22,6 +22,8 @@
22	22	<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%>
23	23	<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
24	24	<%pageContext.setAttribute("crlf", "\r\n"); %>
	25	+<%pageContext.setAttribute("ltChar", "<"); %>
	26	+<%pageContext.setAttribute("gtChar", ">"); %>
25	27	<head>
26	28	<script src="/publish/js/content.js"></script>
27	29	<script type="text/javascript">
...	...	@@ -235,7 +237,11 @@
235	237	<div class="view_cont">
236	238	<div class="cont_in">
237	239	<!-- 엔터적용 -->
238		- <c:out value="${fn:replace(result.nttCn , crlf , '<br/>')}" escapeXml="false" />
	240	+ <c:set var="nttCn1" value="${fn:replace(result.nttCn , crlf , '<br/>')}" />
	241	+ <c:set var="nttCn2" value="${fn:replace(nttCn1 , ltChar , '<')}" />
	242	+ <c:set var="nttCn3" value="${fn:replace(nttCn2 , gtChar , '>')}" />
	243	+ <c:out value="${nttCn3}" escapeXml="false" />
	244	+
239	245	</div>
240	246	<c:if test="${result.atchFileCnt > 0}">
241	247	<c:import url="/cmm/fms/selectBBSFileInfsMjon.do" charEncoding="utf-8">
...	...	@@ -272,7 +278,10 @@
272	278	<div class="answer_title"><i></i><span>RE</span></div>
273	279	<div class="answer_cont">
274	280	<!-- 엔터적용 -->
275		- <c:out value="${fn:replace(resultList.commentCn , crlf , '<br/>')}" escapeXml="false" />
	281	+ <c:set var="commentCn1" value="${fn:replace(resultList.commentCn , crlf , '<br/>')}" />
	282	+ <c:set var="commentCn2" value="${fn:replace(commentCn1 , ltChar , '<')}" />
	283	+ <c:set var="commentCn3" value="${fn:replace(commentCn2 , gtChar , '>')}" />
	284	+ <c:out value="${commentCn3}" escapeXml="false" />
276	285	</div>
277	286	</div>
278	287	</div>

Delete comment