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

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

@@ -88,27 +88,28 @@ public class TsaPlanService {
 			}
 			newFile.renameTo(uniqueFile);
 			param.setMainPimg("/planning/" + yearMonth + "/" + newFilename);
-		}
-		if(param.getMainMimg() != null && !"".equals(param.getMainMimg())){
-			String imgInd = String.valueOf(ind);
-			if (ind < 10) {
-				imgInd = "0" + imgInd;
-			}
-			String planUploadPath = env.getProperty("upload.default.target.path");
-			String yearMonth = GagaDateUtil.getToday().substring(0, 6);
-			planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, "/planning");
-			File newFile = new File(GagaFileUtil.getConcatenationPath(planUploadPath, param.getMainMimg()));
-			planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, yearMonth);
-			String newFilename = "PLANNING_" + GagaDateUtil.getTodayDateTime() + "_" + imgInd + "." + StringUtils.getFilenameExtension(param.getMainMimg());
-			File uniqueFile = GagaFileUtil.getUniqueFile(new File(GagaFileUtil.getConcatenationPath(planUploadPath, newFilename)));
-			// Rename a file
-			File path = new File(planUploadPath);
-			if (!path.exists()) {
-				path.mkdir();
-			}
-			newFile.renameTo(uniqueFile);
 			param.setMainMimg("/planning/" + yearMonth + "/" + newFilename);
 		}
+//		if(param.getMainMimg() != null && !"".equals(param.getMainMimg())){
+//			String imgInd = String.valueOf(ind);
+//			if (ind < 10) {
+//				imgInd = "0" + imgInd;
+//			}
+//			String planUploadPath = env.getProperty("upload.default.target.path");
+//			String yearMonth = GagaDateUtil.getToday().substring(0, 6);
+//			planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, "/planning");
+//			File newFile = new File(GagaFileUtil.getConcatenationPath(planUploadPath, param.getMainMimg()));
+//			planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, yearMonth);
+//			String newFilename = "PLANNING_" + GagaDateUtil.getTodayDateTime() + "_" + imgInd + "." + StringUtils.getFilenameExtension(param.getMainMimg());
+//			File uniqueFile = GagaFileUtil.getUniqueFile(new File(GagaFileUtil.getConcatenationPath(planUploadPath, newFilename)));
+//			// Rename a file
+//			File path = new File(planUploadPath);
+//			if (!path.exists()) {
+//				path.mkdir();
+//			}
+//			newFile.renameTo(uniqueFile);
+//			param.setMainMimg("/planning/" + yearMonth + "/" + newFilename);
+//		}
 		planDao.createPlanInfo(param);
 		
 		String[] brand = param.getMultiBrand();
@@ -953,6 +954,8 @@ public class TsaPlanService {
 			
 			//파일아이템 등록
 			String[] fileItemVal = param.getMultiPlanFile();
+			String[] fileItemVal2 = param.getMultiPlanFile2();
+			String[] fileItemVal3 = param.getMultiPlanFile3();
 			int ind = 1;
 			for (int j = 0; j < fileItemVal.length; j++) {
 				String imgInd = String.valueOf(ind);
@@ -973,6 +976,8 @@ public class TsaPlanService {
 				}
 				newFile.renameTo(uniqueFile);
 				filePlan.setItemVal("/planning/" + yearMonth + "/" + newFilename);
+				filePlan.setLinkUrl(fileItemVal2[j]);
+				filePlan.setLinkOpenGb((fileItemVal3[j]));
 				planDao.createPlanContentsItem(filePlan);
 				ind++;
 			}
@@ -1009,6 +1014,7 @@ public class TsaPlanService {
 				long goodsDispOrd = multiPlanGoodsContent1.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent1.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent1.getGoodsPlanContSq();
+				String linkOpenGb = multiPlanGoodsContent1.getGoodsLinkOpenGb();
 				
 				Plan goods1 = new Plan();
 				goods1.setRegNo(regNo);
@@ -1018,6 +1024,7 @@ public class TsaPlanService {
 				goods1.setPlanSq(param.getPlanSq());
 				goods1.setDispYn(goodsDispYn);
 				goods1.setTmplType(goodsType);
+				goods1.setLinkOpenGb(linkOpenGb);
 				goods1.setLinkUrl(goodsUrl);
 				goods1.setPlanContSq(goodsPlanContSq);
 				
@@ -1046,6 +1053,7 @@ public class TsaPlanService {
 				long goodsDispOrd = multiPlanGoodsContent2.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent2.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent2.getGoodsPlanContSq();
+				String linkOpenGb = multiPlanGoodsContent2.getGoodsLinkOpenGb();
 				
 				Plan goods2 = new Plan();
 				goods2.setRegNo(regNo);
@@ -1056,6 +1064,7 @@ public class TsaPlanService {
 				goods2.setDispYn(goodsDispYn);
 				goods2.setTmplType(goodsType);
 				goods2.setLinkUrl(goodsUrl);
+				goods2.setLinkOpenGb(linkOpenGb);
 				goods2.setPlanContSq(goodsPlanContSq);
 				
 				planDao.createPlanContents(goods2);
@@ -1083,6 +1092,7 @@ public class TsaPlanService {
 				long goodsDispOrd = multiPlanGoodsContent3.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent3.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent3.getGoodsPlanContSq();
+				String linkOpenGb = multiPlanGoodsContent3.getGoodsLinkOpenGb();
 				
 				Plan goods3 = new Plan();
 				goods3.setRegNo(regNo);
@@ -1093,6 +1103,7 @@ public class TsaPlanService {
 				goods3.setDispYn(goodsDispYn);
 				goods3.setTmplType(goodsType);
 				goods3.setLinkUrl(goodsUrl);
+				goods3.setLinkOpenGb(linkOpenGb);
 				goods3.setPlanContSq(goodsPlanContSq);
 				
 				planDao.createPlanContents(goods3);
@@ -1120,6 +1131,7 @@ public class TsaPlanService {
 				long goodsDispOrd = multiPlanGoodsContent4.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent4.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent4.getGoodsPlanContSq();
+				String linkOpenGb = multiPlanGoodsContent4.getGoodsLinkOpenGb();
 				
 				Plan goods4 = new Plan();
 				goods4.setRegNo(regNo);
@@ -1131,6 +1143,7 @@ public class TsaPlanService {
 				goods4.setTmplType(goodsType);
 				goods4.setLinkUrl(goodsUrl);
 				goods4.setPlanContSq(goodsPlanContSq);
+				goods4.setLinkOpenGb(linkOpenGb);
 				
 				planDao.createPlanContents(goods4);
 				
@@ -1157,6 +1170,7 @@ public class TsaPlanService {
 				long goodsDispOrd = multiPlanGoodsContent5.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent5.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent5.getGoodsPlanContSq();
+				String linkOpenGb = multiPlanGoodsContent5.getGoodsLinkOpenGb();
 
 				
 				Plan goods5 = new Plan();
@@ -1169,6 +1183,7 @@ public class TsaPlanService {
 				goods5.setTmplType(goodsType);
 				goods5.setLinkUrl(goodsUrl);
 				goods5.setPlanContSq(goodsPlanContSq);
+				goods5.setLinkOpenGb(linkOpenGb);
 				
 				planDao.createPlanContents(goods5);
 				
@@ -1195,6 +1210,7 @@ public class TsaPlanService {
 				long goodsDispOrd = multiPlanGoodsContent6.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent6.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent6.getGoodsPlanContSq();
+				String linkOpenGb = multiPlanGoodsContent6.getGoodsLinkOpenGb();
 				
 				Plan goods6 = new Plan();
 				goods6.setRegNo(regNo);
@@ -1206,6 +1222,7 @@ public class TsaPlanService {
 				goods6.setTmplType(goodsType);
 				goods6.setLinkUrl(goodsUrl);
 				goods6.setPlanContSq(goodsPlanContSq);
+				goods6.setLinkOpenGb(linkOpenGb);
 				
 				planDao.createPlanContents(goods6);
 				
@@ -1232,6 +1249,7 @@ public class TsaPlanService {
 				long goodsDispOrd = multiPlanGoodsContent7.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent7.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent7.getGoodsPlanContSq();
+				String linkOpenGb = multiPlanGoodsContent7.getGoodsLinkOpenGb();
 				
 				Plan goods7 = new Plan();
 				goods7.setRegNo(regNo);
@@ -1243,6 +1261,7 @@ public class TsaPlanService {
 				goods7.setTmplType(goodsType);
 				goods7.setLinkUrl(goodsUrl);
 				goods7.setPlanContSq(goodsPlanContSq);
+				goods7.setLinkOpenGb(linkOpenGb);
 				
 				planDao.createPlanContents(goods7);
 				
@@ -1269,6 +1288,7 @@ public class TsaPlanService {
 				long goodsDispOrd = multiPlanGoodsContent8.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent8.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent8.getGoodsPlanContSq();
+				String linkOpenGb = multiPlanGoodsContent8.getGoodsLinkOpenGb();
 				
 				Plan goods8 = new Plan();
 				goods8.setRegNo(regNo);
@@ -1280,6 +1300,7 @@ public class TsaPlanService {
 				goods8.setTmplType(goodsType);
 				goods8.setLinkUrl(goodsUrl);
 				goods8.setPlanContSq(goodsPlanContSq);
+				goods8.setLinkOpenGb(linkOpenGb);
 				
 				planDao.createPlanContents(goods8);
 				
@@ -1306,6 +1327,7 @@ public class TsaPlanService {
 				long goodsDispOrd = multiPlanGoodsContent9.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent9.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent9.getGoodsPlanContSq();
+				String linkOpenGb = multiPlanGoodsContent9.getGoodsLinkOpenGb();
 				
 				Plan goods9 = new Plan();
 				goods9.setRegNo(regNo);
@@ -1317,6 +1339,7 @@ public class TsaPlanService {
 				goods9.setTmplType(goodsType);
 				goods9.setLinkUrl(goodsUrl);
 				goods9.setPlanContSq(goodsPlanContSq);
+				goods9.setLinkOpenGb(linkOpenGb);
 				
 				planDao.createPlanContents(goods9);
 				
@@ -1343,6 +1366,7 @@ public class TsaPlanService {
 				long goodsDispOrd = multiPlanGoodsContent10.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent10.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent10.getGoodsPlanContSq();
+				String linkOpenGb = multiPlanGoodsContent10.getGoodsLinkOpenGb();
 				
 				Plan goods10 = new Plan();
 				goods10.setRegNo(regNo);
@@ -1354,6 +1378,7 @@ public class TsaPlanService {
 				goods10.setTmplType(goodsType);
 				goods10.setLinkUrl(goodsUrl);
 				goods10.setPlanContSq(goodsPlanContSq);
+				goods10.setLinkOpenGb(linkOpenGb);
 				
 				planDao.createPlanContents(goods10);
 				

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

@@ -178,6 +178,7 @@ public class Plan extends TscBaseDomain{
 		private String itemVal;				//아이템값(상품코드, 이미지파일명 등)
 		private String reviewDispStdt;		//리뷰노출시작일시
 		private String reviewDispEddt;		//리뷰노툴종료일시
+		private String linkOpenGb;			// 링크 본장,새창여부
 		
 		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 		private String[] multiPlanReview;		//리뷰상품목록
@@ -194,6 +195,10 @@ public class Plan extends TscBaseDomain{
 		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 		private String[] multiPlanFile;			//이미지목록
 		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+		private String[] multiPlanFile2;			//이미지새장본창
+		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+		private String[] multiPlanFile3;			//이미지연결url
+		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 		private String[] multiChannel;			//제휴채널목록
 		
 		private Collection<Plan> attendData; // 출석체크 혜택 데이터
@@ -234,6 +239,7 @@ public class Plan extends TscBaseDomain{
 		private String goodsTitle;			//상품타이틀
 		private String goodsUrl;			//상품 url
 		private String goodsDispYn;			//상품전시여부
+		private String goodsLinkOpenGb;		//상품 새창 본창 구분
 		private int goodsDispOrd;			//상품 전시순서
 		private String goodsType;			//상품노출순서
 		private String goodsItemVal;		//상품아이템

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

@@ -1041,6 +1041,7 @@
 							, TMPL_TYPE
 							, TITLE
 							, LINK_URL
+							, LINK_OPEN_GB
 							, NOTE							
 							, DISP_YN
 							, DISP_ORD
@@ -1056,6 +1057,7 @@
 					 , #{tmplType}
 					 , #{title}
 					 , #{linkUrl}
+					 , #{linkOpenGb}
 					 , #{note}
 					 , #{dispYn}
 					 , #{dispOrd}
@@ -1070,6 +1072,7 @@
 			 	   TITLE=#{title}
 			 	 , TMPL_TYPE = #{tmplType}
 			   	 , LINK_URL=#{linkUrl}
+			   	 , LINK_OPEN_GB=#{linkOpenGb}
 			   	 , NOTE = #{note}
 			     , DISP_YN=#{dispYn}
 			     , DISP_ORD=#{dispOrd}
@@ -1092,6 +1095,8 @@
 			TB_PLAN_CONTENTS_ITEM(
 						PLAN_CONT_SQ
 					  , ITEM_VAL
+					  , LINK_URL
+					  , LINK_OPEN_GB
 					  , REVIEW_DISP_STDT
 					  , REVIEW_DISP_EDDT
 					  , REG_NO
@@ -1100,6 +1105,8 @@
 			VALUES(
 					#{planContSq}
 				  , #{itemVal}
+				  , #{linkUrl}
+				  , #{linkOpenGb}
 				  , #{reviewDispStdt}
 				  , #{reviewDispEddt}
 				  , #{regNo}
@@ -1109,6 +1116,8 @@
 			     DUPLICATE KEY 
 			 UPDATE 
 			 	 ITEM_VAL= #{itemVal}
+			   , LINK_URL = #{linkUrl}
+			   , LINK_OPEN_GB = #{linkOpenGb}
 			   , REVIEW_DISP_STDT= #{reviewDispStdt}
 			   , REVIEW_DISP_EDDT= #{reviewDispEddt}
 			   , REG_NO= #{regNo}
@@ -1122,6 +1131,7 @@
 		      ,A.TMPL_TYPE 
 		      ,A.TITLE 
 		      ,A.LINK_URL 
+		      ,A.LINK_OPEN_GB
 		      ,A.NOTE
 		      ,A.DISP_YN 
 		      ,A.DISP_ORD 
@@ -1144,6 +1154,7 @@
 		      ,A.TMPL_TYPE 
 		      ,A.TITLE 
 		      ,A.LINK_URL 
+		      ,A.LINK_OPEN_GB
 		      ,A.NOTE
 		      ,A.DISP_YN 
 		      ,A.DISP_ORD 
@@ -1163,6 +1174,7 @@
 		      ,A.TMPL_TYPE 
 		      ,A.TITLE 
 		      ,A.LINK_URL 
+		      ,A.LINK_OPEN_GB
 		      ,A.DISP_YN 
 		      ,A.DISP_ORD 
 		      ,A.REG_NO 
@@ -1203,6 +1215,7 @@
 		      ,A.TMPL_TYPE 
 		      ,A.TITLE 
 		      ,A.LINK_URL 
+		      ,A.LINK_OPEN_GB
 		      ,A.DISP_YN 
 		      ,A.DISP_ORD 
 		      ,A.REG_NO 
@@ -1349,8 +1362,3 @@
 
 
 
-
-
-
-
-

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

@@ -176,7 +176,7 @@
   						</td>
 					</tr>
 					<tr>
-						<th>PC 메인 이미지<i id="pMimgStar"></i><br/>[삭제여부<label class="chkBox"><input type="checkbox" name="orgMainPimgDelYn" value="Y"/></label>]</th>
+						<th>메인 이미지<i id="pMimgStar"></i><br/>[삭제여부<label class="chkBox"><input type="checkbox" name="orgMainPimgDelYn" value="Y"/></label>]</th>
 						<td>
 							<div th:if=*{mainPimg} id="mainPimgView" style="float:left;">
 								<img id="PreMainPimgUrl" th:src="${@environment.getProperty('upload.image.view')} + *{mainPimg}" style="max-width:470px;"/>
@@ -191,7 +191,7 @@
 							</div>
 						</td>
 					</tr>
-					<tr>
+				<!-- 	<tr>
 						<th>모바일 메인 이미지<i id="mMimgStar"></i><br/>[삭제여부<label class="chkBox"><input type="checkbox" name="orgMainMimgDelYn" value="Y"/></label>]</th>
 						<td>
 							<div th:if=*{mainMimg} id="imgFileView" style="float:left;">
@@ -206,7 +206,7 @@
 								<input type="hidden" name="mainMimg" id="mainMimg"/>
 							</div>
 						</td>
-					</tr>
+					</tr> -->
 					<tr>
 						<th>투표일련번호</th>
 						<td>
@@ -571,7 +571,7 @@
   						</td>
 					</tr>
 					<tr>
-						<th>PC 메인 이미지<i id="pMimgStar"></i></th>
+						<th>메인 이미지<i id="pMimgStar"></i></th>
 						<td colspan="5">
 							<div class="uFile w400">
 								<input id="registerMainPimg" name="registerMainPimg" type="file" accept="image/*" class="uFileInput w400"/>
@@ -580,7 +580,7 @@
 							</div>
 						</td>
 					</tr>
-					<tr>
+					<!-- <tr>
 						<th>모바일 메인 이미지<i id="mMimgStar"></i></th>
 						<td colspan="5">
 							<div class="uFile w400">
@@ -589,7 +589,7 @@
 								<input type="hidden" name="mainMimg" id="mainMimg" value=""/>
 							</div>
 						</td>
-					</tr>
+					</tr> -->
 					<tr>
 									
 						<th>투표일련번호</th>

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

@@ -181,8 +181,23 @@
 														<label th:for="${'file' + num}" class="uFileLabel">파일선택</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}" class="w300 aR">
 													</div>
 													<br />
+													<table>
+														<tr>                                                                                                     
+															<th>클릭시 페이지창</th>                                                                                                     
+															<td>                                                                                                         
+															<label class="rdoBtn"><input type="radio" th:name="${'fileLinkOpenGb' + num}" value="M" checked/>현재창</label>   
+														     <label class="rdoBtn"><input type="radio" th:name="${'fileLinkOpenGb' + num}" value="N" />새창</label>                    
+															</td>                                                                                                                    
+														</tr>        
+														<tr>
+															<th>상품 링크</th>
+															<td><input type="text" th:name="${'fileLinkUrl' + num}" class="w300 aR">
+															</td>
+														</tr>
+														</table>
 												</div>
 											</th:block>
 										</td>
@@ -335,6 +350,13 @@
 															<td><input type="text" name="goodsTitle1" class="w300 aR">
 															</td>
 														</tr>
+														<tr>                                                                                                     
+															<th>클릭시 페이지창</th>                                                                                                     
+															<td>                                                                                                         
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb1" value="M" checked="checked"/>현재창</label>   
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb1" value="N" />새창</label>                    
+															</td>                                                                                                                    
+														</tr>        
 														<tr>
 															<th>상품 링크</th>
 															<td><input type="text" name="goodsUrl1" class="w300 aR">
@@ -394,6 +416,13 @@
 															<td><input type="text" name="goodsTitle2" class="w300 aR">
 															</td>
 														</tr>
+														<tr>                                                                                                     
+															<th>클릭시 페이지창</th>                                                                                                     
+															<td>                                                                                                         
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb2" value="M" checked="checked"/>현재창</label>   
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb2" value="N" />새창</label>                    
+															</td>                                                                                                                    
+														</tr>   
 														<tr>
 															<th>상품 링크</th>
 															<td><input type="text" name="goodsUrl2" class="w300 aR">
@@ -454,6 +483,13 @@
 															<td><input type="text" name="goodsTitle3" class="w300 aR">
 															</td>
 														</tr>
+														<tr>                                                                                                     
+															<th>클릭시 페이지창</th>                                                                                                     
+															<td>                                                                                                         
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb3" value="M" checked="checked"/>현재창</label>   
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb3" value="N" />새창</label>                    
+															</td>                                                                                                                    
+														</tr>   
 														<tr>
 															<th>상품 링크</th>
 															<td><input type="text" name="goodsUrl3" class="w300 aR">
@@ -514,6 +550,13 @@
 															<td><input type="text" name="goodsTitle4" class="w300 aR">
 															</td>
 														</tr>
+														<tr>                                                                                                     
+															<th>클릭시 페이지창</th>                                                                                                     
+															<td>                                                                                                         
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb4" value="M" checked="checked"/>현재창</label>   
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb4" value="N" />새창</label>                    
+															</td>                                                                                                                    
+														</tr>                                                                                                                       
 														<tr>
 															<th>상품 링크</th>
 															<td><input type="text" name="goodsUrl4" class="w300 aR">
@@ -574,6 +617,13 @@
 															<td><input type="text" name="goodsTitle5" class="w300 aR">
 															</td>
 														</tr>
+														<tr>                                                                                                     
+															<th>클릭시 페이지창</th>                                                                                                     
+															<td>                                                                                                         
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb5" value="M" checked="checked"/>현재창</label>   
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb5" value="N" />새창</label>                    
+															</td>                                                                                                                    
+														</tr>   
 														<tr>
 															<th>상품 링크</th>
 															<td><input type="text" name="goodsUrl5" class="w300 aR">
@@ -634,6 +684,13 @@
 															<td><input type="text" name="goodsTitle6" class="w300 aR">
 															</td>
 														</tr>
+														<tr>                                                                                                     
+															<th>클릭시 페이지창</th>                                                                                                     
+															<td>                                                                                                         
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb6" value="M" checked="checked"/>현재창</label>   
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb6" value="N" />새창</label>                    
+															</td>                                                                                                                    
+														</tr>   
 														<tr>
 															<th>상품 링크</th>
 															<td><input type="text" name="goodsUrl6" class="w300 aR">
@@ -694,6 +751,13 @@
 															<td><input type="text" name="goodsTitle7" class="w300 aR">
 															</td>
 														</tr>
+														<tr>                                                                                                     
+															<th>클릭시 페이지창</th>                                                                                                     
+															<td>                                                                                                         
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb7" value="M" checked="checked"/>현재창</label>   
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb7" value="N" />새창</label>                    
+															</td>                                                                                                                    
+														</tr>   
 														<tr>
 															<th>상품 링크</th>
 															<td><input type="text" name="goodsUrl7" class="w300 aR">
@@ -754,6 +818,13 @@
 															<td><input type="text" name="goodsTitle8" class="w300 aR">
 															</td>
 														</tr>
+														<tr>                                                                                                     
+															<th>클릭시 페이지창</th>                                                                                                     
+															<td>                                                                                                         
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb8" value="M" checked="checked"/>현재창</label>   
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb8" value="N" />새창</label>                    
+															</td>                                                                                                                    
+														</tr>   
 														<tr>
 															<th>상품 링크</th>
 															<td><input type="text" name="goodsUrl8" class="w300 aR">
@@ -814,6 +885,13 @@
 															<td><input type="text" name="goodsTitle9" class="w300 aR">
 															</td>
 														</tr>
+														<tr>                                                                                                     
+															<th>클릭시 페이지창</th>                                                                                                     
+															<td>                                                                                                         
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb9" value="M" checked="checked"/>현재창</label>   
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb9" value="N" />새창</label>                    
+															</td>                                                                                                                    
+														</tr>   
 														<tr>
 															<th>상품 링크</th>
 															<td><input type="text" name="goodsUrl9" class="w300 aR">
@@ -874,6 +952,13 @@
 															<td><input type="text" name="goodsTitle10" class="w300 aR">
 															</td>
 														</tr>
+														<tr>                                                                                                     
+															<th>클릭시 페이지창</th>                                                                                                     
+															<td>                                                                                                         
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb10" value="M" checked="checked"/>현재창</label>   
+															<label class="rdoBtn"><input type="radio" name="linkOpenGb10" value="N" />새창</label>                    
+															</td>                                                                                                                    
+														</tr>   
 														<tr>
 															<th>상품 링크</th>
 															<td><input type="text" name="goodsUrl10" class="w300 aR">
@@ -1238,6 +1323,7 @@
 			$("#planTemplateForm input[name=goodsUrl1]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd1]").val('');
 			$('#planTemplateForm input:radio[name=goodsType1]').prop('checked', false);
+			$('#planTemplateForm input:radio[name=linkOpenGb1]').prop('checked', false);
 			$('#planTemplateForm input:checkbox[name=goodsDispYn1]').prop('checked', false);
 			gridOptions_p1.api.updateRowData();
 		}
@@ -1255,6 +1341,7 @@
 			$("#planTemplateForm input[name=goodsUrl2]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd2]").val('');
 			$('#planTemplateForm input:radio[name=goodsType2]').prop('checked', false);
+			$('#planTemplateForm input:radio[name=linkOpenGb2]').prop('checked', false);
 			$('#planTemplateForm input:checkbox[name=goodsDispYn2]').prop('checked', false);
 			gridOptions_p2.api.updateRowData();
 		}			
@@ -1272,6 +1359,7 @@
 			$("#planTemplateForm input[name=goodsUrl3]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd3]").val('');
 			$('#planTemplateForm input:radio[name=goodsType3]').prop('checked', false);
+			$('#planTemplateForm input:radio[name=linkOpenGb3]').prop('checked', false);
 			$('#planTemplateForm input:checkbox[name=goodsDispYn3]').prop('checked', false);
 			gridOptions_p3.api.updateRowData();
 		}			
@@ -1289,6 +1377,7 @@
 			$("#planTemplateForm input[name=goodsUrl4]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd4]").val('');
 			$('#planTemplateForm input:radio[name=goodsType4]').prop('checked', false);
+			$('#planTemplateForm input:radio[name=linkOpenGb4]').prop('checked', false);
 			$('#planTemplateForm input:checkbox[name=goodsDispYn4]').prop('checked', false);
 			gridOptions_p4.api.updateRowData();
 		}			
@@ -1306,6 +1395,7 @@
 			$("#planTemplateForm input[name=goodsUrl5]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd5]").val('');
 			$('#planTemplateForm input:radio[name=goodsType5]').prop('checked', false);
+			$('#planTemplateForm input:radio[name=linkOpenGb5]').prop('checked', false);
 			$('#planTemplateForm input:checkbox[name=goodsDispYn5]').prop('checked', false);
 			gridOptions_p5.api.updateRowData();
 		}
@@ -1323,6 +1413,7 @@
 			$("#planTemplateForm input[name=goodsUrl6]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd6]").val('');
 			$('#planTemplateForm input:radio[name=goodsType6]').prop('checked', false);
+			$('#planTemplateForm input:radio[name=linkOpenGb6]').prop('checked', false);
 			$('#planTemplateForm input:checkbox[name=goodsDispYn6]').prop('checked', false);
 			gridOptions_p6.api.updateRowData();
 		}
@@ -1340,6 +1431,7 @@
 			$("#planTemplateForm input[name=goodsUrl7]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd7]").val('');
 			$('#planTemplateForm input:radio[name=goodsType7]').prop('checked', false);
+			$('#planTemplateForm input:radio[name=linkOpenGb7]').prop('checked', false);
 			$('#planTemplateForm input:checkbox[name=goodsDispYn7]').prop('checked', false);
 			gridOptions_p7.api.updateRowData();
 		}
@@ -1357,6 +1449,7 @@
 			$("#planTemplateForm input[name=goodsUrl8]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd8]").val('');
 			$('#planTemplateForm input:radio[name=goodsType8]').prop('checked', false);
+			$('#planTemplateForm input:radio[name=linkOpenGb8]').prop('checked', false);
 			$('#planTemplateForm input:checkbox[name=goodsDispYn8]').prop('checked', false);
 			gridOptions_p8.api.updateRowData();
 		}
@@ -1374,6 +1467,7 @@
 			$("#planTemplateForm input[name=goodsUrl9]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd9]").val('');
 			$('#planTemplateForm input:radio[name=goodsType9]').prop('checked', false);
+			$('#planTemplateForm input:radio[name=linkOpenGb9]').prop('checked', false);
 			$('#planTemplateForm input:checkbox[name=goodsDispYn9]').prop('checked', false);
 			gridOptions_p9.api.updateRowData();
 		}
@@ -1391,6 +1485,7 @@
 			$("#planTemplateForm input[name=goodsUrl10]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd10]").val('');
 			$('#planTemplateForm input:radio[name=goodsType10]').prop('checked', false);
+			$('#planTemplateForm input:radio[name=linkOpenGb10]').prop('checked', false);
 			$('#planTemplateForm input:checkbox[name=goodsDispYn10]').prop('checked', false);
 			gridOptions_p10.api.updateRowData();
 		}
@@ -1540,12 +1635,17 @@
 		
 		//파일관련 데이터 담기
 		var multiPlanFile = [];
+		var multiPlanFile2 = [];
+		var multiPlanFile3 = [];
+		
 		var count = $("#planTemplateForm select[name=fileCnt]").val();
 		for (var i = 0; i < count; i++) {
 			if($('#fileItemVal'+(i+1)).val() == '' || typeof $('#fileItemVal'+(i+1)).val() == 'undeifined'){
 				false;
 			}else{
-				multiPlanFile.push($('#fileItemVal'+(i+1)).val());	
+				multiPlanFile.push($('#fileItemVal'+(i+1)).val());
+				multiPlanFile2.push($('#planTemplateForm input[name=fileLinkUrl'+(i+1)+']').val());
+				multiPlanFile3.push($('#planTemplateForm input:radio[name=linkOpenGb'+(i+1)+']:checked').val());
 			}
 		}
 		
@@ -1857,10 +1957,10 @@
 		let goodsTemp8 = {};
 		let goodsTemp9 = {};
 		let goodsTemp10 = {};
-		
 		goodsTemp1.goodsTitle = $('#planTemplateForm input[name=goodsTitle1]').val();
 		goodsTemp1.goodsUrl = $('#planTemplateForm input[name=goodsUrl1]').val();
 		goodsTemp1.goodsType = $('#planTemplateForm input:radio[name=goodsType1]:checked').val();
+		goodsTemp1.goodsLinkOpenGb = $('#planTemplateForm input[name=linkOpenGb1]:checked').val();
 		goodsTemp1.goodsDispOrd = $('#planTemplateForm input[name=goodsDispOrd1]').val();
 		goodsTemp1.goodsDispYn = $('#planTemplateForm input:checkbox[name=goodsDispYn1]').val();
 		goodsTemp1.goodsPlanContSq = $('#planTemplateForm input[name=goodsPlanContSq1]').val();
@@ -1868,6 +1968,7 @@
 		goodsTemp2.goodsTitle = $('#planTemplateForm input[name=goodsTitle2]').val();
 		goodsTemp2.goodsUrl = $('#planTemplateForm input[name=goodsUrl2]').val();
 		goodsTemp2.goodsType = $('#planTemplateForm input:radio[name=goodsType2]:checked').val();
+		goodsTemp2.goodsLinkOpenGb = $('#planTemplateForm input:radio[name=linkOpenGb2]:checked').val();
 		goodsTemp2.goodsDispOrd = $('#planTemplateForm input[name=goodsDispOrd2]').val();
 		goodsTemp2.goodsDispYn = $('#planTemplateForm input:checkbox[name=goodsDispYn2]').val();
 		goodsTemp2.goodsPlanContSq = $('#planTemplateForm input[name=goodsPlanContSq2]').val();
@@ -1875,6 +1976,7 @@
 		goodsTemp3.goodsTitle = $('#planTemplateForm input[name=goodsTitle3]').val();
 		goodsTemp3.goodsUrl = $('#planTemplateForm input[name=goodsUrl3]').val();
 		goodsTemp3.goodsType = $('#planTemplateForm input:radio[name=goodsType3]:checked').val();
+		goodsTemp3.goodsLinkOpenGb = $('#planTemplateForm input:radio[name=linkOpenGb3]:checked').val();
 		goodsTemp3.goodsDispOrd = $('#planTemplateForm input[name=goodsDispOrd3]').val();
 		goodsTemp3.goodsDispYn = $('#planTemplateForm input:checkbox[name=goodsDispYn3]').val();
 		goodsTemp3.goodsPlanContSq = $('#planTemplateForm input[name=goodsPlanContSq3]').val();
@@ -1882,6 +1984,7 @@
 		goodsTemp4.goodsTitle = $('#planTemplateForm input[name=goodsTitle4]').val();
 		goodsTemp4.goodsUrl = $('#planTemplateForm input[name=goodsUrl4]').val();
 		goodsTemp4.goodsType = $('#planTemplateForm input:radio[name=goodsType4]:checked').val();
+		goodsTemp4.goodsLinkOpenGb = $('#planTemplateForm input:radio[name=linkOpenGb4]:checked').val();
 		goodsTemp4.goodsDispOrd = $('#planTemplateForm input[name=goodsDispOrd4]').val();
 		goodsTemp4.goodsDispYn = $('#planTemplateForm input:checkbox[name=goodsDispYn4]').val();
 		goodsTemp4.goodsPlanContSq = $('#planTemplateForm input[name=goodsPlanContSq4]').val();
@@ -1889,6 +1992,7 @@
 		goodsTemp5.goodsTitle = $('#planTemplateForm input[name=goodsTitle5]').val();
 		goodsTemp5.goodsUrl = $('#planTemplateForm input[name=goodsUrl5]').val();
 		goodsTemp5.goodsType = $('#planTemplateForm input:radio[name=goodsType5]:checked').val();
+		goodsTemp5.goodsLinkOpenGb = $('#planTemplateForm input:radio[name=linkOpenGb5]:checked').val();
 		goodsTemp5.goodsDispOrd = $('#planTemplateForm input[name=goodsDispOrd5]').val();
 		goodsTemp5.goodsDispYn = $('#planTemplateForm input:checkbox[name=goodsDispYn5]').val();
 		goodsTemp5.goodsPlanContSq = $('#planTemplateForm input[name=goodsPlanContSq5]').val();
@@ -1896,6 +2000,7 @@
 		goodsTemp6.goodsTitle = $('#planTemplateForm input[name=goodsTitle6]').val();
 		goodsTemp6.goodsUrl = $('#planTemplateForm input[name=goodsUrl6]').val();
 		goodsTemp6.goodsType = $('#planTemplateForm input:radio[name=goodsType6]:checked').val();
+		goodsTemp6.goodsLinkOpenGb = $('#planTemplateForm input:radio[name=linkOpenGb6]:checked').val();
 		goodsTemp6.goodsDispOrd = $('#planTemplateForm input[name=goodsDispOrd6]').val();
 		goodsTemp6.goodsDispYn = $('#planTemplateForm input:checkbox[name=goodsDispYn6]').val();
 		goodsTemp6.goodsPlanContSq = $('#planTemplateForm input[name=goodsPlanContSq6]').val();
@@ -1903,6 +2008,7 @@
 		goodsTemp7.goodsTitle = $('#planTemplateForm input[name=goodsTitle7]').val();
 		goodsTemp7.goodsUrl = $('#planTemplateForm input[name=goodsUrl7]').val();
 		goodsTemp7.goodsType = $('#planTemplateForm input:radio[name=goodsType7]:checked').val();
+		goodsTemp7.goodsLinkOpenGb = $('#planTemplateForm input:radio[name=linkOpenGb7]:checked').val();
 		goodsTemp7.goodsDispOrd = $('#planTemplateForm input[name=goodsDispOrd7]').val();
 		goodsTemp7.goodsDispYn = $('#planTemplateForm input:checkbox[name=goodsDispYn7]').val();
 		goodsTemp7.goodsPlanContSq = $('#planTemplateForm input[name=goodsPlanContSq7]').val();
@@ -1910,6 +2016,7 @@
 		goodsTemp8.goodsTitle = $('#planTemplateForm input[name=goodsTitle8]').val();
 		goodsTemp8.goodsUrl = $('#planTemplateForm input[name=goodsUrl8]').val();
 		goodsTemp8.goodsType = $('#planTemplateForm input:radio[name=goodsType8]:checked').val();
+		goodsTemp8.goodsLinkOpenGb = $('#planTemplateForm input:radio[name=linkOpenGb8]:checked').val();
 		goodsTemp8.goodsDispOrd = $('#planTemplateForm input[name=goodsDispOrd8]').val();
 		goodsTemp8.goodsDispYn = $('#planTemplateForm input:checkbox[name=goodsDispYn8]').val();
 		goodsTemp8.goodsPlanContSq = $('#planTemplateForm input[name=goodsPlanContSq8]').val();
@@ -1917,6 +2024,7 @@
 		goodsTemp9.goodsTitle = $('#planTemplateForm input[name=goodsTitle9]').val();
 		goodsTemp9.goodsUrl = $('#planTemplateForm input[name=goodsUrl9]').val();
 		goodsTemp9.goodsType = $('#planTemplateForm input:radio[name=goodsType9]:checked').val();
+		goodsTemp9.goodsLinkOpenGb = $('#planTemplateForm input:radio[name=linkOpenGb9]:checked').val();
 		goodsTemp9.goodsDispOrd = $('#planTemplateForm input[name=goodsDispOrd9]').val();
 		goodsTemp9.goodsDispYn = $('#planTemplateForm input:checkbox[name=goodsDispYn9]').val();
 		goodsTemp9.goodsPlanContSq = $('#planTemplateForm input[name=goodsPlanContSq9]').val();
@@ -1924,6 +2032,7 @@
 		goodsTemp10.goodsTitle = $('#planTemplateForm input[name=goodsTitle10]').val();
 		goodsTemp10.goodsUrl = $('#planTemplateForm input[name=goodsUrl10]').val();
 		goodsTemp10.goodsType = $('#planTemplateForm input:radio[name=goodsType10]:checked').val();
+		goodsTemp10.goodsLinkOpenGb = $('#planTemplateForm input:radio[name=linkOpenGb10]:checked').val();
 		goodsTemp10.goodsDispOrd = $('#planTemplateForm input[name=goodsDispOrd10]').val();
 		goodsTemp10.goodsDispYn = $('#planTemplateForm input:checkbox[name=goodsDispYn10]').val();
 		goodsTemp10.goodsPlanContSq = $('#planTemplateForm input[name=goodsPlanContSq10]').val();
@@ -1953,6 +2062,8 @@
 						   ,cuDispYn :  $('#planTemplateForm input:checkbox[name=cuDispYn]').val()  
 						   ,note :  $('#planTemplateForm textarea[name=note]').val()  
 						   ,multiPlanFile : multiPlanFile
+						   ,multiPlanFile2 : multiPlanFile2
+						   ,multiPlanFile3 : multiPlanFile3
 						   ,fileDispYn : $('#planTemplateForm input:checkbox[name=fileDispYn]').val() 
 						   ,fileDispOrd : $('#planTemplateForm input[name=fileDispOrd]').val()  
 						   ,filePlanContSq : $('#planTemplateForm input[name=filePlanContSq]').val()
@@ -2168,6 +2279,11 @@ $(document).ready(function() {
 						$('#planTemplateForm input:radio[name=goodsType'+(i+1)+']:radio[value="G082_52"]').prop('checked', true);
 					}
 					
+					if (goodsList[i].linkOpenGb == "M") {
+						$('#planTemplateForm input:radio[name=linkOpenGb'+(i+1)+']:radio[value="M"]').prop('checked', true);
+					}else if(goodsList[i].linkOpenGb == "N"){
+						$('#planTemplateForm input:radio[name=linkOpenGb'+(i+1)+']:radio[value="N"]').prop('checked', true);
+					}
 					$('#btnAddGridNum' + (i + 1)).show();