Merge branch 'bin2107' into develop

src/main/java/com/style24/persistence/domain/Contents.java

@@ -51,6 +51,7 @@ public class Contents extends TscBaseDomain {
     private String multiContentsYn;
 
     private String goodsCd;
+    private String goodsArr;
 
     List<Contents> dataList;
 

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

@@ -1266,49 +1266,56 @@
 	<!-- 컨텐츠 미리보기 리스트 조회 -->
 	<select id="getContentsPreviewList" parameterType="Contents" resultType="Contents">
 		/* TsaDisplay.getContentsPreviewList */
-		SELECT PRE_CONTENTS_SQ
-			 , CATE_NO
-			 , CONTENTS_LOC
-			 , CONTENTS_TYPE
-			 , DISP_STDT
-			 , DISP_EDDT
-			 , DISP_ORD
-			 , IMG_PATH1
-			 , IMG_PATH2
-			 , IMG_PATH3
-			 , IMG_PATH4
-			 , IMG_PATH5
-			 , IMG_PATH6
-			 , IMG_PATH7
-			 , IMG_PATH8
-			 , STR_VAR1
-			 , STR_VAR2
-			 , STR_VAR3
-			 , STR_VAR4
-			 , STR_VAR5
-			 , STR_VAR6
-			 , STR_VAR7
-			 , STR_VAR8
-			 , STR_TITLE1
-			 , STR_TITLE2
-			 , STR_TITLE3
-			 , STR_TITLE4
-		     , SUB_TEXT1
-			 , SUB_TEXT2
-			 , SUB_TEXT3
-			 , SUB_TEXT4
-			 , BRAND_GROUP_NO
-			 , BRAND_GROUP_IMG
-			 , MD_TITLE
-			 , USE_YN
-			 , REG_NO
-			 , REG_DT
-			 , UPD_NO
-			 , UPD_DT
-		FROM TB_CONTENTS_PREVIEW
-		WHERE CATE_NO = #{cateNo}
-		  AND CONTENTS_LOC = #{contentsLoc}
-		ORDER BY DISP_ORD
+		SELECT A.PRE_CONTENTS_SQ
+			 , A.CATE_NO
+			 , A.CONTENTS_LOC
+			 , A.CONTENTS_TYPE
+			 , A.DISP_STDT
+			 , A.DISP_EDDT
+			 , A.DISP_ORD
+			 , A.IMG_PATH1
+			 , A.IMG_PATH2
+			 , A.IMG_PATH3
+			 , A.IMG_PATH4
+			 , A.IMG_PATH5
+			 , A.IMG_PATH6
+			 , A.IMG_PATH7
+			 , A.IMG_PATH8
+			 , A.STR_VAR1
+			 , A.STR_VAR2
+			 , A.STR_VAR3
+			 , A.STR_VAR4
+			 , A.STR_VAR5
+			 , A.STR_VAR6
+			 , A.STR_VAR7
+			 , A.STR_VAR8
+			 , A.STR_TITLE1
+			 , A.STR_TITLE2
+			 , A.STR_TITLE3
+			 , A.STR_TITLE4
+		     , A.SUB_TEXT1
+			 , A.SUB_TEXT2
+			 , A.SUB_TEXT3
+			 , A.SUB_TEXT4
+			 , A.BRAND_GROUP_NO
+			 , A.BRAND_GROUP_IMG
+			 , A.MD_TITLE
+			 ,(SELECT 	GROUP_CONCAT(B.GOODS_CD ORDER BY B.DISP_ORD SEPARATOR ',')
+			    FROM	TMP_CONTENTS_GOODS B
+			   WHERE	B.CATE_NO = A.CATE_NO
+				 AND	B.CONTENTS_LOC = A.CONTENTS_LOC
+				 AND	B.PRE_CONTENTS_SQ = A.DISP_ORD
+				 AND	B.CATE_NO = #{cateNo}
+				 AND	B.CONTENTS_LOC = #{contentsLoc}) AS GOODS_ARR
+			 , A.USE_YN
+			 , A.REG_NO
+			 , A.REG_DT
+			 , A.UPD_NO
+			 , A.UPD_DT
+		FROM TB_CONTENTS_PREVIEW A
+		WHERE A.CATE_NO = #{cateNo}
+		  AND A.CONTENTS_LOC = #{contentsLoc}
+		ORDER BY A.DISP_ORD
 	</select>
 
 	<!-- 메인전시 컨텐츠 미리보기 삭제 -->

src/main/webapp/WEB-INF/views/display/MainMultiContentsPopupForm.html

@@ -138,6 +138,9 @@
 					}
 				}
 			}
+			if(!gagajf.isNull(result[i].goodsArr)){
+				html += fnAddGoodsRow(result[i].goodsArr);
+			}
 			html += '</tbody></table>';
 		}
 		$("#multiPopSortable").append(html);
@@ -285,6 +288,7 @@
 	var fnReloadIdx = function (){
 		$(".tableTest").each(function(i){
 			$(this).attr('id','tabTable'+i);
+			$(this).find("input[name=dispOrd]").val(i+1);
 			//console.log($(this).attr('id'));
 		});
 	}
@@ -612,11 +616,12 @@
 	var goodsIdx = 0;
 	var fnAddGoodsRow = function (param){
 		var addRow = "goodsListTd"+goodsIdx;
-		//console.log('addRowTd::'+addRowTd);
-		console.log('addRow::'+addRow);
+		//console.log('addRow::'+addRow);
+
 		var html = '<tr name="goodsRow">';
 		html += '<th>상품추가<br><button type="button" class="btn btn-base btn-lg" onclick="fnDeleteTrRow(this);">삭제</button>';
 		html += '<br><button type="button" class="btn btn-base btn-lg" onclick="fnSearchGoods(\''+addRow+'\');">상품조회</button>';
+		html += '<input type="hidden" name="goodsArrTest" id="goodsArrTest" value="'+goodsArr+'">';
 		html += '</th>';
 		html += '<td colspan="3">';
 		//html += '<table style="border-style: solid;border-color: #ac2925; width:100%; height:20px;">';
@@ -628,6 +633,20 @@
 		//html += '<thead>';
 		html += '<div class="sortableWrap" data-unit="7" style="overflow-y:scroll;">';
 		html += '<div class="itemWrap" id="goodsListTd'+goodsIdx+'">';
+		if(typeof param!='object'){
+			var goodsArr = [];
+			goodsArr = param;
+			// 여기서 부터 시작! 상품불러오는거 똑같이 html 추가해서 체크
+			// +) 저장할때 TMP_CONTENTS_GOODS 에 상품코드, 상품명, 상품이미지경로 추가해서 3개다 불러와서 데이터 뿌릴수 있게
+			$.each(goodsArr.split(','), function(i){
+				console.log(i+':::>>>>>>>>>>>>>'+goodsArr.split(',')[i]);
+				goodsCd = goodsArr.split(',')[i];
+				html += '<ul id="goodsUl'+i+'" class="item ui-state-default goodsClass" style="min-height:130px;" ';
+				html += '">';
+				html += '<li class="no" name="goodsCdLi"><span>'+goodsCd+'</span></li>';
+				html += '</ul>';
+			});
+		}
 		html += '</div>';
 		html += '</div>';
 		//html += '</thead>';
@@ -641,13 +660,51 @@
 			}
 			goodsIdx++;
 			$(param).closest("table").find("tbody").append(html);
+
 		}else{
 			goodsIdx++;
 			return html;
 		}
+
 		fnReloadIdx();
 	}
 
+	var fnShowGoodsList = function (obj){
+		console.log('18181818');
+		var tableNm = obj;
+		var goodsCd1 = $("#"+tableNm).find("input[name=goodsArrTest]").val();
+		console.log('goodsCd1>>>'+goodsCd1);
+		//$("#"+tableNm);
+		var goodsCd = '';
+		$.each(goodsCd1.split(','), function(i){
+			console.log(i+':::>>>>>>>>>>>>>'+goodsCd1.split(',')[i]);
+			goodsCd = goodsCd1.split(',')[i];
+			html += '<ul id="goodsUl'+i+'" class="item ui-state-default goodsClass" style="min-height:130px;" ';
+			html += '">';
+			html += '<li class="no" name="goodsCdLi"><span>'+goodsCd+'</span></li>>';
+			html += '</ul>';
+			$("#goodsListTd0").append(html);
+			i++;
+		});
+	}
+
+	var fnShowGoodsList2 = function (param){
+		console.log('goodsArr>>>'+param);
+		var html = '';
+		var goodsCd = '';
+		$.each(param.split(','), function(i){
+			console.log(i+':::>>>>>>>>>>>>>'+param.split(',')[i]);
+			goodsCd = param.split(',')[i];
+			html += '<ul id="goodsUl'+i+'" class="item ui-state-default goodsClass" style="min-height:130px;" ';
+			html += '">';
+			html += '<li class="no" name="goodsCdLi"><span>'+goodsCd+'</span></li>>';
+			html += '</ul>';
+			$("#goodsListTd0").append(html);
+			i++;
+		});
+
+	}
+
 	/**
 	 * 상품조회
 	 */
@@ -736,7 +793,7 @@
 		}
 		$("#multiPopSortable").sortable({
 			stop: function(event, ui) {
-				//fnReloadIdx();
+				fnReloadIdx();
 			}
 		});
 		$("#multiPopSortable").disableSelection();