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

src/main/java/com/style24/admin/biz/dao/TsaPollDao.java

@@ -94,6 +94,16 @@ public interface TsaPollDao {
 	 */
 	Collection<Poll> getPollAnswer(Poll poll);
 	
+	/**
+	 * POLL ALL QUESTION 조회
+	 *
+	 * @param Poll
+	 * @return POLL
+	 * @author sowon
+	 * @since 2021. 6. 2
+	 */
+	Collection<Poll> getPollAllQuestionList(Poll poll);
+	
 	
 
 

src/main/java/com/style24/admin/biz/service/TsaPollService.java

@@ -129,5 +129,16 @@ public class TsaPollService {
 		return pollDao.getPollAnswer(poll);
 	}
 
+	/**
+	 * POLL ALL QUESTION 조회
+	 *
+	 * @param Poll
+	 * @return POLL
+	 * @author sowon
+	 * @since 2021. 6. 2
+	 */
+	public Collection<Poll> getPollAllQuestionList(Poll poll){
+		return pollDao.getPollAllQuestionList(poll);
+	}
 
 }

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

@@ -79,6 +79,7 @@ public class Plan extends TscBaseDomain{
 		private String newCustYn;			//신규회원여부
 		private String custJoinStdt;		//회원가입시작일시
 		private String custJoinEddt;		//회원가입종료일시
+		private String sysImgNm;			//이미지
 
 		// 기획전 소스
 		private Integer seq;					//일련번호

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

@@ -65,5 +65,17 @@ public class Poll extends TscBaseDomain{
 	private String voterNm;			// 투표자명
 	private String voteDt;			// 투표일시
 	
+	private String ques1;
+	private String ques2;
+	private String ques3;
+	private String ques4;
+	private String ques5;
+	private String ques6;
+	private String ques7;
+	private String ques8;
+	private String ques9;
+	private String ques10;
+	
+	
 
 }

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

@@ -800,7 +800,8 @@
 			               , G.GOODS_STAT                                                                 
 			               , G.LIST_PRICE                                                                 
 			               , G.CURR_PRICE                                                                 
-			               , G.DC_RATE                                                                    
+			               , G.DC_RATE      
+			               , G.TAG_PRICE                                                              
 			               , CASE G.FORMAL_GB WHEN 'G009_20' THEN '이월' ELSE '정상' END AS FORMAL_GB                                                                 
 			               , G.SEASON_CD       
 			               , (SELECT SUPPLY_COMP_NM

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

@@ -290,4 +290,11 @@
 			)M
 			GROUP BY NAME,M.POLL_QSQ,M.POLL_QTYPE
 	</select>
+	
+	<select id="getPollAllQuestionList" parameterType="Poll" resultType="Poll">
+		/* TsaPoll.getPollAllQuestionList */
+		SELECT POLL_QTITLE 
+		FROM TB_POLL_QUESTION TPQ 
+		WHERE POLL_SQ = #{pollSq}
+	</select>
 </mapper>

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

@@ -173,7 +173,7 @@
 			     , SG.DEL_YN
 			     , G.GOODS_NM 
 			     , G.LIST_PRICE
-			     , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = G.GOODS_CD AND DEFAULT_IMG_YN = 'Y' ) AS GOODS_IMG
+			     , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = G.GOODS_CD AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM
 			FROM   TB_SOCIAL_GOODS SG LEFT JOIN TB_GOODS G ON SG.GOODS_CD = G.GOODS_CD 
 			WHERE  SG.SOCIAL_SQ = #{socialSq}
 			<if test="goodsCd != null and goodsCd != ''">

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

@@ -356,18 +356,9 @@
 			, cellRenderer: function(params) {return '<a href="javascript:void(0);">' + params.value + '</a>'; }
 		},
 		{headerName: "상품명"		, field:'goodsNm'		, width:300, cellClass: 'text-left'},
-		{headerName: "이미지"		, field:'imgPath6'		, width:100 , height:60, cellClass: 'text-right'
-			, cellRenderer: function(params) {
-				var imgPath = '';
-				if (params.data.imgType == "A"){
-					imgPath = uploadGoodsUrl;
-				}
-				if(typeof params.value!='undefined' && params.value!='' && params.value!=null){
-					imgPath = imgPath + params.value;
-				}else{
-					imgPath = imgPath + params.data.imgPath1;
-				}
-				return '<img width="60" src="'+imgPath.replace('1000', '100')+'" onerror="this.src=\''+_uximgUrl+'/image/no.png\';">';
+		{headerName: "이미지"		, field:'sysImgNm'		, width:100 , height:60, cellClass: 'text-right'
+			,cellRenderer: function(params) {
+				return '<img width="60" src="'+ _goodsUrl+ "/" + params.value + '?RS=60" alt="" onclick="cfnOpenImagePreViewPopup(\'goodsImgView\', \''+ _goodsUrl+ "/" + params.value +'\')" onerror="this.src=\'/image/no.png\';"/>';
 			}
 		},
 		/* {headerName: "전시순서"	, field:'dispOrd'		, width:80 , cellClass: 'text-center'
@@ -378,15 +369,6 @@
 			, cellRenderer: function(params) {return !gagajf.isNull(params.value) ? params.value : '0'; }
 		},
 		{headerName: "할인율(%)"		, field:'dcRate'		, width:80 , cellClass: 'text-center'},
-		{headerName: "TAG가"		, field:'tagPrice'		, width:100, cellClass: 'text-right'
-			,valueFormatter: function(params) {
-				if(params.value && params.value > 0) {
-					return params.value.addComma();
-				} else {
-					return '0';
-				}
-			}
-		},
 		{headerName: "정상가"		, field:'listPrice'		, width:100, cellClass: 'text-right' , hide : true
 			, valueFormatter: function(params) { return params.value.addComma(); }
 		},

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

@@ -65,12 +65,12 @@
 											<table class="frmStyle">
 												<tr>
 													<th>리뷰 타이틀</th>
-													<td><input type="text" name="reTitle" class="w300 aR"/>
+													<td><input type="text" name="reTitle" class="w300 aL"/>
 													</td>
 												</tr>
 												<tr>
 													<th>전시순서</th>
-													<td><input type="text" name="reDispOrd" class="w100 aR" data-valid-type="numeric"></td>
+													<td><input type="text" name="reDispOrd" class="w100 aL" data-valid-type="numeric"></td>
 												</tr>
 											</table>
 											<div class="padding10">
@@ -111,12 +111,12 @@
 											<table class="frmStyle">
 												<tr>
 													<th>쿠폰 타이틀</th>
-													<td><input type="text" name="cuTitle" class="w300 aR">
+													<td><input type="text" name="cuTitle" class="w300 aL">
 													</td>
 												</tr>
 												<tr>
 													<th>전시순서</th>
-													<td><input type="text" name="cuDispOrd" class="w100 aR" data-valid-type="numeric"></td>
+													<td><input type="text" name="cuDispOrd" class="w100 aL" data-valid-type="numeric"></td>
 												</tr>
 												<tr>
 													<th>쿠폰 유의사항</th>
@@ -135,7 +135,7 @@
 																	<tr th:id="${'coupon'+num}">
 																		<th th:text="${'유의사항' + num}"></th>
 																		<td>
-																			<input type="text"	th:id="${'cpnNote' + (num-1)}" th:name="${'cpnNote' + (num-1)}" class="w300 aR" maxlength="500">
+																			<input type="text"	th:id="${'cpnNote' + (num-1)}" th:name="${'cpnNote' + (num-1)}" class="w300 aL" maxlength="500">
 																		</td>
 																	</tr>
 																</table>
@@ -195,7 +195,7 @@
 														<label th:for="${'file' + num}" class="uFileLabel" th:id="${'file_' + num}">파일선택</label>
 														<input type="hidden" name="fileItemVal"	th:id="${'fileItemVal' + num}" /> 
 														<input type="hidden" name="sysFileNms" th:id="${'sysFileNm' + num}" />
-														<input type="text" th:name="${'linkUrl' + num}" th:id="${'linkUrl' + num}" class="w300 aR">
+														<input type="text" th:name="${'linkUrl' + num}" th:id="${'linkUrl' + num}" class="w300 aL">
 													</div>
 													<br />
 													<table>
@@ -208,7 +208,7 @@
 														</tr>        
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" th:name="${'fileLinkUrl' + num}" class="w300 aR">
+															<td><input type="text" th:name="${'fileLinkUrl' + num}" class="w300 aL">
 															</td>
 														</tr>
 														</table>
@@ -217,7 +217,7 @@
 										</td>
 
 										<th>전시순서</th>
-										<td><input type="text" name="fileDispOrd" class="w100 aR" data-valid-type="numeric"></td>
+										<td><input type="text" name="fileDispOrd" class="w100 aL" data-valid-type="numeric"></td>
 									</tr>
 								</table>
 							</div>
@@ -258,7 +258,7 @@
 													<table>
 														<tr th:id="${'notice'+num}">
 															<th th:text="${'유의사항' + num}"></th>
-															<td><input type="text" th:id="${'noticeItemVal' + num}" th:name="${'noticeItemVal' + num}" class="w300 aR" maxlength="500">
+															<td><input type="text" th:id="${'noticeItemVal' + num}" th:name="${'noticeItemVal' + num}" class="w300 aL" maxlength="500">
 															</td>
 														</tr>
 													</table>
@@ -267,7 +267,7 @@
 										</td>
 
 										<th>전시순서</th>
-										<td><input type="text" name="noticeDispOrd" class="w100 aR" data-valid-type="numeric"></td>
+										<td><input type="text" name="noticeDispOrd" class="w100 aL" data-valid-type="numeric"></td>
 									</tr>
 								</table>
 							</div>
@@ -411,7 +411,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle1" class="w300 aR">
+															<td><input type="text" name="goodsTitle1" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -423,12 +423,12 @@
 														</tr>        
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl1" class="w300 aR">
+															<td><input type="text" name="goodsUrl1" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd1" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd1" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -477,7 +477,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle2" class="w300 aR">
+															<td><input type="text" name="goodsTitle2" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -489,12 +489,12 @@
 														</tr>   
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl2" class="w300 aR">
+															<td><input type="text" name="goodsUrl2" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd2" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd2" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -544,7 +544,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle3" class="w300 aR">
+															<td><input type="text" name="goodsTitle3" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -556,12 +556,12 @@
 														</tr>   
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl3" class="w300 aR">
+															<td><input type="text" name="goodsUrl3" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd3" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd3" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -611,7 +611,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle4" class="w300 aR">
+															<td><input type="text" name="goodsTitle4" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -623,12 +623,12 @@
 														</tr>                                                                                                                       
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl4" class="w300 aR">
+															<td><input type="text" name="goodsUrl4" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd4" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd4" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -678,7 +678,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle5" class="w300 aR">
+															<td><input type="text" name="goodsTitle5" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -690,12 +690,12 @@
 														</tr>   
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl5" class="w300 aR">
+															<td><input type="text" name="goodsUrl5" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd5" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd5" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -745,7 +745,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle6" class="w300 aR">
+															<td><input type="text" name="goodsTitle6" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -757,12 +757,12 @@
 														</tr>   
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl6" class="w300 aR">
+															<td><input type="text" name="goodsUrl6" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd6" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd6" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -812,7 +812,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle7" class="w300 aR">
+															<td><input type="text" name="goodsTitle7" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -824,12 +824,12 @@
 														</tr>   
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl7" class="w300 aR">
+															<td><input type="text" name="goodsUrl7" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd7" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd7" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -879,7 +879,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle8" class="w300 aR">
+															<td><input type="text" name="goodsTitle8" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -891,12 +891,12 @@
 														</tr>   
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl8" class="w300 aR">
+															<td><input type="text" name="goodsUrl8" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd8" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd8" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -946,7 +946,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle9" class="w300 aR">
+															<td><input type="text" name="goodsTitle9" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -958,12 +958,12 @@
 														</tr>   
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl9" class="w300 aR">
+															<td><input type="text" name="goodsUrl9" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd9" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd9" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>
@@ -1013,7 +1013,7 @@
 														</tr>
 														<tr>
 															<th>상품 타이틀</th>
-															<td><input type="text" name="goodsTitle10" class="w300 aR">
+															<td><input type="text" name="goodsTitle10" class="w300 aL">
 															</td>
 														</tr>
 														<tr>                                                                                                     
@@ -1025,12 +1025,12 @@
 														</tr>   
 														<tr>
 															<th>상품 링크</th>
-															<td><input type="text" name="goodsUrl10" class="w300 aR">
+															<td><input type="text" name="goodsUrl10" class="w300 aL">
 															</td>
 														</tr>
 														<tr>
 															<th>전시 순서</th>
-															<td><input type="text" name="goodsDispOrd10" class="w300 aR" data-valid-type="numeric">
+															<td><input type="text" name="goodsDispOrd10" class="w300 aL" data-valid-type="numeric">
 															</td>
 														</tr>
 													</table>

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

@@ -105,7 +105,7 @@
 					</li>
 				</ul>
 			
-				<div id="gridList" style="width: 100%; height: 500px;" class="ag-theme-balham"></div>
+				<div id="gridSocialList" style="width: 100%; height: 500px;" class="ag-theme-balham"></div>
 				
 				<ul class="panelBar">
 					<li class="center">
@@ -273,7 +273,7 @@
 								<button type="button" class="btn btn-success btn-lg" onclick="fnSocialGoodsSave();">저장</button>
 							</li>
 						</ul>
-						<div id="gridGoodsList" style="width: 100%; height: 700px" class="ag-theme-balham lh60"></div>
+						<div id="gridSocialGoodsList" style="width: 100%; height: 700px" class="ag-theme-balham lh60"></div>
 					
 					
 					<!-- <li class="boxContentBtnB" style="margin-top: 10px;">
@@ -298,7 +298,7 @@
 	var wmGbList = {"A":"ALL", "P":"웹", "M":"모바일"};
 	var applyList = {"P":"대기", "A":"적용", "F":"종료"};
 
-	var columnDefs = [
+	var columnSocialDefs = [
 		{headerName: "사이트"		, field:'siteCd'		, width:100, cellClass: 'text-center',
 			cellEditor: 'agRichSelectCellEditor',
 			cellEditorParams: { values: gagaAgGrid.extractValues(siteList) },
@@ -329,7 +329,7 @@
 		{headerName: "등록일"		, field:'regDt'			, width:150, cellClass: 'text-center'},
 	];
 
-	var gridOptions = gagaAgGrid.getGridOptions(columnDefs);
+	var gridOptions = gagaAgGrid.getGridOptions(columnSocialDefs);
 
 	// 셀 클릭 이벤트
 	gridOptions.onCellClicked = function(event) {
@@ -514,11 +514,11 @@
 		gagaPaging.createPagination(result.pageing.pageable);
 	}
 	
-	var columnDefsGoods = [
+	var columnDefsSocialGoods = [
 		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
-		{headerName: '상품이미지'				, field:'goodsImg'	, width: 100, height: 60, cellClass: 'text-center',
+		{headerName: '상품이미지'				, field:'sysImgNm'	, width: 100, height: 60, cellClass: 'text-center',
 			cellRenderer: function(params) {
-				return '<img width="60" src="' + _goodsUrl + '/' + params.value + '" alt="" onclick="cfnOpenImagePreViewPopup(\'goodsImgView\', \'' + _goodsUrl + '/' + params.value + '\')" onerror="this.src=\'/image/no.png\';"/>';
+				return '<img width="60" src="'+ _goodsUrl+ "/" + params.value + '?RS=60" alt="" onclick="cfnOpenImagePreViewPopup(\'goodsImgView\', \''+ _goodsUrl+ "/" + params.value +'\')" onerror="this.src=\'/image/no.png\';"/>';
 			}
 		},
 		{headerName: '상품코드'				, field:'goodsCd'	, width:250 , cellClass: 'text-center',
@@ -549,7 +549,7 @@
 		{headerName: '기존 판매가'	         , field:'cur'		, width:100 , cellClass: 'text-center', hide: true},
 	];
 
-	var gridOptionsGoods = gagaAgGrid.getGridOptions(columnDefsGoods);
+	var gridOptionsGoods = gagaAgGrid.getGridOptions(columnDefsSocialGoods);
 	gridOptionsGoods.rowSelection = 'multiple';
 	gridOptionsGoods.rowHeight = 60; //이미지가 있을경우 높이 지정해야함.
 	
@@ -679,6 +679,7 @@
 							  currBprice: result[disp].currPrice,
 							  dcBrate: result[disp].dcRate,
 							  listPrice : result[disp].listPrice,
+							  sysImgNm : result[disp].sysImgNm,
 							  dispOrd : disp+1
 							  };
 				
@@ -806,8 +807,8 @@
 	$(document).ready(function() {
 		cfnCreateCalendar('#terms', 'stDate', 'edDate', false);
 
-		gagaAgGrid.createGrid('gridList', gridOptions);
-		gagaAgGrid.createGrid('gridGoodsList', gridOptionsGoods);
+		gagaAgGrid.createGrid('gridSocialList', gridOptions);
+		gagaAgGrid.createGrid('gridSocialGoodsList', gridOptionsGoods);
 		//uifnFitGrid();
 		
 	});