Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin into develop

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

@@ -1759,63 +1759,64 @@
 
 	<!-- 메인전시 컨텐츠 탭영역 미리보기 리스트 -->
 	<select id="getContentsTabPreviewList" parameterType="Contents" resultType="Contents">
-		/* TsaDisplay.saveContentsGoods */
+		/* TsaDisplay.getContentsTabPreviewList */
 		SELECT 	STR_TITLE3
-				, DISP_STDT
-				, DISP_EDDT
-				, MAX(GROUP1_TITLE) AS GROUP1_TITLE
-				, MAX(GROUP1_BRAND_CD) AS GROUP1_BRAND_CD
-				, MAX(GROUP1_BRAND_NM) AS GROUP1_BRAND_NM
-				, MAX(GROUP1_BRAND_IMG) AS GROUP1_BRAND_IMG
-				, MAX(GROUP2_TITLE) AS GROUP2_TITLE
-				, MAX(GROUP2_BRAND_CD) AS GROUP2_BRAND_CD
-				, MAX(GROUP2_BRAND_NM) AS GROUP2_BRAND_NM
-				, MAX(GROUP2_BRAND_IMG) AS GROUP2_BRAND_IMG
-				, MAX(GROUP3_TITLE) AS GROUP3_TITLE
-				, MAX(GROUP3_BRAND_CD) AS GROUP3_BRAND_CD
-				, MAX(GROUP3_BRAND_NM) AS GROUP3_BRAND_NM
-				, MAX(GROUP3_BRAND_IMG) AS GROUP3_BRAND_IMG
+		      , DISP_STDT
+		      , DISP_EDDT
+		      , MAX(GROUP1_TITLE) AS GROUP1_TITLE
+		      , MAX(GROUP1_BRAND_CD) AS GROUP1_BRAND_CD
+		      , MAX(GROUP1_BRAND_NM) AS GROUP1_BRAND_NM
+		      , MAX(GROUP1_BRAND_IMG) AS GROUP1_BRAND_IMG
+		      , MAX(GROUP2_TITLE) AS GROUP2_TITLE
+		      , MAX(GROUP2_BRAND_CD) AS GROUP2_BRAND_CD
+		      , MAX(GROUP2_BRAND_NM) AS GROUP2_BRAND_NM
+		      , MAX(GROUP2_BRAND_IMG) AS GROUP2_BRAND_IMG
+		      , MAX(GROUP3_TITLE) AS GROUP3_TITLE
+		      , MAX(GROUP3_BRAND_CD) AS GROUP3_BRAND_CD
+		      , MAX(GROUP3_BRAND_NM) AS GROUP3_BRAND_NM
+		      , MAX(GROUP3_BRAND_IMG) AS GROUP3_BRAND_IMG
 		FROM (
-				SELECT  STR_TITLE3
-					, DISP_STDT
-					, DISP_EDDT
-					, CASE WHEN STR_TITLE2 = 1 THEN TITLE END AS GROUP1_TITLE
-					, CASE WHEN STR_TITLE2 = 1 THEN GROUP_CONCAT(BRAND_GROUP_NO SEPARATOR ',') END GROUP1_BRAND_CD
-					, CASE WHEN STR_TITLE2 = 1 THEN GROUP_CONCAT(BRAND_GROUP_NM SEPARATOR ',') END GROUP1_BRAND_NM
-					, CASE WHEN STR_TITLE2 = 1 THEN GROUP_CONCAT(LOGO_FILE_NM SEPARATOR ',') END GROUP1_BRAND_IMG
-					, CASE WHEN STR_TITLE2 = 2 THEN TITLE END AS GROUP2_TITLE
-					, CASE WHEN STR_TITLE2 = 2 THEN GROUP_CONCAT(BRAND_GROUP_NO SEPARATOR ',') END GROUP2_BRAND_CD
-					, CASE WHEN STR_TITLE2 = 2 THEN GROUP_CONCAT(BRAND_GROUP_NM SEPARATOR ',') END GROUP2_BRAND_NM
-					, CASE WHEN STR_TITLE2 = 2 THEN GROUP_CONCAT(LOGO_FILE_NM SEPARATOR ',') END GROUP2_BRAND_IMG
-					, CASE WHEN STR_TITLE2 = 3 THEN TITLE END AS GROUP3_TITLE
-					, CASE WHEN STR_TITLE2 = 3 THEN GROUP_CONCAT(BRAND_GROUP_NO SEPARATOR ',') END GROUP3_BRAND_CD
-					, CASE WHEN STR_TITLE2 = 3 THEN GROUP_CONCAT(BRAND_GROUP_NM SEPARATOR ',') END GROUP3_BRAND_NM
-					, CASE WHEN STR_TITLE2 = 3 THEN GROUP_CONCAT(LOGO_FILE_NM SEPARATOR ',') END GROUP3_BRAND_IMG
-				FROM (
-					SELECT
-							B.STR_TITLE3
-							, B.STR_TITLE2
-							, B.DISP_STDT
-							, B.DISP_EDDT
-							, B.STR_TITLE1     AS TITLE
-							, A.BRAND_GROUP_NO
-							, CASE WHEN A.DISP_NM_LANG = 'EN' THEN A.BRAND_GROUP_ENM
-							ELSE A.BRAND_GROUP_KNM
-							END              AS BRAND_GROUP_NM
-							, A.LOGO_FILE_NM
-							, B.DISP_ORD
-					FROM   TB_BRAND_GROUP A
-						, TB_CONTENTS_PREVIEW B
-					WHERE  A.BRAND_GROUP_NO = B.STR_VAR1
-					AND    A.USE_YN = 'Y'
-					AND	   B.CATE_NO = #{cateNo}
-					AND    B.CONTENTS_LOC = #{contentsLoc}
-					AND    B.DISP_STDT <![CDATA[<=]]> NOW()
-					AND    B.DISP_EDDT <![CDATA[>=]]> NOW()
-					ORDER  BY B.DISP_ORD, B.CONTENTS_SQ
-				) T
-			GROUP BY STR_TITLE2
+		        SELECT  STR_TITLE3
+		              , DISP_STDT
+		              , DISP_EDDT
+		              , CASE WHEN STR_TITLE2 = 1 THEN TITLE END AS GROUP1_TITLE
+		              , CASE WHEN STR_TITLE2 = 1 THEN GROUP_CONCAT(BRAND_GROUP_NO SEPARATOR ',') END GROUP1_BRAND_CD
+		              , CASE WHEN STR_TITLE2 = 1 THEN GROUP_CONCAT(BRAND_GROUP_NM SEPARATOR ',') END GROUP1_BRAND_NM
+		              , CASE WHEN STR_TITLE2 = 1 THEN GROUP_CONCAT(LOGO_FILE_NM SEPARATOR ',') END GROUP1_BRAND_IMG
+		              , CASE WHEN STR_TITLE2 = 2 THEN TITLE END AS GROUP2_TITLE
+		              , CASE WHEN STR_TITLE2 = 2 THEN GROUP_CONCAT(BRAND_GROUP_NO SEPARATOR ',') END GROUP2_BRAND_CD
+		              , CASE WHEN STR_TITLE2 = 2 THEN GROUP_CONCAT(BRAND_GROUP_NM SEPARATOR ',') END GROUP2_BRAND_NM
+		              , CASE WHEN STR_TITLE2 = 2 THEN GROUP_CONCAT(LOGO_FILE_NM SEPARATOR ',') END GROUP2_BRAND_IMG
+		              , CASE WHEN STR_TITLE2 = 3 THEN TITLE END AS GROUP3_TITLE
+		              , CASE WHEN STR_TITLE2 = 3 THEN GROUP_CONCAT(BRAND_GROUP_NO SEPARATOR ',') END GROUP3_BRAND_CD
+		              , CASE WHEN STR_TITLE2 = 3 THEN GROUP_CONCAT(BRAND_GROUP_NM SEPARATOR ',') END GROUP3_BRAND_NM
+		              , CASE WHEN STR_TITLE2 = 3 THEN GROUP_CONCAT(LOGO_FILE_NM SEPARATOR ',') END GROUP3_BRAND_IMG
+		        FROM (
+		            SELECT
+		                  B.STR_TITLE3
+		                  , B.STR_TITLE2
+		                  , B.DISP_STDT
+		                  , B.DISP_EDDT
+		                  , B.STR_TITLE1     AS TITLE
+		                  , A.BRAND_GROUP_NO
+		                  , CASE WHEN A.DISP_NM_LANG = 'EN' THEN A.BRAND_GROUP_ENM
+		                  ELSE A.BRAND_GROUP_KNM
+		                  END              AS BRAND_GROUP_NM
+		                  , A.LOGO_FILE_NM
+		                  , B.DISP_ORD
+		            FROM   TB_BRAND_GROUP A
+		                 , TB_CONTENTS_PREVIEW B
+		            WHERE  A.BRAND_GROUP_NO = B.STR_VAR1
+		            AND    A.USE_YN = 'Y'
+		            AND	   B.CATE_NO = #{cateNo}
+		            AND    B.CONTENTS_LOC = #{contentsLoc}
+		            AND    B.DISP_STDT <![CDATA[<=]]> NOW()
+		            AND    B.DISP_EDDT <![CDATA[>=]]> NOW()
+		            ORDER  BY B.DISP_ORD, B.CONTENTS_SQ
+		        ) T
+		    GROUP BY  T.STR_TITLE3, T.DISP_STDT, T.DISP_EDDT , T.STR_TITLE2, T.TITLE
 		) Z
+		GROUP BY  Z.STR_TITLE3 , Z.DISP_STDT , Z.DISP_EDDT
 	</select>
 
 	<!-- 메인전시 GnbTab 미리보기 삭제 -->

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

@@ -203,7 +203,7 @@
 		  AND A.TARGET_GB = 'G260_10'
 		  AND A.GOODS_GB IN ('G800_10','G800_20')
  		  AND A.DEL_YN = 'N'
-		GROUP BY A.TMTB_GOODS_SQ
+		GROUP BY A.TMTB_GOODS_SQ, B.TMTB_APPLY_GOODS_SQ
 	</select>
 
 	<select id="getMorebetterExceptGoodsList" parameterType="MoreBetterGoods" resultType="MoreBetterGoods">
@@ -233,7 +233,7 @@
 		  AND A.TARGET_GB = 'G260_10'
 		  AND A.GOODS_GB IN ('G800_30')
 		  AND A.DEL_YN = 'N'
-		GROUP BY A.TMTB_GOODS_SQ
+		GROUP BY A.TMTB_GOODS_SQ, B.TMTB_APPLY_GOODS_SQ
 	</select>
 
 	<select id="getMorebetterBurdenList" parameterType="Integer" resultType="MoreBetterBurden">

src/main/webapp/WEB-INF/views/marketing/PlanTemplatePopupForm.html

@@ -2130,11 +2130,11 @@
 	
 	
 $(document).ready(function() {
-		//gagaSn.setContents('#fsrcPcBtm', ''); 
-		//gagaSn.setContents('#fsrcMobileBtm', '');
-		//gagaSn.setContents('#fsrcPcTop', ''); 
-		//gagaSn.setContents('#fsrcMobileTop', '');
-		//gagaSn.setContents('#note', '');
+		gagaSn.setContents('#fsrcPcBtm', ''); 
+		gagaSn.setContents('#fsrcMobileBtm', '');
+		gagaSn.setContents('#fsrcPcTop', ''); 
+		gagaSn.setContents('#fsrcMobileTop', '');
+		gagaSn.setContents('#note', '');
  		var snOptions1 = gagaSn.getToolbarOptions('media');
 		var snOptions2 = gagaSn.getToolbarOptions('media');
 		var snOptions3 = gagaSn.getToolbarOptions('media');