설문, 출석, 마이페이지 수정

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

@@ -49,7 +49,6 @@ public class Poll extends TscBaseDomain{
 	private String pollQval10;		// 투표문항참고값10
 	private int dispOrd;		// 표시 순서
 	private String pollQtypeNm;	// 문제유형 이름
-	private String planNm;			// 이벤트명
 	//poll_answer
 	private Integer ansCustNo;		// 투표회원번호
 	private String dummy;			// 임시 (고객 답변)
@@ -67,7 +66,10 @@ public class Poll extends TscBaseDomain{
 	private String voteDt;			// 투표일시
 	
 	private Integer custNo;			//고객번호
-	
+	private String mainPimg;
+	private String mainMimg;
+	private Integer planSq;
+	private String planNm;
 	
 	
 	private String pollQsq_10;

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

@@ -1255,6 +1255,7 @@
 		      ,TP.FST_COM_YN 
 		      ,TP.PARTI_CNT 
 		      ,TP.POLL_CONTENT 
+		      ,P.MAIN_PIMG
 		FROM TB_PLAN P INNER JOIN TB_POLL TP ON P.POLL_SQ = TP.POLL_SQ 
 		WHERE 1=1
 		  AND P.PLAN_SQ = #{planSq}

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

@@ -114,7 +114,7 @@
 		                  WHEN 'G069_13' THEN G.GOODS_NM
 		                 END                                          AS  OCCUR_DTL_DESC
 		           , SUM(CPH.PNT_AMT)
-		           , CPH.UPD_DT AS PNT_UPLOAD_DT
+		           , DATE_FORMAT(CPH.UPD_DT, '%Y.%m.%d %H:%i:%S') AS PNT_UPLOAD_DT
 		      FROM TB_CUST_POINT_HST CPH
 		      LEFT JOIN TB_ORDER_DETAIL OD
 		      ON  CPH.ORD_NO = OD.ORD_NO
@@ -210,7 +210,7 @@
 		                  WHEN 'G069_13' THEN G.GOODS_NM
 		                 END                                          AS  OCCUR_DTL_DESC
 		           , SUM(CPH.PNT_AMT)
-		           , CPH.UPD_DT AS PNT_UPLOAD_DT
+		           , DATE_FORMAT(CPH.UPD_DT, '%Y.%m.%d %H:%i:%S') AS PNT_UPLOAD_DT
 		      FROM TB_CUST_POINT_HST CPH
 		      LEFT JOIN TB_ORDER_DETAIL OD
 		      ON  CPH.ORD_NO = OD.ORD_NO
@@ -305,7 +305,7 @@
 		                  WHEN 'G069_13' THEN G.GOODS_NM
 		                 END                                          AS  OCCUR_DTL_DESC
 		           , SUM(CPH.PNT_AMT)
-		           , CPH.UPD_DT AS PNT_UPLOAD_DT
+		           , DATE_FORMAT(CPH.UPD_DT, '%Y.%m.%d %H:%i:%S') AS PNT_UPLOAD_DT
 		      FROM TB_CUST_POINT_HST CPH
 		      LEFT JOIN TB_ORDER_DETAIL OD
 		      ON  CPH.ORD_NO = OD.ORD_NO

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

@@ -142,8 +142,8 @@ var fnGetPointTableInfo = function(param) {
 	$("#pointAjaxList").html('');
 	let tag = "";
 	if(param != null && param.length > 0){
+		tag += '<ul>';
 		$.each(param, function(idx,item){
-			tag += '<ul>';
 			tag += ' <li>';
 			tag += ' 	<div>';
 			if(item.pntAmt > 0){
@@ -168,8 +168,8 @@ var fnGetPointTableInfo = function(param) {
 			}
 			tag += ' 	</div>';
 			tag += ' </li>';
-			tag += '</ul>';
 		});
+		tag += '</ul>';
 		$("#pointAjaxList").html(tag);
 	}else{
 		$('.nodata').show();

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

@@ -44,8 +44,8 @@
 				<div class="inner wide">
 					<div class="tabWrap">
 						<ul class="tabIndex">
-							<li id="completeReview"><a href="javascript:void(0);">작성 가능한 리뷰<span class="count" th:text="${#numbers.formatInteger(completeReviewCount,0,'COMMA')}"></span></a></li>
-							<li id="alreadyReview"><a href="javascript:void(0);" >내가 쓴 리뷰<span class="count" th:text="${#numbers.formatInteger(alreadyReviewCount,0,'COMMA')}" ></span></a></li>
+							<li id="completeReview"><a href="javascript:void(0);">작성 가능한 리뷰<span class="count" id="comReview" th:text="${#numbers.formatInteger(completeReviewCount,0,'COMMA')}"></span></a></li>
+							<li id="alreadyReview"><a href="javascript:void(0);" >내가 쓴 리뷰<span class="count" id="alrReview" th:text="${#numbers.formatInteger(alreadyReviewCount,0,'COMMA')}" ></span></a></li>
 						</ul>
 						<div class="tabContents">
 							<div class="tab_cont active">
@@ -268,6 +268,7 @@
 				}
 				
 			}else{
+				$('#alreadyList').html('');
 				var html = '';
 				html += '<div class="nodata" id="nodata1">\n';
 				html += '	<div class="txt_box">\n';
@@ -333,6 +334,7 @@
 				$('#btnMoreDiv').hide();
 			}
 		}else{
+			$('#completeList').html('');
 			var html = '';
 			html += '<div class="nodata" id="nodata1">\n';
 			html += '	<div class="txt_box">\n';

src/main/webapp/WEB-INF/views/mob/planning/PlanningDetailFormMob.html

@@ -81,7 +81,7 @@
 				<div class="inner" th:if="${planInfo.pollSq != null}">
 					<div class="dp_btn_area">
 						<div class="btn_wrap">
-							<a href="javascript:;" id="btn_survey" class="btn btn_primary" onclick="javascript:fnJoinConfirm()"><span>설문조사 참여하기</span></a>
+							<a href="javascript:;" id="btn_survey" class="btn btn_primary" onclick="fnJoinConfirm()"><span>설문조사 참여하기</span></a>
 						</div>
 					</div>
 				</div>

src/main/webapp/WEB-INF/views/mob/planning/PlanningEventAttendFormMob.html

@@ -284,8 +284,8 @@ var appendHtml = function () {
 
 		$("#monthTbody").append(html);
 		if (cfCheckLogin()) {
+			$('.day').html('<span>' + custAttendList.length + '</span>일');
 			$.each(custAttendList, function(idx1, item1) {
-				$('.day').html('<span>' + custAttendList.length + '</span>일');
 				if(item1.entryDt == item.sun || item1.entryDt == item.mon || item1.entryDt == item.tue|| item1.entryDt == item.wed
 						|| item1.entryDt == item.thu || item1.entryDt == item.fri || item1.entryDt == item.sat){
 					$("#td_"+item1.entryDt).attr("class","complete");
@@ -312,7 +312,7 @@ var fnInfoConfirmCallBack = function(result) {
 	mcxDialog.alert(result.msg);
 	appendHtml();
 	$("#td_"+date).attr("class","complete");
-	$('.day').html('<span>' + (custAttendList.length +1) + '</span>일');
+	$('.day').html('<span>' + result.custAttendList.length + '</span>일');
 	
 };
 
@@ -334,8 +334,9 @@ $(document).ready(function() {
 	
 	if (!cfCheckLogin()) {
 		$(".day").html("<span>0</span>일");
+		$("#td_"+date).attr("class","today");
 	}else{
-		$('.day').html('<span>' + (custAttendList.length +1) + '</span>일');
+		$('.day').html('<span>' + custAttendList.length + '</span>일');
 		$("#td_"+date).attr("class","today"); 
 		$.each(custAttendList, function(idx, item) {
 			if(item.entryDt == date){

src/main/webapp/WEB-INF/views/mob/planning/PlanningEventPollFormMob.html

@@ -213,15 +213,15 @@
 							th:with="stylelUrl=${@environment.getProperty('domain.front')},  planView=${@environment.getProperty('upload.image.view')}">
 							<span>
 								<button type="button" id="kakao-link-btn" class="kk"
-									th:attr="onclick=|cfnSendToKakaoMob('${stylelUrl+'/planning/detail/form?planSq='+planInfo.planSq}', '${planInfo.planNm}', '${planView+ '/'+planInfo.mainMimg}');|">
+									th:attr="onclick=|cfnSendToKakaoMob('${stylelUrl+'/planning/detail/form?planSq='+pollInfo.planSq}', '${pollInfo.planNm}', '${planView+ '/'+pollInfo.mainMimg}');|">
 									<span>카카오톡</span>
 								</button>
 								<button type="button" class="fb"
-									th:attr="onclick=|sendSns('facebook', '${stylelUrl+'/planning/detail/form?planSq='+planInfo.planSq}', '${planInfo.planNm}', '', '');|">
+									th:attr="onclick=|sendSns('facebook', '${stylelUrl+'/planning/detail/form?planSq='+pollInfo.planSq}', '${pollInfo.planNm}', '', '');|">
 									<span>페이스북</span>
 								</button>
 								<button type="button" class="tw"
-									th:attr="onclick=|sendSns('twitter', '${stylelUrl+'/planning/detail/form?planSq='+planInfo.planSq}',  '${planInfo.planNm+ '#style24몰'}', '', '');|">
+									th:attr="onclick=|sendSns('twitter', '${stylelUrl+'/planning/detail/form?planSq='+pollInfo.planSq}',  '${pollInfo.planNm+ '#style24몰'}', '', '');|">
 									<span>트위터</span>
 								</button>
 								<button type="button" class="url btn_copy">

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

@@ -122,7 +122,7 @@
 					</div>
 					<div class="cont_body">
 						<div class="btn_wrap">
-							<a href="javascript:void(0);" class="btn btn_primary go_next" onclick="javascript:fnJoinConfirm()"> <span>설문조사 참여하기</span></a>
+							<a href="javascript:void(0);" class="btn btn_primary go_next" onclick="fnJoinConfirm()"> <span>설문조사 참여하기</span></a>
 						</div>
 					</div>
 				</div>

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

@@ -314,8 +314,8 @@ var appendHtml = function () {
 
 		$("#monthTbody").append(html);
 		if (cfCheckLogin()) {
+			$('.day').html('<span>' + custAttendList.length + '</span>일');
 			$.each(custAttendList, function(idx1, item1) {
-				$('.day').html('<span>' + custAttendList.length + '</span>일');
 				if(item1.entryDt == item.sun || item1.entryDt == item.mon || item1.entryDt == item.tue|| item1.entryDt == item.wed
 						|| item1.entryDt == item.thu || item1.entryDt == item.fri || item1.entryDt == item.sat){
 					$("#td_"+item1.entryDt).attr("class","complete");
@@ -342,7 +342,7 @@ var fnInfoConfirmCallBack = function(result) {
 	mcxDialog.alert(result.msg);
 	appendHtml();
 	$("#td_"+date).attr("class","complete");
-	$('.day').html('<span>' + (custAttendList.length +1) + '</span>일');
+	$('.day').html('<span>' + result.custAttendList.length + '</span>일');
 	
 };
 
@@ -358,8 +358,9 @@ $(document).ready(function() {
 	
 	if (!cfCheckLogin()) {
 		$(".day").html("<span>0</span>일");
+		$("#td_"+date).attr("class","today");
 	}else{
-		$('.day').html('<span>' + (custAttendList.length + 1) + '</span>일');
+		$('.day').html('<span>' + custAttendList.length + '</span>일');
 		$("#td_"+date).attr("class","today");
 		$.each(custAttendList, function(idx, item) {
 			if(item.entryDt == date){