poll관리 임시커밋

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

@@ -117,6 +117,8 @@
 				, M.FST_COM_YN                                                                                                 
 				, M.PARTI_CNT                                                                                                  
 				, M.SITE_CD 
+				, M.POLL_STDT
+				, M.POLL_EDDT
 				, M.REG_DT                                                                                                   
 				, M.POLL_QSQ                                                                                                   
 				, M.POLL_QTITLE                                                                                                
@@ -130,10 +132,7 @@
 				, M.POLL_QVAL7                                                                                                 
 				, M.POLL_QVAL8                                                                                                 
 				, M.POLL_QVAL9                                                                                                 
-				, M.POLL_QVAL10                                                                                                
-				, M.ANS_CUST_NO                                                                                                
-				, M.DUMMY                                                                                                      
-				, M.VOTE_CNT                                                                             
+				, M.POLL_QVAL10    
 		 FROM
 		 (		      
 			SELECT A.POLL_SQ
@@ -142,6 +141,8 @@
 			      , A.FST_COM_YN 
 			      , A.PARTI_CNT 
 			      , A.SITE_CD
+			      , A.POLL_STDT
+				  , A.POLL_EDDT
 			      , A.REG_DT 
 			      , B.POLL_QSQ 
 			      , B.POLL_QTITLE 
@@ -156,11 +157,7 @@
 			      , B.POLL_QVAL8
 			      , B.POLL_QVAL9
 			      , B.POLL_QVAL10
-			      , C.ANS_CUST_NO 
-			      , C.DUMMY 
-			      , COUNT(C.ANS_CUST_NO) AS VOTE_CNT
 			FROM   TB_POLL A LEFT JOIN TB_POLL_QUESTION B ON A.POLL_SQ = B.POLL_SQ 
-			     			 LEFT JOIN TB_POLL_ANSWER C ON B.POLL_QSQ = C.POLL_QSQ 
 			WHERE 1=1
 		  		 AND A.DEL_YN = 'N'
 		   <if test="pollSq != null and pollSq != ''">
@@ -182,6 +179,8 @@
 			      , A.FST_COM_YN 
 			      , A.PARTI_CNT 
 			      , A.SITE_CD 
+			      , A.POLL_STDT
+				  , A.POLL_EDDT
 			      , B.POLL_QSQ 
 			      , B.POLL_QTITLE 
 			      , B.POLL_QVAL1 
@@ -194,8 +193,6 @@
 			      , B.POLL_QVAL8
 			      , B.POLL_QVAL9
 			      , B.POLL_QVAL10
-			      , C.ANS_CUST_NO 
-			      , C.DUMMY 
 			)M
 	
 	</select>

src/main/webapp/WEB-INF/views/marketing/PollListForm.html

@@ -278,18 +278,11 @@
 		{headerName: 'POLL제목'	, field:'pollTitle'	, width:230, cellClass: 'text-left'
 			, cellRenderer: function(params) { return fnSetColumn(params); }
 		},
-		{headerName: '문항제목'		, field:'pollQtitle', width:230, cellClass: 'text-center'},
-		{headerName: '문항보기'		, field:'pollQval1', width:230, cellClass: 'text-center'},
-		{headerName: '문항보기'		, field:'pollQval2', width:230, cellClass: 'text-center'},
-		{headerName: '문항보기'		, field:'pollQval3', width:230, cellClass: 'text-center'},
-		{headerName: '문항보기'		, field:'pollQval4', width:230, cellClass: 'text-center'},
-		{headerName: '문항보기'		, field:'pollQval5', width:230, cellClass: 'text-center'},
-		{headerName: '투표수'		, field:'voteCnt'	, width:80, cellClass: 'text-center'
-			, cellRenderer : function(params) { return '<a href="javascript:void(0);">' + params.value + '</a>'; }
-		},
-		{headerName: '투표율'		, field:'voteRate'	, width:80, cellClass: 'text-center'
+		 {headerName: '문항제목'		, field:'pollQtitle', width:230, cellClass: 'text-center'},
+		 {headerName: '등록일'		, field:'regDt'	, width:80, cellClass: 'text-center'},
+		/*{headerName: '투표율'		, field:'voteRate'	, width:80, cellClass: 'text-center'
 			, cellRenderer : function(params) { return gagajf.isNull(params.value) ? '0%' : params.value + '%'; }
-		},
+		}, */
 	];
 
 	var columnDefsVote = [
@@ -374,19 +367,29 @@
 
 		// 시작 기간 설정
 		var sttime = data.pollStdt.split(" ");
+		var stime = sttime[1].split(":")
 		$('#registerForm input[name=stDate]').val(sttime[0]);
-		$('#stTimeHour').val(sttime[1].substring(0,2));
-		$('#stTimeMin').val(sttime[1].substring(2,4));
-		$('#stTime').val(sttime[1]);
+		$('#stTimeHour').val(stime[0]);
+		$('#stTimeMin').val(stime[1]);
 
 		// 종료 기간 설정
 		var edtime = data.pollEddt.split(" ");
+		var etime = edtime[1].split(":")
 		$('#registerForm input[name=edDate]').val(edtime[0]);
-		$('#edTimeHour').val(edtime[1].substring(0,2));
-		$('#edTimeMin').val(edtime[1].substring(2,4));
-		$('#edTime').val(edtime[1]);
+		$('#edTimeHour').val(etime[0]);
+		$('#edTimeMin').val(etime[1]);
 
 		$('#registerForm select[name=siteCd]').val(data.siteCd);
+		
+		$('#registerForm select[name=dupPartiYn]').val(data.dupPartiYn);
+		$('#registerForm select[name=fstComYn]').val(data.fstComYn);
+		$('#registerForm input[name=partiCnt]').val(data.partiCnt);
+		
+		if($('#registerForm select[name=fstComYn]').val() == 'Y'){
+			$("#partiCnt").attr("disabled",false);
+		}else{
+			$("#partiCnt").attr("disabled",true);
+		}2ㅣ
 	}
 
 	// 검색