Merge branch 'sowon' into develop

src/main/java/com/style24/front/biz/dao/TsfPlanningDao.java

@@ -170,6 +170,16 @@ public interface TsfPlanningDao {
 	 * @date 2021. 3. 22
 	 */
 	Collection<Plan> getPlanImageInfo(Plan plan);
+	
+	/**
+	 * 기획전 템플릿 유의사항
+	 *
+	 * @param 기획전 번호
+	 * @return
+	 * @author sowon
+	 * @date 2021. 5. 26
+	 */
+	Collection<Plan> getPlanNoticeInfo(Plan plan);
 
 	/**
 	 * 기획전 템플릿 상품 1열

src/main/java/com/style24/front/biz/service/TsfPlanningService.java

@@ -260,6 +260,18 @@ public class TsfPlanningService {
 	public Collection<Plan> getPlanImageInfo(Plan plan) {
 		return planningDao.getPlanImageInfo(plan);
 	}
+	
+	/**
+	 * 기획전 템플릿 유의사항
+	 *
+	 * @param
+	 * @return
+	 * @author sowon
+	 * @since 2021. 5. 26
+	 */
+	public Collection<Plan> getPlanNoticeInfo(Plan plan) {
+		return planningDao.getPlanNoticeInfo(plan);
+	}
 
 	/**
 	 * 기획전 템플릿 상품

src/main/java/com/style24/front/biz/web/TsfPlanningController.java

@@ -206,6 +206,9 @@ public class TsfPlanningController extends TsfBaseController {
 		// 이미지
 		mav.addObject("imageInfo", planningService.getPlanImageInfo(plan));
 		
+		// 유의사항
+		mav.addObject("noticeInfo", planningService.getPlanNoticeInfo(plan));
+		
 		plan.setFrontGb(TsfSession.getFrontGb());
 		// 상품1열 전시
 		plan.setTmplType("G082_50");

src/main/java/com/style24/persistence/mybatis/shop/TsfPlanning.xml

@@ -869,6 +869,26 @@
 		 AND PC.DISP_YN = 'Y'
 	</select>
 	
+	<select id="getPlanNoticeInfo" parameterType="Plan" resultType="Plan">
+		/* TsfPlanning.getPlanNoticeInfo*/
+		SELECT PC.PLAN_CONT_SQ
+		      ,PC.PLAN_SQ
+		      ,PC.TMPL_TYPE
+		      ,PC.TITLE
+		      ,PC.DISP_YN
+		      ,PC.DISP_ORD
+		      ,PCI.PLAN_CONT_ITEM_SQ
+		      ,PCI.ITEM_VAL
+		      ,PCI.LINK_URL
+		      ,PCI.LINK_OPEN_GB
+		      ,PCI.DISP_ORD
+		FROM TB_PLAN_CONTENTS PC INNER JOIN TB_PLAN_CONTENTS_ITEM PCI ON PC.PLAN_CONT_SQ = PCI.PLAN_CONT_SQ 
+		WHERE 1=1
+		 AND PC.TMPL_TYPE = 'G082_60'
+		 AND PC.PLAN_SQ = #{planSq}
+		 AND PC.DISP_YN = 'Y'
+	</select>
+	
 	<!-- 기획전 상품  전시 -->
 	<select id="getPlanGoodsDisplayList" parameterType="Plan" resultType="Plan">
 		/* TsfPlanning.getPlanGoodsDisplayList */

src/main/webapp/WEB-INF/views/mob/planning/PlanningDetailFormMob.html

@@ -31,7 +31,7 @@
 					</div>
 				</div>
 				<div class="inner wide">
-					<div class="promotion_visual type1" th:if="${fsrcInfoTop != null}" th:utext="${#strings.replace(#strings.replace(fsrcInfoTop.fsrcMob,'&amplt;','<'),'&ampgt;','>')}">>
+					<div class="promotion_visual type1" th:if="${fsrcInfoTop != null}" th:utext="${#strings.replace(#strings.replace(fsrcInfoTop.fsrcMob,'&amplt;','<'),'&ampgt;','>')}">
 					</div>
 				</div>
 				<th:block th:each="a, template : ${templateOrd}">
@@ -69,9 +69,15 @@
 						<div class="inner" th:id="${a.tmplType + a.planContSq}">
                     	</div>
 					</th:block>
+					<th:block th:if="${a.tmplType == 'G082_60'}">
+						<div class="inner" th:id="${a.tmplType}">
+						</div>
+					</th:block>
 				</th:block>
-				
-				<div class="inner" th:if="${fsrcInfoBtm != null}" th:utext="${#strings.replace(#strings.replace(fsrcInfoBtm.fsrcMob,'&amplt;','<'),'&ampgt;','>')}"></div>
+				<div class="inner wide">
+					<div class="promotion_visual type1" th:if="${fsrcInfoBtm != null}"  th:utext="${#strings.replace(#strings.replace(fsrcInfoBtm.fsrcMob,'&amplt;','<'),'&ampgt;','>')}">
+					</div>
+				</div>
 				<div class="inner" th:if="${planInfo.pollSq != null}">
 					<div class="dp_btn_area">
 						<div class="btn_wrap">
@@ -267,6 +273,7 @@ let review = [[${reviewInfo}]];
 let coupon = [[${couponInfo}]];
 let plan = [[${planInfo}]];
 let image = [[${imageInfo}]];
+let notice = [[${noticeInfo}]];
 let goods1 = [[${goods1Info}]];
 let goods2 = [[${goods2Info}]];
 let goods4 = [[${goods4Info}]];
@@ -450,6 +457,25 @@ var fnReplySave = function() {
 	})
 }
 
+if (notice.length>0) {
+	var html = '';
+	
+	html += '<div class="announce_txt">';
+	html += '	<div class="note_txt">';
+	html += '		<img src="/images/mo/ico_content_find03.png" alt="유의사항">';
+	html += '		<p>유의사항</p>';
+	html += '	</div>';
+	html += '	<div class="announce_list">';
+	html += '		<ul>';
+	$.each(notice, function(idx, item)  {
+	html += '			<li>' +item.itemVal+ '</li>';
+	});
+	html += '		</ul>';
+	html += '	</div>';
+	html += '</div>';
+	
+	$("#G082_60").append(html);
+}
 
 if(planCornerList.length>0){
 	

src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -107,7 +107,11 @@
 				<th:block th:if="${a.tmplType == 'G082_52'}">
 						<div class="content dp_special" th:id="${a.tmplType + a.planContSq}"></div>
 				</th:block>
+				<th:block th:if="${a.tmplType == 'G082_60'}">
+						<div class="content dp_announce" th:id="${a.tmplType}"></div>
+				</th:block>
 			</th:block>
+			
 			<div class="coner_item01" th:if="${fsrcInfoBtm != null}" th:utext="${#strings.replace(#strings.replace(fsrcInfoBtm.fsrcPc,'&amplt;','<'),'&ampgt;','>')}"></div>
 			<div class="coner_item01" th:if="${planInfo.pollSq != null}">
 				<div class="content dp_btn_area">
@@ -244,6 +248,7 @@ let review = [[${reviewInfo}]];
 let coupon = [[${couponInfo}]];
 let plan = [[${planInfo}]];
 let image = [[${imageInfo}]];
+let notice = [[${noticeInfo}]];
 let goods1 = [[${goods1Info}]];
 let goods2 = [[${goods2Info}]];
 let goods4 = [[${goods4Info}]];
@@ -253,6 +258,35 @@ let replyCount = [[${replyCount}]];
 let replyAttachList = [[${replyAttachList}]];
 let planCornerGoodsList = [[${planCornerGoodsList}]];
 let planCornerList = [[${planCornerList}]];
+
+if(notice.length>0){
+	var html = '';
+	
+	html += '    <div class="cont_head">';
+	html += '        <div>';
+	html += '            <h4>유의사항</h4>';
+	html += '        </div>';
+	html += '    </div>';
+	html += '    <div class="cont_body">';
+	html += '        <div class="announce_txt">';
+	html += '            <div class="note_txt">';
+	html += '                <img src="/images/pc/ico_content_find.png" alt="유의사항">';
+	html += '                <p>유의사항</p>';
+	html += '            </div>';
+	html += '            <div class="announce_list">';
+	html += '                <ul>';
+	$.each(notice, function(idx, item)  {
+		html += '				<li>' +item.itemVal+ '</li>';
+	});
+	html += '                </ul>';
+	html += '            </div>';
+	html += '        </div> ';
+	html += '    </div>';
+
+	$("#G082_60").append(html);
+}
+
+
 if(planCornerList.length>0){
 	var html = '';