Merge branch 'sowon' into develop

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

@@ -289,7 +289,7 @@ public class TsfReviewService {
 		
 		// 첨부파일
 		for(Review loopReview : reviewList) {
-			loopReview.setRvAtcSq(review.getRvAtcSq());
+			/* loopReview.setRvAtcSq(review.getRvAtcSq()); */
 			loopReview.setReviewAttachList(reviewDao.getReviewAttachList(loopReview));
 			loopReview.setGoodsOptionList(reviewDao.getReviewGoodsOptionList(loopReview));
 		}
@@ -310,12 +310,14 @@ public class TsfReviewService {
 		review.setRegNo(TsfSession.getInfo().getCustNo());
 		review.setUpdNo(TsfSession.getInfo().getCustNo());		
 		review.setConfirmYn("Y");
+		review.setReviewGb("R");
 		reviewDao.updateMypageReview(review);
 		reviewDao.reviewAttachDelete(review);
 		
 		//이미지등록
 		if(!StringUtils.isAllEmpty(review.getOrgFileNmArr())) {
 			review.setConfirmYn("Y");
+			review.setReviewGb("P");
 			ReviewAttach fileReview = new ReviewAttach();
 			fileReview.setRegNo(TsfSession.getInfo().getCustNo());
 			fileReview.setUpdNo(TsfSession.getInfo().getCustNo());

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

@@ -1477,6 +1477,7 @@
 		      ,DATE_FORMAT(ENTRY_DT,'%e') AS ENTRY_DT 
 		FROM TB_PLAN_ENTRY
 		WHERE 1=1 
+		AND DATE_FORMAT(ENTRY_DT,'%Y-%m') IN (SELECT DATE_FORMAT(P.DISP_STDT, '%Y-%m')  FROM TB_PLAN P WHERE PLAN_SQ = #{planSq})
 		AND PLAN_SQ = #{planSq}
 		AND ENTRY_CUST_NO = #{custNo}
 	</select>

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

@@ -298,10 +298,10 @@
 		     OR
 		     FILE_GB = 'M' AND R.CONFIRM_YN = 'Y'  AND  NULLIF(KMC_KEY,'') IS NOT NULL
 		    )
-		<if test="rvAtcSq != null and rvAtcSq != ''">
+		<!-- <if test="rvAtcSq != null and rvAtcSq != ''">
 		ORDER BY FIELD(A.RV_ATC_SQ, #{rvAtcSq})DESC
 		        ,RV_ATC_SQ ASC 
-		</if>
+		</if> -->
 	</select>
 	
 	<!-- 상품평 상품 옵션 목록 -->

src/main/webapp/WEB-INF/views/mob/mypage/MypageReviewCreateFormMob.html

@@ -425,7 +425,7 @@ var reviewUpdate = function() {
 		return;
 	}
 	
-	mcxDialog.confirm('리뷰를 수정하시겠습니까"?', {
+	mcxDialog.confirm('리뷰를 수정하시겠습니까?', {
      cancelBtnText: "취소",
      sureBtnText: "확인",
      sureBtnClick: function(){
@@ -555,8 +555,8 @@ $(function(){
 								"<br/><span class=\"removes\">Removes image</span>" +
 								"</span>").insertBefore(".fileAdd");
 					}else{
-						$("<span class=\"pics\">" +
-								"<img class=\"picsThumbs\" />" +
+						$("<span class=\"pics mov\">" +
+								"<img class=\"picsThumbs\" src=\"" + _kollusMediaUrl + '/poster/' + reviewAttach[i].kmcKey + "\"/>" +
 								"<input type='hidden' name='kmcKeyArr' value='" + reviewAttach[i].kmcKey + "'>" + 
 								"<input type='hidden' name='kufKeyArr' value='" + reviewAttach[i].kufKey + "'>" + 
 								"<br/><span class=\"removes\">Removes image</span>" +

src/main/webapp/WEB-INF/views/web/mypage/MypageReviewCreateFormWeb.html

@@ -512,7 +512,7 @@ var reviewUpdate = function() {
 		return;
 	}
 	
-	mcxDialog.confirm('리뷰를 수정하시겠습니까"?', {
+	mcxDialog.confirm('리뷰를 수정하시겠습니까?', {
         cancelBtnText: "취소",
         sureBtnText: "확인",
         sureBtnClick: function(){
@@ -702,8 +702,8 @@ $(document).ready(function() {
 								"<br/><span class=\"removes\">Removes image</span>" +
 								"</span>").insertAfter("#fileAdd");
 					}else{
-						$("<span class=\"pics\">" +
-								"<img class=\"picsThumbs\" />" +
+						$("<span class=\"pics mov\">" +
+								"<img class=\"picsThumbs\" src=\"" + _kollusMediaUrl + '/poster/' + reviewAttach[i].kmcKey + "\"/>" +
 								"<input type='hidden' name='kmcKeyArr' value='" + reviewAttach[i].kmcKey + "'>" + 
 								"<input type='hidden' name='kufKeyArr' value='" + reviewAttach[i].kufKey + "'>" + 
 								"<br/><span class=\"removes\">Removes image</span>" +

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

@@ -1031,6 +1031,10 @@ $(document).ready( function() {
 	$('.btn_copy').bind('click', function() {
 		copyToClipboard();
 	});
+	
+	$('#replyText').bind('input paste', function() {
+		  $(this).trigger('keyup');
+	});
 
 	//팝업 - 쿠폰사용안내
 	$(document).on('click','#btn_couponInfo_pop',function(e){

src/main/webapp/ux/style24_link.js

@@ -1312,7 +1312,7 @@ function cfMypageReviewDetail(goodsCd, photoYn, reviewSq, rvAtcSq) {
 	var params = '?goodsCd=' + goodsCd;
 	params += '&reviewSq=' + reviewSq;
 	params += '&photoYn=' + photoYn;
-	if (typeof (rvAtcSq) != 'undefined') params += "&rvAtcSq=" + rvAtcSq;
+	if (typeof (rvAtcSq) != 'undefined') params += "&attachSq=" + rvAtcSq;
 	
 	cfnOpenLayer(_PAGE_MYPAGE_REVIEW_DETAIL_LAYER+params, 'layer_review_best');
 }