몰메인 수정

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

@@ -220,8 +220,6 @@
 		        </if>
 		        <choose>
 		            <when test='preview != null and preview == "Y"'>
-		        AND    A.DISP_STDT <![CDATA[<=]]> STR_TO_DATE(#{viewDt},'%Y%m%d%H%i%S')
-		        AND    A.DISP_EDDT <![CDATA[>=]]> STR_TO_DATE(#{viewDt},'%Y%m%d%H%i%S')
 		        AND    IFNULL((SELECT DISP_EDDT
 		                       FROM   TB_PLAN
 		                       WHERE  PLAN_SQ = CASE WHEN INSTR(A.STR_VAR1,'/planning/detail/form') > 0 AND INSTR(A.STR_VAR1,'planSq=') > 0 THEN
@@ -245,25 +243,6 @@
 		            <otherwise>
 		        AND    A.DISP_STDT <![CDATA[<=]]> NOW()
 		        AND    A.DISP_EDDT <![CDATA[>=]]> NOW()
-		        AND    IFNULL((SELECT DISP_EDDT
-		                       FROM   TB_PLAN
-		                       WHERE  PLAN_SQ = CASE WHEN INSTR(A.STR_VAR1,'/planning/detail/form') > 0 AND INSTR(A.STR_VAR1,'planSq=') > 0 THEN
-		                                                 (SUBSTR(A.STR_VAR1,INSTR(A.STR_VAR1,'planSq=') + 7,LENGTH(A.STR_VAR1) + 1))
-		                                             ELSE
-		                                                 NULL
-		                                        END
-		                      ),NOW()
-		                     ) <![CDATA[>=]]> NOW()
-		        AND    IFNULL((SELECT DISP_STDT
-		                       FROM   TB_PLAN
-		                       WHERE  PLAN_SQ = CASE WHEN INSTR(A.STR_VAR1,'/planning/detail/form') > 0 AND INSTR(A.STR_VAR1,'planSq=') > 0 THEN
-		                                                 (SUBSTR(A.STR_VAR1,INSTR(A.STR_VAR1,'planSq=') + 7,LENGTH(A.STR_VAR1) + 1))
-		                                             ELSE
-		                                                 NULL
-		                                        END
-		                      ),NOW()
-		                     ) <![CDATA[<=]]> NOW()
-		        ORDER  BY CONTENTS_LOC, DISP_ORD, CONTENTS_SQ
 		            </otherwise>
 		        </choose>
 		       ) A
@@ -462,7 +441,7 @@
 			 , COL_NO
 		FROM TB_MAIN_LAYOUT
 		WHERE CATE_NO = #{cateNo}
-		AND 	CONTENTS_LOC in ('SMM001','SMM002')
+		AND 	CONTENTS_LOC IN ('SMM001','SMM002','SMM005','SMM008')
 		ORDER BY DISP_ORD, COL_NO
 	</select>
 

src/main/webapp/WEB-INF/views/web/display/MallMainFormWeb.html

@@ -36,13 +36,13 @@
 									<th:block th:each="ContentsData, ContentsStat : ${mainLayoutData.ContentsList}">
 										<div class="swiper-slide">
 											<th:block th:if="${ContentsData.imgPath1!=null && ContentsData.imgPath1!=''}">
-												<th:block th:if="${ContentsData.strVar1!=null && ContentsData.strVar1!='' && ContentsData.strVar1!='#' }">
+												<th:block th:if="${ContentsData.strVar1!=null && ContentsData.strVar1!='' }">
 													<div class="txtWrap">
 														<th:block th:if="${ContentsData.strVar5!=null && ContentsData.strVar5!=''}">
 															<p class="vrt_txt" th:if="${ContentsData.strVar5=='P'}" th:text="${ContentsData.planBrandGroupNm}"></p>
 															<p class="vrt_txt" th:if="${ContentsData.strVar5!='P'}">EVENT</p>
 														</th:block>
-														<dl th:class="${ContentsData.strVar7=='BLACK'?'':'w'}" class="w">
+														<dl th:class="${ContentsData.strVar7=='BLACK'?'':'w'}">
 															<dt th:if="${ContentsData.strVar5=='P'}" th:text="${ContentsData.planBrandGroupNm}"></dt>
 															<dt th:if="${ContentsData.strVar5!='P'}" >EVENT</dt>
 															<dd th:text="${ContentsData.strTitle1}"></dd>
@@ -102,6 +102,73 @@
 					</div>
 				</th:block>
 
+				<!-- 5. 프로모션배너 -->
+				<th:block th:if="${contentsLoc=='005'}">
+					<div class="content main_2stage">
+						<div class="cont_head dpnone">
+							<p class="t_c">프로모션배너</p>
+						</div>
+						<div class="cont_body">
+							<th:block th:each="ContentsData, ContentsStat : ${mainLayoutData.ContentsList}">
+								<th:block th:if="${ContentsData.contentsType!=null && ContentsData.contentsType!=''}">
+									<div class="ui_row" th:if="${ContentsData.contentsType=='1'}">
+										<div class="ui_col_6">
+											<a th:href="${ContentsData.strVar1}"><img th:src="${@environment.getProperty('domain.image')+ContentsData.imgPath1}" alt=""></a>
+										</div>
+									</div>
+									<div class="ui_row" th:if="${ContentsData.contentsType=='2'}">
+										<div class="ui_col_6">
+											<a th:href="${ContentsData.strVar1}"><img th:src="${@environment.getProperty('domain.image')+ContentsData.imgPath1}" alt=""></a>
+										</div>
+										<div class="ui_col_6">
+											<a th:href="${ContentsData.strVar2}"><img th:src="${@environment.getProperty('domain.image')+ContentsData.imgPath2}" alt=""></a>
+										</div>
+									</div>
+								</th:block>
+							</th:block>
+						</div>
+						<div class="cont_foot dpnone">
+							CONT-FOOT
+						</div>
+					</div>
+				</th:block>
+
+				<!-- 8. 가로 긴 배너 슬라이드 -->
+				<!-- bnn_1stage -->
+				<th:block th:if="${contentsLoc=='008'}">
+					<div class="content wide main_1stage">
+						<div class="cont_head dpnone">
+							<p class="t_c">배너 슬라이드</p>
+						</div>
+						<div class="cont_body">
+							<div class="swiper-container post-bnnWide">
+								<div class="swiper-wrapper ">
+									<th:block th:each="ContentsData, ContentsStat : ${mainLayoutData.ContentsList}">
+										<div class="swiper-slide">
+											<th:block th:if="${ContentsData.imgPath1!=null && ContentsData.imgPath1!=''}">
+												<a th:href="${ContentsData.strVar1}">
+													<div class="bnnbox" style="background:#e3e7ea;">
+														<div class="txtWrap ">
+															<p th:text="${ContentsData.strTitle1}"></p>
+															<!--<p>아우터 + 이너 단독세일</p>-->	<!-- br 태그 줄바꿈해야함-->
+															<button type="button" class="btn">VIEW MORE</button>
+														</div>
+														<img alt="BLUE-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('domain.image')+ContentsData.imgPath1}">
+													</div>
+												</a>
+											</th:block>
+										</div>
+									</th:block>
+								</div>
+								<div class="swiper-button-prev "></div>
+								<div class="swiper-button-next "></div>
+							</div>
+						</div>
+						<div class="cont_foot dpnone">
+							CONT-FOOT
+						</div>
+					</div>
+				</th:block>
 
 			</th:block>
 		</th:block>
@@ -599,27 +666,6 @@
 			</div>
 		</div>
 
-		<!-- 5. 프로모션배너 -->
-		<div class="content main_2stage">
-			<div class="cont_head dpnone">
-				<p class="t_c">프로모션배너</p>
-			</div>
-			<div class="cont_body">
-				<div class="ui_row">
-					<div class="ui_col_6">
-						<a href="#none"><img src="/images/pc/thumb/bnn_2stage1.jpg" alt=""></a>
-					</div>
-					<div class="ui_col_6">
-						<a href="#none"><img src="/images/pc/thumb/bnn_2stage2.jpg" alt=""></a>
-					</div>
-				</div>
-			</div>
-			<div class="cont_foot dpnone">
-				CONT-FOOT
-			</div>
-		</div>
-
-
 		<!-- 6. 타임딜 : 슬라이드 -->
 		<div class="content wide main_deal">
 			<div class="cont_head">
@@ -1045,48 +1091,7 @@
 		</div>
 
 
-		<!-- 8. 가로 긴 배너 슬라이드 -->
-		<!-- bnn_1stage -->
-		<div class="content wide main_1stage">
-			<div class="cont_head dpnone">
-				<p class="t_c">배너 슬라이드</p>
-			</div>
-			<div class="cont_body">
-				<div class="swiper-container post-bnnWide">
-					<div class="swiper-wrapper ">
-						<div class="swiper-slide">
-							<a href="#none">
-								<div class="bnnbox" style="background:#e3e7ea;">
-									<div class="txtWrap ">
-										<p>TBJ 가을 신상</p>
-										<p>아우터 + 이너 단독세일</p>
-										<button type="button" class="btn">VIEW MORE</button>
-									</div>
-									<img alt="BLUE-a" class=" vLHTC pd_img" src="/images/pc/thumb/bnn_1stage.jpg">
-								</div>
-							</a>
-						</div>
-						<div class="swiper-slide">
-							<a href="#none">
-								<div class="bnnbox" style="background:#eef1f3;">
-									<div class="txtWrap ">
-										<p>TBJ 가을 신상</p>
-										<p>아우터 + 이너 단독세일</p>
-										<button type="button" class="btn">VIEW MORE</button>
-									</div>
-									<img alt="BLUE-a" class=" vLHTC pd_img" src="/images/pc/thumb/bnn_1stage.jpg">
-								</div>
-							</a>
-						</div>
-					</div>
-					<div class="swiper-button-prev "></div>
-					<div class="swiper-button-next "></div>
-				</div>
-			</div>
-			<div class="cont_foot dpnone">
-				CONT-FOOT
-			</div>
-		</div>
+
 
 
 		<!-- 9. MD추천 스타일 -->