Merge branch 'sowon' into develop

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

@@ -5,6 +5,7 @@ import java.util.Collection;
 import org.springframework.stereotype.Repository;
 
 import com.style24.core.support.annotation.ShopDs;
+import com.style24.persistence.domain.Goods;
 import com.style24.persistence.domain.Plan;
 
 /**
@@ -342,4 +343,5 @@ public interface TsaPlanDao {
 	 * @since 2021. 2. 25
 	 */
 	void createPlanContentsItem(Plan param);
+
 }

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

@@ -3,12 +3,8 @@ package com.style24.admin.biz.service;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.session.SqlSession;
-import org.mybatis.spring.SqlSessionTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
@@ -20,6 +16,10 @@ import com.gagaframework.web.util.GagaFileUtil;
 import com.gagaframework.web.util.GagaStringUtil;
 import com.style24.admin.biz.dao.TsaPlanDao;
 import com.style24.admin.support.security.session.TsaSession;
+import com.style24.persistence.domain.Goods;
+import com.style24.persistence.domain.MktmailManagement;
+import com.style24.persistence.domain.MktmailManagementGoods;
+import com.style24.persistence.domain.MktmailManagementTc;
 import com.style24.persistence.domain.Plan;
 
 import lombok.extern.slf4j.Slf4j;
@@ -110,16 +110,6 @@ public class TsaPlanService {
 
 		log.debug("planSq : {}", param.getPlanSq());
 
-		// 웹용 소스
-//		if (StringUtils.isNotBlank(param.getFsrcPc())) {
-//			createPlanFsrcPc(param);
-//		}
-//
-//		// 모바일용 소스
-//		if (StringUtils.isNotBlank(param.getFsrcMobile())) {
-//			createPlanFsrcMobile(param);
-//		}
-
 		//기획전 응모이벤트
 //		if (StringUtils.isNotBlank(param.getPrivacyPolicy())) {
 //			int i = 0;
@@ -137,109 +127,7 @@ public class TsaPlanService {
 //		}
 
 	}
-	/*
-	 * 기획전 웹용 소스 등록
-	 */
-	@Transactional("shopTxnManager")
-	public Plan createPlanFsrcPc(Plan param) {
-		int fsrcPcTotalCnt = param.getFsrcPc().toCharArray().length;
-		int byteCnt = 1500;
-
-		// 기존 소스 삭제
-		param.setFrontGb("P");
-		//planDao.deletePlanFsrcInfo(param);
-		if (fsrcPcTotalCnt > byteCnt) { // 4000 바이트 이상 일 때 파싱.
-			StringBuilder sbStr = new StringBuilder(4000);
-
-			int cnt = 0;
-			int getCnt = 0;
-			int tempCnt = 1500;
-
-			for (char ch : param.getFsrcPc().toCharArray()) {
-				getCnt++;
-				sbStr.append(ch);
-
-				if (getCnt == tempCnt || getCnt == fsrcPcTotalCnt) {
-					Plan planPc = new Plan();
-					planPc.setPlanSq(param.getPlanSq());
-					planPc.setFrontGb("P");
-					planPc.setSeq(cnt + 1);
-					planPc.setRegNo(param.getRegNo());
-					planPc.setFsrc(sbStr.toString());
-
-					// 초기화
-					sbStr.delete(0, tempCnt);
-					cnt++;
-					tempCnt += byteCnt;
-
-					planDao.savePlanFsrcInfo(planPc);
-				}
-
-			}
-		} else {
-			Plan planPc = new Plan();
-			planPc.setPlanSq(param.getPlanSq());
-			planPc.setFrontGb("P");
-			planPc.setSeq(1);
-			planPc.setRegNo(param.getRegNo());
-			planPc.setFsrc(param.getFsrcPc());
-
-			planDao.savePlanFsrcInfo(planPc);
-		}
-		return param;
-	}
-
-	/*
-	 * 기획전 모바일 소스 등록
-	 */
-	@Transactional("shopTxnManager")
-	public Plan createPlanFsrcMobile(Plan param) {
-		int fsrcMobileTotalCnt = param.getFsrcMobile().toCharArray().length;
-		int byteCnt = 1500;
-
-		// 기존 소스 삭제
-		param.setFrontGb("M");
-		//planDao.deletePlanFsrcInfo(param);
-		if (fsrcMobileTotalCnt > byteCnt) { // 4000 바이트 이상 일 때 파싱.
-			StringBuilder sbStr = new StringBuilder(4000);
-
-			int cnt = 0;
-			int getCnt = 0;
-			int tempCnt = 1500;
-
-			for (char ch : param.getFsrcMobile().toCharArray()) {
-				getCnt++;
-				sbStr.append(ch);
-
-				if (getCnt == tempCnt || getCnt == fsrcMobileTotalCnt) {
-					Plan planMobile = new Plan();
-					planMobile.setPlanSq(param.getPlanSq());
-					planMobile.setFrontGb("M");
-					planMobile.setSeq(++cnt);
-					planMobile.setRegNo(param.getRegNo());
-					planMobile.setFsrc(sbStr.toString());
-
-					// 초기화
-					sbStr.delete(0, tempCnt);
-					//					cnt++;
-					tempCnt += byteCnt;
-
-					planDao.savePlanFsrcInfo(planMobile);
-				}
-			}
-		} else {
-			Plan planMobile = new Plan();
-			planMobile.setPlanSq(param.getPlanSq());
-			planMobile.setFrontGb("M");
-			planMobile.setSeq(1);
-			planMobile.setRegNo(param.getRegNo());
-			planMobile.setFsrc(param.getFsrcMobile());
 
-			planDao.savePlanFsrcInfo(planMobile);
-		}
-		return param;
-	}
-	
 	/**
 	 * 기획전 목록
 	 *
@@ -432,22 +320,6 @@ public class TsaPlanService {
 		// 최종업데이트 
 		planDao.updatePlanInfo(param);
 
-		// 웹용 소스
-//		if (StringUtils.isNotBlank(param.getFsrcPc())) {
-//			createPlanFsrcPc(param);
-//		} else {
-//			param.setFrontGb("P");
-//			planDao.deletePlanFsrcInfo(param);
-//		}
-//
-//		// 모바일용 소스
-//		if (StringUtils.isNotBlank(param.getFsrcMobile())) {
-//			createPlanFsrcMobile(param);
-//		} else {
-//			param.setFrontGb("M");
-//			planDao.deletePlanFsrcInfo(param);
-//		}
-
 		//기획전 응모이벤트
 //		if (StringUtils.isNotBlank(param.getPrivacyPolicy())) {
 //			int i = 0;
@@ -504,35 +376,6 @@ public class TsaPlanService {
 			planDao.createPlanCateCopy(plan);
 		}
 		
-		
-		// 02. 기획전 코너 목록 조회
-//		Plan serchCorner = new Plan();
-//		serchCorner.setPlanSq(param.getCopyPlanSq());
-//		Collection<TsaPlan> cornerList = marketingDao.getPlanCornerList(serchCorner);
-//
-//		for (TsaPlan cornerInfo : cornerList) {
-//			// 03. 기획전 코너 복사
-//			TsaPlan copyCorner = new TsaPlan();
-//			copyCorner.setPlanSq(plan.getPlanSq());
-//			copyCorner.setCopyPlanDtlSq(cornerInfo.getPlanDtlSq());
-//			copyCorner.setRegId(userId);
-//			copyCorner.setUpdId(userId);
-//			marketingDao.createPlanCornerCopy(copyCorner);
-//			plan.setPlanDtlSq(copyCorner.getPlanDtlSq());
-//
-//			// 04. 상품 조회
-//			TsaPlan searchGoods = new TsaPlan();
-//			searchGoods.setPlanDtlSq(cornerInfo.getPlanDtlSq());
-//			Collection<TsaPlan> goodsList = marketingDao.getPlanGoodsList(searchGoods);
-//
-//			// 05. 상품 복사
-//			for (TsaPlan goodsInfo : goodsList) {
-//				goodsInfo.setPlanDtlSq(plan.getPlanDtlSq());
-//				goodsInfo.setRegId(userId);
-//				goodsInfo.setUpdId(userId);
-//				marketingDao.createPlanGoodsCopy(goodsInfo);
-//			}
-//		}
 
 		return plan;
 	}
@@ -860,44 +703,327 @@ public class TsaPlanService {
 	 */
 	public void createPlanContents(Plan param) {
 		Integer regNo = TsaSession.getInfo().getUserNo();
-		// 리뷰 등록
-		Plan rePlan = new Plan();
-		System.out.println("====="+param.getReTitle());
-		System.out.println("====="+param.getReDispYn());
-		System.out.println("====="+param.getMultiPlanReview().length);
-		//리뷰 등록 - tb_plan_contents
-		if(!param.getReTitle().equals(null) || param.getMultiPlanReview().length>0) {
-			rePlan.setRegNo(regNo);
-			rePlan.setUpdNo(regNo);
-			rePlan.setTmplType("G082_20");
-			rePlan.setPlanSq(param.getPlanSq());
-			rePlan.setTitle(param.getReTitle());
-			rePlan.setDispYn(param.getReDispYn());
-			rePlan.setDispOrd(param.getReDispOrd());
-			planDao.createPlanContents(rePlan);
-
-			//리뷰 아이템 등록
-			if(param.getMultiPlanReview().length>0) {
-				String[] reItemVal = param.getMultiPlanReview();
-				String[] startDate = param.getMultiPlanReviewStartD();
-				String[] startTime = param.getMultiPlanReviewStartT();
-				String[] endDate = param.getMultiPlanReviewEndD();
-				String[] endTime = param.getMultiPlanReviewEndT();
-				// 기획전 브랜드 insert
-				for (int j = 0; j < reItemVal.length; j++) {
-					rePlan.setItemVal(reItemVal[j]);
-					rePlan.setReviewDispStdt(startDate[j] + ' ' +startTime[j]);
-					rePlan.setReviewDispEddt(endDate[j] + ' ' +endTime[j]);
+		
+		param.setRegNo(regNo);
+		
+		if (param.getMode().equals("C")) {
+			// 리뷰 등록
+			Plan rePlan = new Plan();
+			//리뷰 등록 - tb_plan_contents
+			if(param.getReTitle() != "" || param.getMultiPlanReview().length>0) {
+				rePlan.setRegNo(regNo);
+				rePlan.setUpdNo(regNo);
+				rePlan.setTmplType("G082_10");
+				rePlan.setPlanSq(param.getPlanSq());
+				rePlan.setTitle(param.getReTitle());
+				rePlan.setDispYn(param.getReDispYn());
+				rePlan.setDispOrd(param.getReDispOrd());
+				planDao.createPlanContents(rePlan);
+
+				//리뷰 아이템 등록
+				if(param.getMultiPlanReview().length>0) {
+					String[] reItemVal = param.getMultiPlanReview();
+					String[] startDate = param.getMultiPlanReviewStartD();
+					String[] startTime = param.getMultiPlanReviewStartT();
+					String[] endDate = param.getMultiPlanReviewEndD();
+					String[] endTime = param.getMultiPlanReviewEndT();
+					// 기획전 브랜드 insert
+					for (int j = 0; j < reItemVal.length; j++) {
+						rePlan.setItemVal(reItemVal[j]);
+						rePlan.setReviewDispStdt(startDate[j] + ' ' +startTime[j]);
+						rePlan.setReviewDispEddt(endDate[j] + ' ' +endTime[j]);
+						planDao.createPlanContentsItem(rePlan);
+					}
+				}
+			}
+			
+			// 쿠폰등록
+			Plan cuPlan = new Plan();
+			//쿠폰 등록 - tb_plan_contents
+			if(param.getCuTitle() != "" || param.getMultiPlanCoupon().length>0) {
+				cuPlan.setRegNo(regNo);
+				cuPlan.setUpdNo(regNo);
+				cuPlan.setTmplType("G082_20");
+				cuPlan.setPlanSq(param.getPlanSq());
+				cuPlan.setTitle(param.getCuTitle());
+				cuPlan.setDispYn(param.getCuDispYn());
+				cuPlan.setDispOrd(param.getCuDispOrd());
+				planDao.createPlanContents(cuPlan);
+				
+				//쿠폰아이템 등록
+				if(param.getMultiPlanCoupon().length>0) {
+					String[] cuItemVal = param.getMultiPlanCoupon();
+					
+					// 기획전 브랜드 insert
+					for (int j = 0; j < cuItemVal.length; j++) {
+						cuPlan.setItemVal(cuItemVal[j]);
+						planDao.createPlanContentsItem(cuPlan);
+					}
 				}
-				planDao.createPlanContentsItem(rePlan);
 			}
+			
+			//이미지등록
+			Plan filePlan = new Plan();
+			if(param.getMultiPlanFile().length>0) {
+				filePlan.setRegNo(regNo);
+				filePlan.setUpdNo(regNo);
+				filePlan.setTmplType("G082_30");
+				filePlan.setPlanSq(param.getPlanSq());
+				filePlan.setDispYn(param.getFileDispYn());
+				filePlan.setDispOrd(param.getFileDispOrd());
+				planDao.createPlanContents(filePlan);
+				
+				//파일아이템 등록
+				if(param.getMultiPlanFile().length>0) {
+					String[] fileItemVal = param.getMultiPlanFile();
+					
+					// 기획전 브랜드 insert
+					for (int j = 0; j < fileItemVal.length; j++) {
+						filePlan.setItemVal(fileItemVal[j]);
+						planDao.createPlanContentsItem(filePlan);
+					}
+				}
+			}
+			
+			//HTML[상단] 등록
+			Plan fsrcTop = new Plan();
+			if(param.getFsrcMobileTop() != "" || param.getFsrcPcTop() != "") {
+				//tb_plan_contents 등록
+				fsrcTop.setRegNo(regNo);
+				fsrcTop.setUpdNo(regNo);
+				fsrcTop.setTmplType("G082_40");
+				fsrcTop.setPlanSq(param.getPlanSq());
+				fsrcTop.setDispYn(param.getTopFsrcDispYn());
+				fsrcTop.setDispOrd(param.getTopFsrcDispOrd());
+				
+				planDao.createPlanContents(fsrcTop);
+				
+				// 웹용 상단PC 등록
+				if (StringUtils.isNotBlank(param.getFsrcPcTop())) {
+					createPlanFsrcPcTop(param);
+				}
+				// 웹용 상단MOBILE 등록
+				if (StringUtils.isNotBlank(param.getFsrcMobileTop())) {
+					createPlanFsrcMobileTop(param);
+				}
+			}
+			
+			//HTML[하단] 등록
+			Plan fsrcBtm = new Plan();
+			if(param.getFsrcMobileBtm() != "" || param.getFsrcPcBtm() != "") {
+				//tb_plan_contents 등록
+				fsrcBtm.setRegNo(regNo);
+				fsrcBtm.setUpdNo(regNo);
+				fsrcBtm.setTmplType("G082_41");
+				fsrcBtm.setPlanSq(param.getPlanSq());
+				fsrcBtm.setDispYn(param.getBtmFsrcDispYn());
+				fsrcBtm.setDispOrd(param.getBtmFsrcDispOrd());
+				
+				planDao.createPlanContents(fsrcBtm);
+				
+				// 웹용 상단PC 등록
+				if (StringUtils.isNotBlank(param.getFsrcPcBtm())) {
+					createPlanFsrcPcBtm(param);
+				}
+				// 웹용 상단MOBILE 등록
+				if (StringUtils.isNotBlank(param.getFsrcMobileBtm())) {
+					createPlanFsrcMobileBtm(param);
+				}
+			}
+			
+			//상품 등록
+		
 		}
+	}
+	
+	
+	/*
+	 * 기획전 템플릿 HTML[상단] PC 소스 등록
+	 */
+	@Transactional("shopTxnManager")
+	public Plan createPlanFsrcPcTop(Plan param) {
+		Plan fsrcTop = new Plan();
+		int fsrcPcTotalCnt = param.getFsrcPcTop().toCharArray().length;
+		int byteCnt = 1500;
 		
-		// 쿠폰등록
 		
+		fsrcTop.setFrontGb("P");                 
+		fsrcTop.setRegNo(param.getRegNo());      
+		fsrcTop.setPlanSq(param.getPlanSq());    
 		
+		if (fsrcPcTotalCnt > byteCnt) { // 4000 바이트 이상 일 때 파싱.
+			StringBuilder sbStr = new StringBuilder(4000);
+
+			int cnt = 0;
+			int getCnt = 0;
+			int tempCnt = 1500;
+
+			for (char ch : param.getFsrcPcTop().toCharArray()) {
+				getCnt++;
+				sbStr.append(ch);
+
+				if (getCnt == tempCnt || getCnt == fsrcPcTotalCnt) {
+					fsrcTop.setSeq(cnt + 1);
+					fsrcTop.setFsrcTop(sbStr.toString());
+
+					// 초기화
+					sbStr.delete(0, tempCnt);
+					cnt++;
+					tempCnt += byteCnt;
+
+					planDao.savePlanFsrcInfo(fsrcTop);
+				}
+
+			}
+		} else {
+			fsrcTop.setSeq(1);
+			fsrcTop.setFsrcTop(param.getFsrcPcTop());
+
+			planDao.savePlanFsrcInfo(fsrcTop);
+		}
+		return param;
+	}
+
+	/*
+	 * 기획전 템플릿 HTML[상단] mobile 소스 등록
+	 */
+	@Transactional("shopTxnManager")
+	public Plan createPlanFsrcMobileTop(Plan param) {
+		Plan fsrcMobile = new Plan();
+		
+		int fsrcMobileTotalCnt = param.getFsrcMobileTop().toCharArray().length;
+		int byteCnt = 1500;
+
+		fsrcMobile.setFrontGb("M");
+		fsrcMobile.setRegNo(param.getRegNo());
+		fsrcMobile.setPlanSq(param.getPlanSq());
+		
+		if (fsrcMobileTotalCnt > byteCnt) { // 4000 바이트 이상 일 때 파싱.
+			StringBuilder sbStr = new StringBuilder(4000);
+
+			int cnt = 0;
+			int getCnt = 0;
+			int tempCnt = 1500;
+
+			for (char ch : param.getFsrcMobileTop().toCharArray()) {
+				getCnt++;
+				sbStr.append(ch);
+
+				if (getCnt == tempCnt || getCnt == fsrcMobileTotalCnt) {
+					
+					fsrcMobile.setSeq(cnt+1);
+					fsrcMobile.setFsrcTop(sbStr.toString());
+
+					// 초기화
+					sbStr.delete(0, tempCnt);
+					cnt++;
+					tempCnt += byteCnt;
+
+					planDao.savePlanFsrcInfo(fsrcMobile);
+				}
+			}
+		} else {
+			fsrcMobile.setSeq(1);
+			fsrcMobile.setFsrcTop(param.getFsrcMobileTop());
+			planDao.savePlanFsrcInfo(fsrcMobile);
+		}
+		return param;
 	}
 	
+	/*
+	 * 기획전 템플릿 HTML[하단] PC 소스 등록
+	 */
+	@Transactional("shopTxnManager")
+	public Plan createPlanFsrcPcBtm(Plan param) {
+		Plan fsrcBtm = new Plan();
+		int fsrcPcTotalCnt = param.getFsrcPcBtm().toCharArray().length;
+		int byteCnt = 1500;
+		
+		
+		fsrcBtm.setFrontGb("P");                 
+		fsrcBtm.setRegNo(param.getRegNo());      
+		fsrcBtm.setPlanSq(param.getPlanSq());    
+		
+		if (fsrcPcTotalCnt > byteCnt) { // 4000 바이트 이상 일 때 파싱.
+			StringBuilder sbStr = new StringBuilder(4000);
+
+			int cnt = 0;
+			int getCnt = 0;
+			int tempCnt = 1500;
+
+			for (char ch : param.getFsrcPcBtm().toCharArray()) {
+				getCnt++;
+				sbStr.append(ch);
+
+				if (getCnt == tempCnt || getCnt == fsrcPcTotalCnt) {
+					fsrcBtm.setSeq(cnt + 1);
+					fsrcBtm.setFsrcBtm(sbStr.toString());
+
+					// 초기화
+					sbStr.delete(0, tempCnt);
+					cnt++;
+					tempCnt += byteCnt;
+
+					planDao.savePlanFsrcInfo(fsrcBtm);
+				}
+
+			}
+		} else {
+			fsrcBtm.setSeq(1);
+			fsrcBtm.setFsrcBtm(param.getFsrcPcBtm());
+
+			planDao.savePlanFsrcInfo(fsrcBtm);
+		}
+		return param;
+	}
+
+	/*
+	 * 기획전 템플릿 HTML[하단] mobile 소스 등록
+	 */
+	@Transactional("shopTxnManager")
+	public Plan createPlanFsrcMobileBtm(Plan param) {
+		Plan fsrcMobile = new Plan();
+		
+		int fsrcMobileTotalCnt = param.getFsrcMobileBtm().toCharArray().length;
+		int byteCnt = 1500;
+
+		fsrcMobile.setFrontGb("M");
+		fsrcMobile.setRegNo(param.getRegNo());
+		fsrcMobile.setPlanSq(param.getPlanSq());
+		
+		if (fsrcMobileTotalCnt > byteCnt) { // 4000 바이트 이상 일 때 파싱.
+			StringBuilder sbStr = new StringBuilder(4000);
+
+			int cnt = 0;
+			int getCnt = 0;
+			int tempCnt = 1500;
+
+			for (char ch : param.getFsrcMobileBtm().toCharArray()) {
+				getCnt++;
+				sbStr.append(ch);
+
+				if (getCnt == tempCnt || getCnt == fsrcMobileTotalCnt) {
+					
+					fsrcMobile.setSeq(cnt+1);
+					fsrcMobile.setFsrcBtm(sbStr.toString());
+
+					// 초기화
+					sbStr.delete(0, tempCnt);
+					cnt++;
+					tempCnt += byteCnt;
+
+					planDao.savePlanFsrcInfo(fsrcMobile);
+				}
+			}
+		} else {
+			fsrcMobile.setSeq(1);
+			fsrcMobile.setFsrcBtm(param.getFsrcMobileBtm());
+			planDao.savePlanFsrcInfo(fsrcMobile);
+		}
+		return param;
+	}
+	
+	
 	/**
 	 * 기획전 템플릿 목록 카운트 조회
 	 * @param  param
@@ -921,4 +1047,6 @@ public class TsaPlanService {
 	}
 	
 
+	
+
 }

src/main/java/com/style24/admin/biz/web/TsaMarketingController.java

@@ -2070,7 +2070,10 @@ public class TsaMarketingController extends TsaBaseController {
 		}else {
 			mav.addObject("mode","C");
 		}
-		
+		// 상품상태
+		String[] exceptCds = {"G008_00"};
+		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", exceptCds));
+
 		mav.addObject("planSq",planSq);
 		mav.setViewName("marketing/PlanTemplatePopupForm");
 		return mav;
@@ -2091,6 +2094,7 @@ public class TsaMarketingController extends TsaBaseController {
 		
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
+	
 
 	/**
 	 *   기획전 작업 종료 - sowon

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

@@ -2,6 +2,7 @@ package com.style24.persistence.domain;
 
 
 import java.util.Collection;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.style24.admin.biz.dao.TsaPlanDao;
@@ -134,13 +135,13 @@ public class Plan extends TscBaseDomain{
 		private String[] goodsCdArr;		// 상품 코드 배열
 		private String goodsCd;				// 상품 코드
 		private String goodsNm;				// 상품 명
+		private String goodsStat;			// 제품상태
 		private String imgType;				// 이미지 타입
 		private String imgPath1;			// 이미지 경로1
 		private String imgPath2;			// 이미지 경로2
 		private String imgPath4;			// 이미지 경로4
 		private String imgPath5;			// 이미지 경로5
 		private String imgPath6;			// 이미지 경로6
-		private String goodsStat;			// 상품 상태
 		private String dcRate;				// 할인율
 		private String listPrice;			// 최소 소비자가
 		private String tagPrice;			// tag 가
@@ -172,21 +173,48 @@ public class Plan extends TscBaseDomain{
 		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 		private String[] multiPlanReview;		//리뷰상품목록
 		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-		private String[] multiPlanReviewStartD;		//리뷰상품목록
+		private String[] multiPlanReviewStartD;		//리뷰시작날짜
 		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-		private String[] multiPlanReviewStartT;		//리뷰상품목록
+		private String[] multiPlanReviewStartT;		//리뷰시작시간
 		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-		private String[] multiPlanReviewEndD;		//리뷰상품목록
+		private String[] multiPlanReviewEndD;		//리뷰종료날짜
 		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-		private String[] multiPlanReviewEndT;		//리뷰상품목록
+		private String[] multiPlanReviewEndT;		//리뷰종료시간
+		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+		private String[] multiPlanCoupon;		//쿠폰목록
+		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+		private String[] multiPlanFile;			//이미지목록
+
 		
+		// 템플릿 저장하기 위한 임시 변수
 		private String reTitle;				//리뷰타이틀
 		private String mode;				//모드
 		private long reDispOrd;				//리뷰전시순서
 		private String reItemVal;			//리뷰아이템
 		private String reDispYn;			//리뷰전시여부
 		
+		private String cuTitle;				//쿠폰타이틀
+		private long cuDispOrd;				//쿠폰전시순서
+		private String cuDispYn;			//쿠폰전시여부
+		private String cuItemVal;			//쿠폰 아이템
+		
+		private String fileItemVal;			//파일아이템
+		private String fileDispYn;			//파일전시여부
+		private long fileDispOrd;			//파일전시순서
+		
+		private String topFsrcDispYn;		//html상단 전시여부
+		private String BtmFsrcDispYn;		//html하단 전시여부
+		private long   topFsrcDispOrd;		//html상단 전시순서
+		private long   btmFsrcDispOrd;		//html하단 전시순서
+		private String fsrcPcTop;			//html상단 내용(pc)
+		private String fsrcMobileTop;	    //html상단 내용(mobile)
+		private String fsrcPcBtm;			//html하단 내용(pc)
+		private String fsrcMobileBtm;		//html하단 내용(pc)
 		
+		private String goodsTitle;			//상품타이틀
+		private String goodsUrl;			//상품 url
+		private String goodsDispYn;			//상품전시여부
+		private long goodsDispOrd;			//상품 전시순서
 		
 		// Pagination
 		private TscPageRequest pageable;
@@ -206,4 +234,26 @@ public class Plan extends TscBaseDomain{
 	    // 사용가능고객구분
 	    @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	    private String[] usableCustGbArr;
+	    
+	    
+		private String[] multiPlanGoodsContent1; 
+		private String[] multiPlanGoodsContent2; 
+		private String[] multiPlanGoodsContent3; 
+		private String[] multiPlanGoodsContent4; 
+		private String[] multiPlanGoodsContent5; 
+		private String[] multiPlanGoodsContent6; 
+		private String[] multiPlanGoodsContent7; 
+		private String[] multiPlanGoodsContent8; 
+		private String[] multiPlanGoodsContent9; 
+		private String[] multiPlanGoodsContent10; 
+		private String[] multiPlanGoodsContentVal1; 
+		private String[] multiPlanGoodsContentVal2; 
+		private String[] multiPlanGoodsContentVal3; 
+		private String[] multiPlanGoodsContentVal4; 
+		private String[] multiPlanGoodsContentVal5; 
+		private String[] multiPlanGoodsContentVal6; 
+		private String[] multiPlanGoodsContentVal7; 
+		private String[] multiPlanGoodsContentVal8; 
+		private String[] multiPlanGoodsContentVal9; 
+		private String[] multiPlanGoodsContentVal10; 
 }

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

@@ -4,7 +4,7 @@
 
 	<!-- 기획전 등록 -->
 	<insert id="createPlanInfo" parameterType="Plan">
-		/* TsaMarketing.createPlanInfo */
+		/* TsaPlan.createPlanInfo */
 		<selectKey keyProperty="planSq" resultType="Integer" order="AFTER">
 			SELECT LAST_INSERT_ID()	/* 기획전 일련번호  */
 		</selectKey>
@@ -81,7 +81,7 @@
 	
 	<!-- 기획전 목록 -->
 	<select id="getPlanList" parameterType="Plan" resultType="Plan">
-		/* TsaMarketing.getPlanList */
+		/* TsaPlan.getPlanList */
 		 SELECT Z.*
 		 FROM(
 		 	  SELECT @rownum := @rownum + 1 AS RNUM
@@ -132,7 +132,7 @@
 	
 	<!-- 기획전 리스트 카운트 조회-->
 	<select id="getPlanListCount" parameterType="Plan" resultType="int">
-		/* TsaMarketing.getPlanListCount */
+		/* TsaPlan.getPlanListCount */
 		SELECT COUNT(1)
 		  FROM TB_PlAN
 		 WHERE 1=1
@@ -209,7 +209,7 @@
 	
 	<!-- 기획전 삭제처리 -->
 	<update id="deletePlan" parameterType="Plan">
-		/* TsaMarketing.deletePlan */
+		/* TsaPlan.deletePlan */
 		UPDATE TB_PLAN
 		SET    UPD_NO = #{updNo}
 		     , UPD_DT = now()
@@ -219,7 +219,7 @@
 	
 	<!-- 기획전  소스 삭제 -->
 	<delete id="deletePlanFsrcInfo" parameterType="Plan">
-		/* TsaMarketing.deletePlanFsrcInfo */
+		/* TsaPlan.deletePlanFsrcInfo */
 		DELETE TB_PLAN_FSRC
 		WHERE  PLAN_SQ = #{planSq}
 		AND    FRONT_GB = #{frontGb}
@@ -227,12 +227,13 @@
 	
 	<!-- 기획전  소스 등록 -->
 	<insert id="savePlanFsrcInfo" parameterType="Plan">
-		/* TsaMarketing.savePlanFsrcInfo */
+		/* TsaPlan.savePlanFsrcInfo */
 		         INSERT INTO
 				      TB_PLAN_FSRC (
 				          PLAN_SQ
 				          , FRONT_GB
-				          , FSRC
+				          , FSRC_TOP
+				          , FSRC_BTM
 				          , REG_NO
 				          , REG_DT
 				          , UPD_NO
@@ -241,7 +242,8 @@
 				   VALUES (
 				    	  #{planSq}
 				          , #{frontGb}
-				          , #{fsrc}
+				          , #{fsrcTop}
+				          , #{fsrcBtm}
 				          , #{regNo}
 				          , now()
 				          , #{regNo}
@@ -250,14 +252,15 @@
 				   ON
 				      DUPLICATE KEY
 				   UPDATE
-				       FSRC = #{fsrc}
+				       FSRC_TOP = #{fsrcTop}
+			         , FSRC_BTM = #{fsrcBtm}
 		         	 , UPD_NO = #{regNo}
 		         	 , UPD_DT = now()
 	</insert>
 	
 	<!--  기획전 웹용 소스 조회 -->
 	<select id="getPlanFsrcList" parameterType="Plan" resultType="Plan">
-		/* TsaMarketing.getPlanFsrcList */
+		/* TsaPlan.getPlanFsrcList */
 		SELECT PLAN_SQ
 		     , FRONT_GB
 		     , FSRC_TOP
@@ -273,19 +276,15 @@
 	
 	<!-- 기획전 수정 -->
 	<update id="updatePlanInfo" parameterType="Plan">
-		/* TsaMarketing.updatePlanInfo */
+		/* TsaPlan.updatePlanInfo */
 		UPDATE TB_PLAN
 		   SET PLAN_GB = #{planGb}
-		     <!-- , CUST_GB = #{custGb} -->
-		     <!-- , CUST_GRADE = #{custGrade} -->
-		     <!-- , PLAN_SNM = #{planSnm} -->
 		     , FRONT_GB = #{frontGb}
 		     , PLAN_NM = #{planNm}
 		     , DISP_STDT = DATE_FORMAT(#{dispStdt} , '%Y-%m-%d %H:%i:%s')
 		     , DISP_EDDT = DATE_FORMAT(#{dispEddt} , '%Y-%m-%d %H:%i:%s')
 		     , CORNER_NM_DISP_YN = #{cornerNmDispYn}
 		     , OPEN_YN = #{openYn}
-		     <!-- , DEL_YN = #{delYn} -->
 		     , SITE_CD = #{siteCd}
 		     , DISP_ORD = IFNULL(#{dispOrd}, 999)
 		     , DTL_TITLE1 = #{dtlTitle1}
@@ -297,7 +296,6 @@
 		     , REPLY_TITLE1 = #{replyTitle1}
 		     , REPLY_TITLE2 = #{replyTitle2}
 		     , POLL_SQ = #{pollSq}
-		     <!-- , PRIVACY_POLICY = #{privacyPolicy} -->
 		     , DEV_URL = #{devUrl}
 		     , REPLY_YN = #{replyYn}
 		     , REPLY_LOC = #{replyLoc}
@@ -325,7 +323,7 @@
 	
 	<!-- 기획전 전체 조회 -->
 	<select id="getPlanAllList" parameterType="Plan" resultType="Plan">
-		/* TsaMarketing.getPlanAllList */
+		/* TsaPlan.getPlanAllList */
 		SELECT PLAN_SQ
 		     , PLAN_NM
 		FROM   TB_PLAN
@@ -339,7 +337,7 @@
 
 	<!-- 기획전 복사 -->
 	<insert id="createPlanCopy" parameterType="Plan">
-		/* TsaMarketing.createPlanCopy */
+		/* TsaPlan.createPlanCopy */
 		<selectKey keyProperty="planSq" resultType="Integer" order="AFTER">
 			SELECT LAST_INSERT_ID()	/* 기획전 일련번호  */
 		</selectKey>
@@ -347,9 +345,6 @@
 		            PLAN_SQ
 		          , PLAN_NM
 		          , PLAN_GB
-		          <!-- , CUST_GB -->
-		          <!-- , CUST_GRADE -->
-		          <!-- , PLAN_SNM -->
 		          , SITE_CD
 		          , FRONT_GB
 		          , DISP_STDT
@@ -359,15 +354,12 @@
 		          , DTL_PIMG
 		          , DTL_MIMG
 		          , DTL_TITLE1        
-		          <!-- , CATE_CD -->
-		          <!-- , CATE_DISP_YN -->
 		          , REPLY_YN
 		          , REPLY_LOC
 		          , REPLY_IMG
 		          , REPLY_TITLE1
 		          , REPLY_TITLE2
 		          , POLL_SQ
-		          <!-- , PRIVACY_POLICY -->
 		          , DEV_URL
 		          , CORNER_NM_DISP_YN
 		          , GOODS_LIMIT_YN
@@ -386,9 +378,6 @@
 		      ) SELECT #{planSq}
 		             , PLAN_NM
 		             , PLAN_GB
-		             <!-- , CUST_GB -->
-		             <!-- , CUST_GRADE -->
-		             <!-- , PLAN_SNM -->
 		             , SITE_CD
 		             , FRONT_GB
 		             , DISP_STDT
@@ -398,15 +387,12 @@
 		             , DTL_PIMG
 		             , DTL_MIMG
 		             , DTL_TITLE1
-		             <!-- , CATE_CD -->
-		             <!-- , CATE_DISP_YN -->
 		             , REPLY_YN
 		             , REPLY_LOC
 		             , REPLY_IMG
 		             , REPLY_TITLE1
 		             , REPLY_TITLE2
 		             , POLL_SQ
-		             <!-- , PRIVACY_POLICY -->
 		             , DEV_URL
 		             , CORNER_NM_DISP_YN
 		             , GOODS_LIMIT_YN
@@ -427,7 +413,7 @@
 	</insert>
 	
 	<insert id="createPlanBrand" parameterType="Plan">
-		/* TsaMarketing.createPlanBrand */
+		/* TsaPlan.createPlanBrand */
 		INSERT INTO TB_PLAN_BRAND
 			(
 				BRAND_GROUP_NO
@@ -451,14 +437,14 @@
 	</insert>
 	
 	<delete id="deletePlanBrand" parameterType="Plan">
-		/* TsaMarketing.deletePlanBrand */
+		/* TsaPlan.deletePlanBrand */
 		DELETE 
 		FROM TB_PLAN_BRAND
 		WHERE PLAN_SQ = ${planSq}
 	</delete>
 	
 	<select id="getPlanBrandList" parameterType="Plan" resultType="Plan">
-		/* TsaMarketing.getPlanBrandList */
+		/* TsaPlan.getPlanBrandList */
 		SELECT TP.PLAN_NM AS PLAN_NM
 				     , TP.PLAN_SQ AS PLAN_SQ
 				     , TB.BRAND_GROUP_ENM AS BRAND_GROUP_ENM
@@ -475,7 +461,7 @@
 	</select>
 	
 	<insert id="createPlanBrandCopy" parameterType="Plan">
-		/* TsaMarketing.createPlanBrandCopy */
+		/* TsaPlan.createPlanBrandCopy */
 			INSERT INTO
 					 TB_PLAN_BRAND 
 					 (
@@ -500,7 +486,7 @@
 	</insert>
 	
 	<insert id="createPlanCate" parameterType="Plan">
-		/* TsaMarketing.createPlanCate */
+		/* TsaPlan.createPlanCate */
 		INSERT INTO TB_PLAN_CATE
 		(
 			CATE_NO
@@ -524,14 +510,14 @@
 	</insert>
 	
 	<delete id="deletePlanCate" parameterType="Plan">
-		/* TsaMarketing.deletePlanCate */
+		/* TsaPlan.deletePlanCate */
 		DELETE 
 		FROM TB_PLAN_CATE
 		WHERE PLAN_SQ = ${planSq}
 	</delete>
 	
 	<select id="getPlanCateList" parameterType="Plan" resultType="Plan">
-		/* TsaMarketing.getPlanCateList */
+		/* TsaPlan.getPlanCateList */
 		 SELECT TP.PLAN_NM AS PLAN_NM
 				     , TP.PLAN_SQ AS PLAN_SQ
 				     , TC.CATE1_NM AS CATE_NM
@@ -549,7 +535,7 @@
 	</select>
 	
 	<insert id="createPlanCateCopy" parameterType="Plan">
-		/* TsaMarketing.createPlanCateCopy */
+		/* TsaPlan.createPlanCateCopy */
 			INSERT INTO
 					 TB_PLAN_CATE
 					 (
@@ -576,7 +562,7 @@
 	
 	<!-- 기획전 코너 시퀀스 조회 -->
 	<select id="getPlanDtlSq" parameterType="Plan" resultType="Integer">
-		/* TsaMarketing.getPlanDtlSq */
+		/* TsaPlan.getPlanDtlSq */
 		SELECT CASE COUNT(*) 
 			   WHEN 0 THEN 1 
 			   ELSE MAX(PLAN_DTL_SQ) + 1 
@@ -586,7 +572,7 @@
 	
 	<!-- 기획전 코너 목록 -->
 	<select id="getPlanCornerList" parameterType="Plan" resultType="Plan">
-		/* TsaMarketing.getPlanCornerList */
+		/* TsaPlan.getPlanCornerList */
 		SELECT A.PLAN_SQ
 		     , B.PLAN_DTL_SQ
 		     , B.CORNER_NM
@@ -609,7 +595,7 @@
 	
 	<!-- 기획전 코너 삭제 처리 -->
 	<delete id="deletePlanCornerInfo" parameterType="Plan">
-		/* TsaMarketing.deletePlanCornerInfo */
+		/* TsaPlan.deletePlanCornerInfo */
 		DELETE 
 		FROM TB_PLAN_DETAIL 
 		WHERE  PLAN_SQ = #{planSq}
@@ -618,7 +604,7 @@
 	
 	<!-- 기획전 코너 상품 삭제 처리 -->
 	<update id="deletePlanCornerGoods" parameterType="Plan">
-		/* TsaMarketing.deletePlanCornerGoods */
+		/* TsaPlan.deletePlanCornerGoods */
 		UPDATE TB_PLAN_GOODS
 		SET    DEL_YN = 'Y'
 		     , DISP_ORD = 0
@@ -630,7 +616,7 @@
 	
 	<!-- 기획전 코너 저장 -->
 	<insert id="savePlanCornerInfo" parameterType="Plan">
-		/* TsaMarketing.savePlanCornerInfo */
+		/* TsaPlan.savePlanCornerInfo */
 		<selectKey keyProperty="planDtlSq" resultType="Integer" order="AFTER">
 			SELECT LAST_INSERT_ID()	/* 기획전 일련번호  */
 		</selectKey>
@@ -675,7 +661,7 @@
 	
 	<!-- 기획전 코너 상품 목록 조회 -->
 	<select id="getPlanGoodsList" parameterType="Plan" resultType="Plan">
-		/* TsaGoods.getPlanGoodsList */
+		/* TsaPlan.getPlanGoodsList */
 		SELECT Q.*
 		    , (CASE WHEN Q.GOODS_TYPE = 'G056_N' THEN (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = Q.GOODS_CD) 
 		            ELSE (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK_COMPOSE WHERE GOODS_CD = Q.GOODS_CD) 
@@ -738,7 +724,7 @@
 	
 	<!-- 기획전 코너 상품 목록 조회 건수 -->
 	<select id="getPlanGoodsListCount" parameterType="Plan" resultType="int">
-		/* TsaMarketing.getPlanGoodsListCount */
+		/* TsaPlan.getPlanGoodsListCount */
 		SELECT COUNT(*) AS CNT
 		FROM (
 		    SELECT
@@ -782,7 +768,7 @@
 	
 	<!-- 기획전 코너 상품저장 -->
 	<insert id="savePlanCornerGoods" parameterType="Plan">
-		/* TsaMarketing.savePlanCornerGoods */
+		/* TsaPlan.savePlanCornerGoods */
 		INSERT INTO
 			      TB_PLAN_GOODS (
 			                PLAN_DTL_SQ
@@ -814,7 +800,7 @@
 	
 	<!-- 기획전 코너 복사 -->
 	<insert id="createPlanCornerCopy" parameterType="Plan">
-		/* TsaMarketing.createPlanCornerCopy */
+		/* TsaPlan.createPlanCornerCopy */
 		INSERT INTO TB_PLAN_DETAIL (
 		            PLAN_DTL_SQ						          
 		          , PLAN_SQ                              
@@ -844,7 +830,7 @@
 	
 	<!-- 기획전 상품 복사 -->
 	<insert id="createPlanGoodsCopy" parameterType="Plan">
-		/* TsaMarketing.createPlanGoodsCopy */
+		/* TsaPlan.createPlanGoodsCopy */
 		INSERT INTO TB_PLAN_GOODS (
 		            PLAN_DTL_SQ				 
 		          , GOODS_CD                 
@@ -867,7 +853,7 @@
 	</insert>
 	
 	<insert id="createPlanCustGb" parameterType="Plan">
-		/* TsaMarketing.createPlanCustGb */
+		/* TsaPlan.createPlanCustGb */
 		INSERT INTO TB_PLAN_CUST_DIVISION
 						(
 							PLAN_SQ
@@ -884,7 +870,7 @@
 	</insert>
 	
 	<insert id="createPlanCustGrade" parameterType="Plan">
-		/* TsaMarketing.createPlanCustGrade */
+		/* TsaPlan.createPlanCustGrade */
 		INSERT INTO TB_PLAN_CUST_GRADE
 				(
 					PLAN_SQ
@@ -901,7 +887,7 @@
 	</insert>
 	
 	<select id="getPlanCustGbList" parameterType="Plan" resultType="Plan">
-		/* TsaMarketing.createPlanCustGrade */
+		/* TsaPlan.createPlanCustGrade */
 		SELECT CUST_GB 
 			  ,PLAN_SQ 
 			  ,REG_DT 
@@ -911,7 +897,7 @@
 	</select>
 	
 	<select id="getPlanCustGradeList" parameterType="Plan" resultType="Plan">
-		/* TsaMarketing.getPlanCustGradeList */
+		/* TsaPlan.getPlanCustGradeList */
 		SELECT CUST_GRADE 
 		      ,PLAN_SQ 
 		      ,REG_DT 
@@ -921,7 +907,7 @@
 	</select>
 	
 	<insert id="createPlanContents" parameterType="Plan" useGeneratedKeys="true" keyProperty="planContSq">
-		/* TsaMarketing.createPlanContents */
+		/* TsaPlan.createPlanContents */
 		INSERT INTO 
 			TB_PLAN_CONTENTS(
 							 PLAN_CONT_SQ
@@ -962,7 +948,7 @@
 	
 	
 	<select id="getPlanContentsCount" parameterType="Plan" resultType="int">
-		/* TsaMarketing.getPlanContentsCount */
+		/* TsaPlan.getPlanContentsCount */
 		SELECT COUNT(*) AS CNT
 		FROM TB_PLAN_CONTENTS
 		WHERE PLAN_SQ = #{planSq}
@@ -970,6 +956,7 @@
 	
 	
 	<insert id="createPlanContentsItem" parameterType="Plan">
+		/* TsaPlan.createPlanContentsItem */
 		INSERT INTO 
 			TB_PLAN_CONTENTS_ITEM(
 						PLAN_CONT_SQ
@@ -998,7 +985,6 @@
 	</insert>
 	
 	
-	
 </mapper>
 
 

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

@@ -347,7 +347,6 @@
 	}
 	
 	var fnSearchCallBack = function(result){
-		console.log(result.pageing.pageable.totalCount.addComma());
 		$('#planListSearchForm').find('#gridRowTotalCount').html(result.pageing.pageable.totalCount.addComma());
 		$('#planListSearchForm').find('#pageNo').val(result.pageing.pageable.pageNo.addComma());
 		$('#planListSearchForm').find('#pgNo').html(result.pageing.pageable.pageNo.addComma());