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

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

@@ -388,32 +388,33 @@ 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;
-			}
-			if(!param.getMainMimg().contains("planning")) {
-				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;
+//			}
+//			if(!param.getMainMimg().contains("planning")) {
+//				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.deletePlanAttendBenefitList(param);
 		

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

@@ -312,7 +312,7 @@
 											<td class="dcCdCheck2">
 												<input type="text" class="w200" name="onePubQty" id="onePubQty" value="1" required="required" data-valid-name="1회발행수량" data-valid-type="numeric" style="text-align: right;">개
 											</td>
-											<th class="downAblArea">다운로드가능여부<em class="required" title="필수"></em></th>
+											<th class="downAblArea">상픔상세노출여부<em class="required" title="필수"></em></th>
 											<td class="downAblArea">
 												<select name="downAblYn" id="downAblYn" required="required" data-valid-name="다운로드가능여부">
 													<option value="Y">Y</option>