Revert "소셜 수정"

This reverts commit 0a1df184dd5be6405322b3270cb6fd806047eed7.

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

@@ -209,9 +209,7 @@
 		    AND A.FRONT_GB IN ('A','M')
 		</if> 
 		AND A.APPLY_GB IN ('A', #{applyGb})
-		<if test="socialSq != null and socialSq != ''">
 		AND A.SOCIAL_SQ != #{socialSq}
-		</if>
 		AND A.SOCIAL_STDT <![CDATA[ <= ]]> DATE_FORMAT(#{socialStdt} , '%Y-%m-%d %H:%i:%S')
 		AND A.SOCIAL_EDDT <![CDATA[ >= ]]> DATE_FORMAT(#{socialStdt} , '%Y-%m-%d %H:%i:%S');
 	</select>

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

@@ -302,20 +302,10 @@
 	];
 
 	var columnDefsVote = [
-		{headerName: '투표자ID'		, field:'voterNm'	, width:150, cellClass: 'text-center',enableValue: true},
-		{headerName: '투표일시'		, field:'voteDt'	, width:200, cellClass: 'text-center',enableValue: true},
-		{headerName: 'ques1'	    , field:'dummy1'	, width:200, cellClass: 'text-center',enableValue: true},
-		{headerName: 'ques2'	    , field:'dummy2'	, width:200, cellClass: 'text-center',enableValue: true},
-		{headerName: 'ques3'	    , field:'dummy3'	, width:200, cellClass: 'text-center',enableValue: true},
-		{headerName: 'ques4'	    , field:'dummy4'	, width:200, cellClass: 'text-center',enableValue: true},
-		{headerName: 'ques5'	    , field:'dummy5'	, width:200, cellClass: 'text-center',enableValue: true},
-		{headerName: 'ques6'	    , field:'dummy6'	, width:200, cellClass: 'text-center',enableValue: true},
-		{headerName: 'ques7'	    , field:'dummy7'	, width:200, cellClass: 'text-center',enableValue: true},
-		{headerName: 'ques8'	    , field:'dummy8'	, width:200, cellClass: 'text-center',enableValue: true},
-		{headerName: 'ques9'	    , field:'dummy9'	, width:200, cellClass: 'text-center',enableValue: true},
-		{headerName: 'ques10'	    , field:'dummy10'	, width:200, cellClass: 'text-center',enableValue: true},
-		/* {headerName: '투표자회원번호'	, field:'ansCustNo'	, width:200, cellClass: 'text-center'}, */
-		
+		{headerName: '투표자ID'		, field:'voterNm'	, width:150, cellClass: 'text-center'},
+		{headerName: '답변'	, field:'dummy'	, width:200, cellClass: 'text-center'},
+		{headerName: '투표자회원번호'	, field:'ansCustNo'	, width:200, cellClass: 'text-center'},
+		{headerName: '투표일시'		, field:'voteDt'	, width:200, cellClass: 'text-center'},
 	];
 
 	var gridOptionsPoll = gagaAgGrid.getGridOptions(columnDefsPoll);
@@ -363,44 +353,21 @@
 		}
 	}
 
-	// Grid 속성 변경
-/* 	var fnChangeGridProperty = function() {
-		
-		
-	} */
-	
 	// 투표자 조회
 	var fnSearchVote = function(data) {
-		
-		/* if (gagajf.isNull(data.pollQtitle)) {
+		if (gagajf.isNull(data.pollQtitle)) {
 			$('#pollQtitle').text(' 투표자수');
 		} else {
 			$('#pollQtitle').text(' [' + data.pollQtitle + '] 투표자수');
-		} */
+		}
+
 
 		var params = new Object();
 		params.pollQsq = data.pollQsq;
-		params.pollSq = data.pollSq;
 
 		var jsonData = JSON.stringify(params);
 		gagajf.ajaxJsonSubmit('/marketing/poll/voter/list', jsonData, function(dataList) {
-			//gridOptionsVote.api.setRowData(dataList.pollList);
-			// 컬럼 이름 변경
-			for (var k = 1; k <= dataList.questionList.length; k++) {
-				gagaAgGrid.setColumnHeaderName(gridOptionsVote, 'ques' + k, dataList.pollList.pollQtitle);
-			}
-			gridOptionsVote.columnApi.resetColumnState();
-			
-			// 컬럼 숨김 처리
-			for (var k = 1; k <= 10; k++) {
-				// 컬럼 숨긴걸 초기화 한다.
-				gagaAgGrid.showOrHideColumn(gridOptionsVote, 'ques' + k, true);
-			
-				// 컬럼을 숨긴다.
-				if (k > iDays) {
-					gagaAgGrid.showOrHideColumn(gridOptionsVote, 'ques' + k, false);
-				}
-			}
+			gridOptionsVote.api.setRowData(dataList.pollList);
 		});
 
 	}