Merge remote-tracking branch 'origin/csh9191' into card007

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

@@ -177,7 +177,7 @@
 		AND CASE
 			WHEN TCHP.REVIEW_SQ IS NULL THEN 1
 			WHEN TCHP.REVIEW_SQ IS NOT NULL AND TR.REVIEW_SQ IS NOT NULL THEN 1
-		END > 0		
+		END <![CDATA[>]]> 0		
 		AND TCHP.OCCUR_GB IN ('G069_12','G069_13','G069_20','G069_30','G069_40','G069_42','G069_90','G069_99')
 		AND TCHP.PNT_UPLOAD_STAT = 'G070_30'
 		AND DATE_FORMAT(TCHP.UPD_DT,'%Y%m') = #{searchDt}

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

@@ -97,6 +97,23 @@
 		// Select this year month
 		var checkYm = year + "" + month;
 		
+		// 작년
+// 		for(var i = 1;i <= 12; i++){
+// 			if(i < 10 && i != month){
+// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearAgo + "" + 0 + i +"'>"+ oneYearAgo + "년" + " " + i + "월" +"</li>");
+// 			}
+// 			else if(i < 10 && i == month){
+// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearAgo + "" + 0 + i +"'>" + oneYearAgo + "년" + " " + i + "월" +"</li>");
+// 			}
+// 			else if(i > 9 && i != month){
+// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearAgo + "" + i +"'>"+ oneYearAgo + "년" + " " + i + "월" +"</li>");
+// 			}
+// 			else if(i > 9 && i == month){
+// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearAgo + "" + i +"'>"+ oneYearAgo + "년" + " " + i + "월" +"</li>");
+// 			}
+// 		}
+		
+		// 이번년도
 		for(var i = 1;i <= 12; i++){
 			if(i < 10 && i != month){
 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + 0 + i +"'>"+ year + "년" + " " + i + "월" +"</li>");
@@ -113,6 +130,22 @@
 			}
 		}
 		
+		// 내년
+// 		for(var i = 1;i <= 12; i++){
+// 			if(i < 10 && i != month){
+// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearLater + "" + 0 + i +"'>"+ oneYearLater + "년" + " " + i + "월" +"</li>");
+// 			}
+// 			else if(i < 10 && i == month){
+// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearLater + "" + 0 + i +"'>" + oneYearLater + "년" + " " + i + "월" +"</li>");
+// 			}
+// 			else if(i > 9 && i != month){
+// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearLater + "" + i +"'>"+ oneYearLater + "년" + " " + i + "월" +"</li>");
+// 			}
+// 			else if(i > 9 && i == month){
+// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearLater + "" + i +"'>"+ oneYearLater + "년" + " " + i + "월" +"</li>");
+// 			}
+// 		}
+		
 	// 날짜변경 이벤트
 	var fnChangeDate = function(parm) {