Просмотр исходного кода

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

tsit05 4 лет назад
Родитель
Сommit
c5f42970a3
1 измененных файлов с 14 добавлено и 16 удалено
  1. 14 16
      src/main/java/com/style24/persistence/mybatis/shop/TsaReview.xml

+ 14 - 16
src/main/java/com/style24/persistence/mybatis/shop/TsaReview.xml

@@ -15,7 +15,7 @@
 		<if test="goodsCds != null and goodsCds != ''">
 		AND    (
 		        <foreach collection="goodsCds" item="item" index="index" separator="or">
-		        R.GOODS_CD LIKE CONCAT(UPPER(#{item}),'%') 
+		        R.GOODS_CD LIKE CONCAT(UPPER(#{item}),'%')
 		        </foreach>
 		       )
 		</if>
@@ -43,7 +43,7 @@
 		    </if>
 		</if>
 	</select>
-	
+
 	<!--상품평 목록  -->
 	<select id="getReviewList" parameterType="Review" resultType="Review">
 		/* TsaReview.getReviewList */
@@ -77,8 +77,6 @@
 		     , C.CUST_NM                                                  /*고객명*/
 		     , R.ORD_NO                                                   /*주문번호*/
 		     , R.ORD_DTL_NO                                               /*주문상세번호*/
-		     , R.REVIEW_TITLE                                             /*상품평제목*/
-		     , R.REVIEW_CONTENT                                           /*상품평내용*/
 		     , R.SCORE                                                    /*구매평점*/
 		     , R.HEIGHT                                                   /*키*/
 		     , R.WEIGHT                                                   /*몸무게*/
@@ -97,7 +95,7 @@
 		     , R.BPNT_GIVE_YN                                             /*베스트포인트지급여부*/
 		     , R.CONFIRM_YN                                               /*확인여부*/
 		     , FN_GET_USER_NM(R.CONFIRM_UNO)            AS CONFIRM_UNM    /*확인자명*/
-		     , DATE_FORMAT(R.CONFIRM_DT,'%Y%m%d%H%i%S') AS CONFIRM_DT     /*확인일시*/ 
+		     , DATE_FORMAT(R.CONFIRM_DT,'%Y%m%d%H%i%S') AS CONFIRM_DT     /*확인일시*/
 		     , R.ADM_RPL                                                  /*관리자댓글*/
 		     , FN_GET_USER_NM(R.ADM_RPL_REG_NO)         AS ADM_RPL_REG_NM /*관리자댓글작성자명*/
 		     , DATE_FORMAT(R.ADM_RPL_DT,'%Y%m%d%H%i%S') AS ADM_RPL_DT     /*관리자댓글작성일시*/
@@ -110,7 +108,7 @@
 		<if test="goodsCds != null and goodsCds != ''">
 		AND    (
 		        <foreach collection="goodsCds" item="item" index="index" separator="or">
-		        R.GOODS_CD LIKE CONCAT(UPPER(#{item}),'%') 
+		        R.GOODS_CD LIKE CONCAT(UPPER(#{item}),'%')
 		        </foreach>
 		       )
 		</if>
@@ -140,7 +138,7 @@
 		ORDER  BY R.REG_DT DESC
 		LIMIT #{pageable.limitStartRow}, #{pageable.pageSize}
 	</select>
-	
+
 	<!--상품평 정보 -->
 	<select id="getReview" parameterType="Integer" resultType="Review">
 		/* TsaReview.getReview */
@@ -177,7 +175,7 @@
 		     , R.BPNT_GIVE_YN                                                  /*베스트포인트지급여부*/
 		     , R.CONFIRM_YN                                                    /*확인여부*/
 		     , FN_GET_USER_NM(R.CONFIRM_UNO)                 AS CONFIRM_UNM    /*확인자명*/
-		     , DATE_FORMAT(R.CONFIRM_DT,'%Y-%m-%d %H:%i:%S') AS CONFIRM_DT     /*확인일시*/ 
+		     , DATE_FORMAT(R.CONFIRM_DT,'%Y-%m-%d %H:%i:%S') AS CONFIRM_DT     /*확인일시*/
 		     , R.ADM_RPL                                                       /*관리자댓글*/
 		     , FN_GET_USER_NM(R.ADM_RPL_REG_NO)              AS ADM_RPL_REG_NM /*관리자댓글작성자명*/
 		     , DATE_FORMAT(R.ADM_RPL_DT,'%Y-%m-%d %H:%i:%S') AS ADM_RPL_DT     /*관리자댓글작성일시*/
@@ -199,7 +197,7 @@
 		AND    R.GOODS_CD = G.GOODS_CD
 		AND    R.REVIEW_SQ = #{reviewSq}
 	</select>
-	
+
 	<!--상품평 첨부파일 목록 -->
 	<select id="getReviewAttachList" parameterType="Integer" resultType="ReviewAttach">
 		/* TsaReview.getReviewAttachList */
@@ -215,7 +213,7 @@
 		AND    DEL_YN = 'N' /*삭제안된넘*/
 		ORDER  BY FILE_GB DESC, RV_ATC_SQ
 	</select>
-	
+
 	<!-- 상품평 관리자댓글 저장 -->
 	<update id="updateReviewUserReply" parameterType="Review">
 		/* TsaReview.updateReviewUserReply */
@@ -228,7 +226,7 @@
 		WHERE  REVIEW_SQ = #{reviewSq}
 		AND    RPL_CFM_YN = 'N' /*고객이 관리자댓글 확인을 안한넘*/
 	</update>
-	
+
 	<!-- 동영상상품평포인트 생성-->
 	<insert id="createVideoReviewPoint" parameterType="Review" keyProperty="custPntSq">
 		/* TsaReview.createVideoReviewPoint */
@@ -261,7 +259,7 @@
 		AND    CONFIRM_YN = 'N' /*동영상노출처리안한넘*/
 		AND    PNT_GIVE_STAT = 'G043_10' /*포인트지급예정 상태*/
 	</insert>
-	
+
 	<!-- 동영상상품평포인트이력 생성-->
 	<insert id="createVideoReviewPointHistory" parameterType="Review">
 		/* TsaReview.createVideoReviewPointHistory */
@@ -304,7 +302,7 @@
 		AND    CONFIRM_YN = 'N' /*동영상노출처리안한넘*/
 		AND    PNT_GIVE_STAT = 'G043_10' /*포인트지급예정 상태*/
 	</insert>
-	
+
 	<!-- 상품평 동영상 노출 처리 -->
 	<update id="updateVideoReviewDisplay" parameterType="Review">
 		/* TsaReview.updateVideoReviewDisplay */
@@ -318,7 +316,7 @@
 		AND    CONFIRM_YN = 'N' /*동영상노출처리안한넘*/
 		AND    PNT_GIVE_STAT = 'G043_10' /*포인트지급예정 상태*/
 	</update>
-	
+
 	<!-- 베스트상품평포인트 생성-->
 	<insert id="createBestReviewPoint" parameterType="Review" keyProperty="custPntSq">
 		/* TsaReview.createBestReviewPoint */
@@ -392,7 +390,7 @@
 		WHERE  REVIEW_SQ = #{reviewSq}
 		AND    BEST_YN = 'N' /*베스트상품이아닌넘. 베스트여부 값이 변경될 수도 있으므로 체크로직 추가*/
 	</insert>
-	
+
 	<!-- 베스트상품평 선정 처리 -->
 	<update id="updateBestReviewSelection" parameterType="Review">
 		/* TsaReview.updateBestReviewSelection */
@@ -405,5 +403,5 @@
 		WHERE  REVIEW_SQ = #{reviewSq}
 		AND    BEST_YN = 'N' /*베스트상품이아닌넘. 베스트여부 값이 변경될 수도 있으므로 체크로직 추가*/
 	</update>
-	
+
 </mapper>