소스 검색

기획전 수정

sowon4187 5 년 전
부모
커밋
9b8dbe703a

+ 3 - 3
src/main/java/com/style24/admin/biz/dao/TsaPlanDao.java

@@ -34,7 +34,7 @@ public interface TsaPlanDao {
 	 * @author rladbwnd5
 	 * @since 2019. 12. 31
 	 */
-	void createPlanWebInfo(Plan param);
+	void createPlanInfo(Plan param);
 	
 	/**
 	 * 기획전 목록
@@ -53,7 +53,7 @@ public interface TsaPlanDao {
 	 * @author sowon
 	 * @since 2021. 2. 5
 	 */
-	int getPlanListCnt(Plan param);
+	int getPlanListCount(Plan param);
 	
 	/**
 	 * 기획전 삭제
@@ -99,7 +99,7 @@ public interface TsaPlanDao {
 	 * @author sowon
 	 * @since 2021. 2. 8
 	 */
-	void updatePlanWebInfo(Plan param);
+	void updatePlanInfo(Plan param);
 	
 	/**
 	 * 기획전 복사

+ 7 - 8
src/main/java/com/style24/admin/biz/service/TsaPlanService.java

@@ -60,11 +60,11 @@ public class TsaPlanService {
 	 * @since 2021. 2. 8
 	 */
 	@Transactional("shopTxnManager")
-	public void createPlanWebInfo(Plan param) {
+	public void createPlanInfo(Plan param) {
 		Plan plan = new Plan();
 		param.setRegNo(TsaSession.getInfo().getUserNo());
 		param.setUpdNo(TsaSession.getInfo().getUserNo());
-		planDao.createPlanWebInfo(param);
+		planDao.createPlanInfo(param);
 		
 		String[] brand = param.getMultiBrand();
 		// 기획전 브랜드 insert
@@ -237,8 +237,8 @@ public class TsaPlanService {
 	 * @author sowon
 	 * @since 2021. 2. 5
 	 */
-	public int getPlanListCnt(Plan param) {
-		return planDao.getPlanListCnt(param);
+	public int getPlanListCount(Plan param) {
+		return planDao.getPlanListCount(param);
 	}
 	
 	/**
@@ -265,7 +265,7 @@ public class TsaPlanService {
 	 * @author sowon
 	 * @since 2021. 2. 8
 	 */
-	public Plan getPlanWebDetailInfo(Plan param) {
+	public Plan getPlanDetailInfo(Plan param) {
 		Collection<Plan> planList = planDao.getPlanList(param);
 		Plan planInfo = new Plan();
 
@@ -345,7 +345,7 @@ public class TsaPlanService {
 	 * @since 2021. 2. 8
 	 */
 	@Transactional("shopTxnManager")
-	public void updatePlanWebInfo(Plan param) {
+	public void updatePlanInfo(Plan param) {
 		Plan plan = new Plan();
 		log.debug("param {}", param);
 		String targetPath = env.getProperty("upload.default.target.path") + "/planning";
@@ -405,7 +405,7 @@ public class TsaPlanService {
 		}
 		
 		// 최종업데이트 
-		planDao.updatePlanWebInfo(param);
+		planDao.updatePlanInfo(param);
 
 		// 웹용 소스
 //		if (StringUtils.isNotBlank(param.getFsrcPc())) {
@@ -634,7 +634,6 @@ public class TsaPlanService {
 		for (Plan cornerInfo : paramList) {
 			cornerInfo.setRegNo(TsaSession.getInfo().getUserNo());
 			cornerInfo.setUpdNo(TsaSession.getInfo().getUserNo());
-
 			planDao.savePlanCornerInfo(cornerInfo);
 		}
 

+ 22 - 22
src/main/java/com/style24/admin/biz/web/TsaMarketingController.java

@@ -36,6 +36,7 @@ import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.biz.service.TscPointService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
+import com.style24.core.support.session.TscSession;
 import com.style24.persistence.TscPageRequest;
 
 import com.style24.persistence.domain.CardPromotion;
@@ -1566,8 +1567,8 @@ public class TsaMarketingController extends TsaBaseController {
 	 * @author sowon
 	 * @since 2021. 2. 04
 	 */
-	@GetMapping("/planning/webdetail/form")
-	public ModelAndView planWebDetailForm(Plan param) {
+	@GetMapping("/planning/detail/form")
+	public ModelAndView planDetailForm(Plan param) {
 		ModelAndView mav = new ModelAndView();
 
 		if (param.getMode().equals("N")) { // 신규 일 때
@@ -1584,7 +1585,7 @@ public class TsaMarketingController extends TsaBaseController {
 			mav.addObject("upperAfLinkCdList", rendererService.getAvailCommonCodeList("G053"));
 
 		} else if(param.getMode().equals("U")){ // 상세 일 때
-			mav.addObject("planInfo", planService.getPlanWebDetailInfo(param));
+			mav.addObject("planInfo", planService.getPlanDetailInfo(param));
 
 			mav.addObject("fsrcPc", planService.getPlanFsrcPcList(param));
 
@@ -1625,7 +1626,7 @@ public class TsaMarketingController extends TsaBaseController {
 		mav.addObject("usableCustGradeList", rendererService.getAvailCommonCodeList("G110"));
 		
 		mav.addObject("mode", param.getMode());
-		mav.setViewName("marketing/PlanWebDetailPopupForm");
+		mav.setViewName("marketing/PlanDetailPopupForm");
 		return mav;
 	}
 	
@@ -1636,10 +1637,10 @@ public class TsaMarketingController extends TsaBaseController {
 	 * @author sowon
 	 * @since 2021. 2. 4
 	 */
-	@PostMapping("/planning/webdetail/create")
+	@PostMapping("/planning/detail/create")
 	@ResponseBody
-	public GagaResponse createPlanWebInfo(@RequestBody Plan param) {
-		planService.createPlanWebInfo(param);
+	public GagaResponse createPlanInfo(@RequestBody Plan param) {
+		planService.createPlanInfo(param);
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 	
@@ -1663,7 +1664,7 @@ public class TsaMarketingController extends TsaBaseController {
 		
 //		param.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		param.setPageable(new TscPageRequest(param.getPageNo() - 1, param.getPageSize()));
-		param.getPageable().setTotalCount(planService.getPlanListCnt(param));
+		param.getPageable().setTotalCount(planService.getPlanListCount(param));
 		
 		
 		Collection<Plan> planList = planService.getPlanList(param);
@@ -1685,7 +1686,7 @@ public class TsaMarketingController extends TsaBaseController {
 	 * @author sowon
 	 * @since 2021. 2. 16
 	 */
-	@PostMapping("/planning/listPop")
+	@PostMapping("/planning/list/detail/popup")
 	@ResponseBody
 	public Collection<Plan> getPlanListPop(@RequestBody Plan param) {
 		//param.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
@@ -1715,10 +1716,10 @@ public class TsaMarketingController extends TsaBaseController {
 	 * @author sowon		
 	 * @since 2021. 2. 8
 	 */
-	@PostMapping("/plan/webdetail/update")
+	@PostMapping("/plan/detail/update")
 	@ResponseBody
-	public GagaResponse updatePlanWebInfo(@RequestBody Plan param) {
-		planService.updatePlanWebInfo(param);
+	public GagaResponse updatePlanInfo(@RequestBody Plan param) {
+		planService.updatePlanInfo(param);
 		return super.ok(message.getMessage("SUCC_0002"));
 	}
 	
@@ -1784,7 +1785,7 @@ public class TsaMarketingController extends TsaBaseController {
 		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y"));
 
 		// 기획전 상세 정보
-		mav.addObject("planInfo", planService.getPlanWebDetailInfo(param));
+		mav.addObject("planInfo", planService.getPlanDetailInfo(param));
 
 
 		mav.setViewName("marketing/PlanCornerListForm");
@@ -1833,12 +1834,12 @@ public class TsaMarketingController extends TsaBaseController {
 	 * @author sowon
 	 * @since 2021. 2. 16
 	 */
-	@GetMapping("/planning/corner/plandtlsq")
-	@ResponseBody
-	public long getPlanDtlSq(Plan param) {
-		return planService.getPlanDtlSq(param);
-	}
-	
+//	@GetMapping("/planning/corner/plandtlsq")
+//	@ResponseBody
+//	public long getPlanDtlSq(Plan param) {
+//		return planService.getPlanDtlSq(param);
+//	}
+//	
 	/**
 	 * 기획전 코너 삭제
 	 *
@@ -1983,7 +1984,7 @@ public class TsaMarketingController extends TsaBaseController {
 	 * @author sowon
 	 * @since 2021. 2. 18
 	 */
-	@GetMapping("/planning/webdetail/template/form")
+	@GetMapping("/planning/detail/template/form")
 	public ModelAndView planTemplateForm(Plan param) {
 		ModelAndView mav = new ModelAndView();
 
@@ -2071,8 +2072,7 @@ public class TsaMarketingController extends TsaBaseController {
 	@PostMapping("/poll/list")
 	@ResponseBody
 	public Collection<Poll> getPollList(@RequestBody Poll poll) {
-		Collection<Poll> pollList = pollService.getPollList(poll);
-		return pollList;
+		return pollService.getPollList(poll);
 	}
 	
 	/**

+ 10 - 7
src/main/java/com/style24/persistence/mybatis/shop/TsaPlan.xml

@@ -3,8 +3,8 @@
 <mapper namespace="com.style24.admin.biz.dao.TsaPlanDao">
 
 	<!-- 기획전 등록 -->
-	<insert id="createPlanWebInfo" parameterType="Plan">
-		/* TsaMarketing.createPlanWebInfo */
+	<insert id="createPlanInfo" parameterType="Plan">
+		/* TsaMarketing.createPlanInfo */
 		<selectKey keyProperty="planSq" resultType="Integer" order="AFTER">
 			SELECT LAST_INSERT_ID()	/* 기획전 일련번호  */
 		</selectKey>
@@ -154,8 +154,8 @@
 	</select>
 	
 	<!-- 기획전 리스트 카운트 조회-->
-	<select id="getPlanListCnt" parameterType="Plan" resultType="int">
-		/* TsaMarketing.getPlanListCnt */
+	<select id="getPlanListCount" parameterType="Plan" resultType="int">
+		/* TsaMarketing.getPlanListCount */
 		SELECT COUNT(1)
 		  FROM TB_PlAN
 		 WHERE 1=1
@@ -297,8 +297,8 @@
 	</select>
 	
 	<!-- 기획전 수정 -->
-	<update id="updatePlanWebInfo" parameterType="Plan">
-		/* TsaMarketing.updatePlanWebInfo */
+	<update id="updatePlanInfo" parameterType="Plan">
+		/* TsaMarketing.updatePlanInfo */
 		UPDATE TB_PLAN
 		   SET PLAN_GB = #{planGb}
 		     <!-- , CUST_GB = #{custGb} -->
@@ -659,6 +659,9 @@
 	<!-- 기획전 코너 저장 -->
 	<insert id="savePlanCornerInfo" parameterType="Plan">
 		/* TsaMarketing.savePlanCornerInfo */
+		<selectKey keyProperty="planDtlSq" resultType="Integer" order="AFTER">
+			SELECT LAST_INSERT_ID()	/* 기획전 일련번호  */
+		</selectKey>
 		INSERT INTO
 			      TB_PLAN_DETAIL (
 			            PLAN_SQ         
@@ -674,7 +677,7 @@
                       , UPD_NO          
 			      )
 			   VALUES (
-			    	   #{planSq}                                         
+			    	   #{planSq}                                        
                      , #{planDtlSq}                                      
                      , DATE_FORMAT(#{dispStdt} , '%Y-%m-%d %H:%i:%s')     
                      , DATE_FORMAT(#{dispEddt} , '%Y-%m-%d %H:%i:%s')   

+ 1 - 1
src/main/webapp/WEB-INF/views/marketing/PlanCornerCopyForm.html

@@ -207,7 +207,7 @@
 						fnCornerSearch();
 					} else {
 						fnSearch();						
-						uifnPopupClose('popupEventWebDetail');
+						uifnPopupClose('popupEventDetail');
 					}
 					uifnPopupClose('popupCornerCopy')
 				});

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

@@ -206,12 +206,9 @@
 			mcxDialog.alert('추가 된 코너를 저장 후 코너를 추가하세요.');
 			return;
 		} else {
-			var actionUrl = '/marketing/planning/corner/plandtlsq?planSq=' + planSq;
-			$.get(actionUrl
-						, function(planDtlSq) {
-								var data = { planDtlSq: planDtlSq, planSq:planSq, cornerNm:'',cornerDispType: 4 + '컷', startSearchDate: _today, startSearchTime: stdt[1], endSearchDate: eddt[0], endSearchTime: eddt[1]};
-								gagaAgGrid.addRowData(gridOptionsCorner, data, "planDtlSq");
-					});
+	
+			var data = { planDtlSq: '', planSq:planSq, cornerNm:'',cornerDispType: 6 + '컷', startSearchDate: _today, startSearchTime: stdt[1], endSearchDate: eddt[0], endSearchTime: eddt[1]};
+			gagaAgGrid.addRowData(gridOptionsCorner, data);
 		}
 
 	});

+ 97 - 82
src/main/webapp/WEB-INF/views/marketing/PlanWebDetailPopupForm.html → src/main/webapp/WEB-INF/views/marketing/PlanDetailPopupForm.html

@@ -3,7 +3,7 @@
 	xmlns:th="http://www.thymeleaf.org">
 <!--
  *******************************************************************************
- * @source  : PlanWebDetailForm.html
+ * @source  : PlanDetailForm.html
  * @desc    : 웹 수정 / 웹 등록 팝업 화면 Page
  *============================================================================
  * SISUN
@@ -14,16 +14,16 @@
  * 1.0  2020.02.04   sowon   최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" data-width="1100" id="planWebRegisterFormDiv">
+<div class="modalPopup" data-width="1100" id="planRegisterFormDiv">
 	<div class="panelStyle">
 		<div class="panelTitle">
-			<h2 th:text="${'기획전 ' + (mode == 'N' ? '등록' : '수정')}">기획전 웹 수정</h2>
-			<button type="button" class="close" onclick="uifnPopupClose('popupPlanWebDetail')"><i class="fa fa-times"></i></button>
+			<h2 th:text="${'기획전 ' + (mode == 'N' ? '등록' : '수정')}"></h2>
+			<button type="button" class="close" onclick="uifnPopupClose('planRegisterFormDiv')"><i class="fa fa-times"></i></button>
 		</div>
 		
 	<!-- 기획전 웹 수정 -->
 		<div class="panelContent" th:if="${mode == 'U'}">
-		<form th:object="${planInfo}" id="planWebUpdateForm" name="planWebUpdateForm" action="#" th:action="@{'/system/user/save'}" th:method="post">
+		<form th:object="${planInfo}" id="planUpdateForm" name="planUpdateForm" action="#" th:method="post">
 			<input type="hidden" name="mode" th:value="${mode}"/>
 			<input type="hidden" name="planSq" th:value="*{planSq}"/>
 
@@ -271,7 +271,7 @@
 			<div style='margin: 13px;'>
 			<ul class="panelBar">
 				<li class="right" th:if="${mode == 'U'}">
-					<button type="button" class="btn btn-success btn-lg" onclick="fnPlanSave('#planWebUpdateForm');">저장</button>
+					<button type="button" class="btn btn-success btn-lg" onclick="fnPlanSave('#planUpdateForm');">저장</button>
 				</li>
 			</ul>
 			</div>
@@ -281,22 +281,25 @@
 	
 		<!-- 기획전 웹 등록 -->
 		<div class="panelContent" th:if="${mode == 'N'}">
-			<form id="planWebRegisterForm" name="planWebRegisterForm" action="#" th:action="@{'/system/user/save'}" th:method="post">
+			<form id="planRegisterForm" name="planRegisterForm" action="#" th:action="@{'/system/user/save'}" th:method="post">
 			<input type="hidden" name="mode" th:value="${mode}"/>
 			<div>
 				<table class="frmStyle">
 					<colgroup>
-						<col style="width: 150px;"/>
+						<col style="width:13%;"/>
 						<col/>
 					</colgroup>
 					<tr>
 						<th>기존 기획전</th>
 						<td>
-							<select name="planSq" id="planSq">
+							<!-- <select name="planSq" id="planSq">
 								<option value="">선택</option>
 								<option th:if="${planList}" th:each="oneData, status : ${planList}" th:value="${oneData.planSq}" th:text="|[${oneData.planSq}]  ${oneData.planNm}|"></option>
-							</select>
-							<button type="button" class="btn btn-default btn-lg" onclick="fnPlanCopyPopup();">기획전 복사</button>
+							</select> -->
+							<input type="text" class="w100" name="searchTxt" id="searchTxt" maxlength="20" readonly="readonly"/>
+							<input type="hidden" class="w100" name="planSq_Hideen" id="planSq_Hideen" maxlength="20"/>
+							<button type="button" class="btn icn" id="btnPopupSearchPlan"><i class="fa fa-search"></i></button>
+							<button type="button" class="btn btn-primary btn-lg" onclick="fnPlanCopyPopup();">기획전 복사</button>
 						</td>
 					</tr>
 				</table>
@@ -534,7 +537,7 @@
 				</div>
 				<ul class="panelBar">
 					<li class="right" th:if="${mode == 'N'}">
-						<button type="button" class="btn btn-info btn-lg" onclick="fnPlanSave('#planWebRegisterForm');">저장</button>
+						<button type="button" class="btn btn-info btn-lg" onclick="fnPlanSave('#planRegisterForm');">저장</button>
 					</li>
 				</ul>
 			</form>
@@ -580,14 +583,25 @@
 	
 	//템플릿 유형 설정
 	var fnPlanTemplatePopup = function () {
-		var actionUrl = "/marketing/planning/webdetail/template/form?mode=C";
+		var actionUrl = "/marketing/planning/detail/template/form?mode=C";
 		cfnOpenModalPopup(actionUrl,'popupPlanTemplate');
 	}
 	
+	// 기존 기획전 조회 선택시
+	$('#btnPopupSearchPlan').on('click', function(result) {
+		cfnOpenPlanPopup('popupPlan');
+		
+	});
+	
+	var popupPlan = function (result) {
+		$("#planSq_Hideen").val(result[0].planSq);
+		$("#searchTxt").val("[" + result[0].planSq + "] " +result[0].planNm);
+		
+	}
 
 	// 기획전 복사
 	var fnPlanCopyPopup = function() {
-		var planSq = $('#planWebRegisterForm select[name=planSq]').val();
+		var planSq = $("#planSq_Hideen").val(); 
 
 		if (gagajf.isNull(planSq)) {
 			mcxDialog.alert('복사할 기획전을 선택하세요.');
@@ -609,11 +623,11 @@
 
 	// 기획전 복사 callback
 	var fnCopyCallback = function(result) {
-		uifnPopupClose('planWebRegisterFormDiv');
+		uifnPopupClose('planRegisterFormDiv');
 		fnPlanListSearch();
 
-		var actionUrl = "/marketing/planning/webdetail/form?mode=U&planSq=" + result.planSq;
-		cfnOpenModalPopup(actionUrl,'popupPlanWebDetail');
+		var actionUrl = "/marketing/planning/detail/form?mode=U&planSq=" + result.planSq;
+		cfnOpenModalPopup(actionUrl,'popupPlan');
 	}
 
 	var fnPlanSave = function(formId) {
@@ -711,7 +725,7 @@
 			return;
 		}
 
-		//var jsonData = JSON.stringify($("#planWebRegisterForm").serializeObject());
+		//var jsonData = JSON.stringify($("#planRegisterForm").serializeObject());
 		
 		let allBrandData = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);
 		var multiBrand = [];
@@ -726,7 +740,7 @@
 		});
 		
 		// 기획전 등록
-		if (formId == '#planWebRegisterForm') {
+		if (formId == '#planRegisterForm') {
 			mcxDialog.confirm('등록 하시겠습니까?', {
 				cancelBtnText: "취소",
 				sureBtnText: "확인",
@@ -737,37 +751,37 @@
 							,brandList : allBrandData
 							,multiCate : multiCate
 							,CateList : allCateData
-						    ,mode : $('#planWebRegisterForm input[name=mode]').val()
-						    ,planSq : $('#planWebRegisterForm input[name=planSq]').val()
-							,planGb	: $('#planWebRegisterForm select[name=planGb]').val()
-							,templateType :	$('#planWebRegisterForm select[name=templateType]').val()
-							,frontGb : $('#planWebRegisterForm select[name=frontGb]').val()
-							,planNm : $('#planWebRegisterForm input[name=planNm]').val()
-							,startSearchDate : $('#planWebRegisterForm input[name=startSearchDate]').val()
-							,startSearchHour : $('#planWebRegisterForm input[name=startSearchHour]').val()
-							,startSearchMin : $('#planWebRegisterForm input[name=startSearchMin]').val()
-							,endSearchDate : $('#planWebRegisterForm input[name=endSearchDate]').val()
-							,endSearchHour : $('#planWebRegisterForm input[name=endSearchHour]').val()
-							,endSearchMin : $('#planWebRegisterForm input[name=endSearchMin]').val()
-							,dispStdt : $('#planWebRegisterForm input[name=dispStdt]').val()
-							,dispEddt : $('#planWebRegisterForm input[name=dispEddt]').val()
-							,dtlTitle1 : $('#planWebRegisterForm input[name=dtlTitle1]').val()
-							,cornerNmDispYn :  $('#planWebRegisterForm select[name=cornerNmDispYn]').val()
-							,openYn :  $('#planWebRegisterForm select[name=openYn]').val()
-							,siteCd :$('#planWebRegisterForm select[name=siteCd]').val()
-							,dispOrd : $('#planWebRegisterForm input[name=dispOrd]').val()
-							,replyYn : $('#planWebRegisterForm select[name=replyYn]').val()
-							,mainPimg :$('#planWebRegisterForm input[name=mainPimg]').val()
-							,mainMimg : $('#planWebRegisterForm input[name=mainMimg]').val()
-							,fsrcPc :  $('#planWebRegisterForm input[name=fsrcPc]').val()
-							,fsrcMobile : $('#planWebRegisterForm input[name=fsrcMobile]').val()
+						    ,mode : $('#planRegisterForm input[name=mode]').val()
+						    ,planSq : $('#planRegisterForm input[name=planSq]').val()
+							,planGb	: $('#planRegisterForm select[name=planGb]').val()
+							,templateType :	$('#planRegisterForm select[name=templateType]').val()
+							,frontGb : $('#planRegisterForm select[name=frontGb]').val()
+							,planNm : $('#planRegisterForm input[name=planNm]').val()
+							,startSearchDate : $('#planRegisterForm input[name=startSearchDate]').val()
+							,startSearchHour : $('#planRegisterForm input[name=startSearchHour]').val()
+							,startSearchMin : $('#planRegisterForm input[name=startSearchMin]').val()
+							,endSearchDate : $('#planRegisterForm input[name=endSearchDate]').val()
+							,endSearchHour : $('#planRegisterForm input[name=endSearchHour]').val()
+							,endSearchMin : $('#planRegisterForm input[name=endSearchMin]').val()
+							,dispStdt : $('#planRegisterForm input[name=dispStdt]').val()
+							,dispEddt : $('#planRegisterForm input[name=dispEddt]').val()
+							,dtlTitle1 : $('#planRegisterForm input[name=dtlTitle1]').val()
+							,cornerNmDispYn :  $('#planRegisterForm select[name=cornerNmDispYn]').val()
+							,openYn :  $('#planRegisterForm select[name=openYn]').val()
+							,siteCd :$('#planRegisterForm select[name=siteCd]').val()
+							,dispOrd : $('#planRegisterForm input[name=dispOrd]').val()
+							,replyYn : $('#planRegisterForm select[name=replyYn]').val()
+							,mainPimg :$('#planRegisterForm input[name=mainPimg]').val()
+							,mainMimg : $('#planRegisterForm input[name=mainMimg]').val()
+							,fsrcPc :  $('#planRegisterForm input[name=fsrcPc]').val()
+							,fsrcMobile : $('#planRegisterForm input[name=fsrcMobile]').val()
 						}	
 					
 					var jsonData =  JSON.stringify(data);
-					gagajf.ajaxJsonSubmit("/marketing/planning/webdetail/create", jsonData, fnPlanWebDetailCallBack); 
-					uifnPopupClose('planWebRegisterFormDiv');
+					gagajf.ajaxJsonSubmit("/marketing/planning/detail/create", jsonData, fnPlanDetailCallBack); 
+					uifnPopupClose('planRegisterFormDiv');
 					fnPlanListSearch();
-					//fnPlanWebDetailClose();
+					//fnPlanDetailClose();
 				}
 			});
 		} else { // 기획전 수정
@@ -781,39 +795,39 @@
 							,brandList : allBrandData
 							,multiCate : multiCate
 							,CateList : allCateData
-						    ,mode : $('#planWebUpdateForm input[name=mode]').val()
-						    ,planSq : $('#planWebUpdateForm input[name=planSq]').val()
-							,planGb	: $('#planWebUpdateForm select[name=planGb]').val()
-							,templateType :	$('#planWebUpdateForm select[name=templateType]').val()
-							,frontGb : $('#planWebUpdateForm select[name=frontGb]').val()
-							,planNm : $('#planWebUpdateForm input[name=planNm]').val()
-							,startSearchDate : $('#planWebUpdateForm input[name=startSearchDate]').val()
-							,startSearchHour : $('#planWebUpdateForm input[name=startSearchHour]').val()
-							,startSearchMin : $('#planWebUpdateForm input[name=startSearchMin]').val()
-							,endSearchDate : $('#planWebUpdateForm input[name=endSearchDate]').val()
-							,endSearchHour : $('#planWebUpdateForm input[name=endSearchHour]').val()
-							,endSearchMin : $('#planWebUpdateForm input[name=endSearchMin]').val()
-							,dispStdt : $('#planWebUpdateForm input[name=dispStdt]').val()
-							,dispEddt : $('#planWebUpdateForm input[name=dispEddt]').val()
-							,dtlTitle1 : $('#planWebUpdateForm input[name=dtlTitle1]').val()
-							,cornerNmDispYn :  $('#planWebUpdateForm select[name=cornerNmDispYn]').val()
-							,openYn :  $('#planWebUpdateForm select[name=openYn]').val()
-							,siteCd :$('#planWebUpdateForm select[name=siteCd]').val()
-							,dispOrd : $('#planWebUpdateForm input[name=dispOrd]').val()
-							,replyYn : $('#planWebUpdateForm select[name=replyYn]').val()
-							,mainPimg :$('#planWebUpdateForm input[name=mainPimg]').val()
-							,mainMimg : $('#planWebUpdateForm input[name=mainMimg]').val()
-							,fsrcPc :  $('#planWebUpdateForm input[name=fsrcPc]').val()
-							,fsrcMobile : $('#planWebUpdateForm input[name=fsrcMobile]').val()
+						    ,mode : $('#planUpdateForm input[name=mode]').val()
+						    ,planSq : $('#planUpdateForm input[name=planSq]').val()
+							,planGb	: $('#planUpdateForm select[name=planGb]').val()
+							,templateType :	$('#planUpdateForm select[name=templateType]').val()
+							,frontGb : $('#planUpdateForm select[name=frontGb]').val()
+							,planNm : $('#planUpdateForm input[name=planNm]').val()
+							,startSearchDate : $('#planUpdateForm input[name=startSearchDate]').val()
+							,startSearchHour : $('#planUpdateForm input[name=startSearchHour]').val()
+							,startSearchMin : $('#planUpdateForm input[name=startSearchMin]').val()
+							,endSearchDate : $('#planUpdateForm input[name=endSearchDate]').val()
+							,endSearchHour : $('#planUpdateForm input[name=endSearchHour]').val()
+							,endSearchMin : $('#planUpdateForm input[name=endSearchMin]').val()
+							,dispStdt : $('#planUpdateForm input[name=dispStdt]').val()
+							,dispEddt : $('#planUpdateForm input[name=dispEddt]').val()
+							,dtlTitle1 : $('#planUpdateForm input[name=dtlTitle1]').val()
+							,cornerNmDispYn :  $('#planUpdateForm select[name=cornerNmDispYn]').val()
+							,openYn :  $('#planUpdateForm select[name=openYn]').val()
+							,siteCd :$('#planUpdateForm select[name=siteCd]').val()
+							,dispOrd : $('#planUpdateForm input[name=dispOrd]').val()
+							,replyYn : $('#planUpdateForm select[name=replyYn]').val()
+							,mainPimg :$('#planUpdateForm input[name=mainPimg]').val()
+							,mainMimg : $('#planUpdateForm input[name=mainMimg]').val()
+							,fsrcPc :  $('#planUpdateForm input[name=fsrcPc]').val()
+							,fsrcMobile : $('#planUpdateForm input[name=fsrcMobile]').val()
 						}	
 					
 					
-					var actionUrl = '/marketing/plan/webdetail/update';
+					var actionUrl = '/marketing/plan/detail/update';
 					var jsonData =  JSON.stringify(data);
-					gagajf.ajaxJsonSubmit(actionUrl, jsonData, fnPlanWebDetailCallBack); 
-						uifnPopupClose('planWebRegisterFormDiv');
+					gagajf.ajaxJsonSubmit(actionUrl, jsonData, fnPlanDetailCallBack); 
+						uifnPopupClose('planRegisterFormDiv');
 						fnPlanListSearch();
-						//fnPlanWebDetailClose();
+						//fnPlanDetailClose();
 				}
 			});
 		}
@@ -889,8 +903,8 @@
 		$(obj).closest('div').find('input[name="attachYn"]').val(val);
 	}
 
-	var fnPlanWebDetailCallBack = function() {
-		uifnPopupClose('planWebRegisterForm');
+	var fnPlanDetailCallBack = function() {
+		uifnPopupClose('planRegisterForm');
 		fnPlanListSearch();
 		
 	}
@@ -900,6 +914,7 @@
 		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
 		{headerName: "브랜드ID", field: "brandCd", width: 110, cellClass: 'text-center'},
 		{headerName: "브랜드명", field: "brandEnm", width: 120, cellClass: 'text-center'},
+		{headerName: "브랜드그룹명", field: "brandGrpNm", width: 150, cellClass: 'text-center'},
 		{headerName: "", field: "brandKnm", width: 150, cellClass: 'text-center'},
 		/* {headerName: "적용대상", field: "targetGb", width: 150, cellClass: 'text-center', hide: true},
 		{headerName: "시퀀스", field: "tmtbGoodsSq", width: 150, cellClass: 'text-center', hide: true},
@@ -1005,13 +1020,13 @@
 		gagaAgGrid.createGrid("gridFGCateList", gridOptionsFGCateList);
 		
 		 if (mode =='U') {
-			/* $('#planWebDetailForm input[name=badgeFcolor]').spectrum({
+			/* $('#planDetailForm input[name=badgeFcolor]').spectrum({
 				preferredFormat: "hex",
 				showInput: true,
 				allowEmpty: true
 			});
 
-			$('#planWebDetailForm input[name=badgeBcolor]').spectrum({
+			$('#planDetailForm input[name=badgeBcolor]').spectrum({
 				preferredFormat: "hex",
 				showInput: true,
 				allowEmpty: true
@@ -1021,9 +1036,9 @@
 			gridOptionsFGCateList.api.setRowData(planCateList);
 
 			if (planInfo.goodsLimitYn == 'N') {
-				$('#planWebDetailForm input[name=goodsLimitQty]').hide();
+				$('#planDetailForm input[name=goodsLimitQty]').hide();
 			} else {
-				$('#planWebDetailForm input[name=goodsLimitQty]').show();
+				$('#planDetailForm input[name=goodsLimitQty]').show();
 			}
 
 			// 썸머노트 값 설정
@@ -1038,13 +1053,13 @@
 			}
 
 		} else {
-			/* $('#planWebRegisterForm input[name=badgeFcolor]').spectrum({
+			/* $('#planRegisterForm input[name=badgeFcolor]').spectrum({
 				preferredFormat: "hex",
 				showInput: true,
 				allowEmpty: true
 			});
 
-			$('#planWebRegisterForm input[name=badgeBcolor]').spectrum({
+			$('#planRegisterForm input[name=badgeBcolor]').spectrum({
 				preferredFormat: "hex",
 				showInput: true,
 				allowEmpty: true

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

@@ -15,11 +15,10 @@
  -->
 <div id="main">
 	<div class="main-title"></div>
-
-	<div class="panelStyle">
-		<form id="planListSearchForm" name="planListSearchForm" action="#"
+<form id="planListSearchForm" name="planListSearchForm" action="#"
 			th:action="@{'/marketing/planning/list'}"
 			onsubmit="$('#btnSearch').trigger('click'); return false;">
+	<div class="panelStyle">
 			<table class="frmStyle">
 				<colgroup>
 					<col style="width: 5%;" />
@@ -114,7 +113,7 @@
 			</li>
 			<li class="right">
 				<button type="button" class="btn btn-primary btn-lg"
-					onclick="fnPlanWebRegisterPopup();">등록</button> 검색결과 : <strong><span
+					onclick="fnPlanRegisterPopup();">등록</button> 검색결과 : <strong><span
 					id="gridRowTotalCount">0</span> 건</strong>&nbsp; 쪽번호 <span id="pgNo">0</span>/
 				<strong id="endPgNo">0</strong>&nbsp;&nbsp; <select id="pageSize"
 				name="pageSize">
@@ -160,6 +159,12 @@
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(planGbList, params.value); },
 			valueParser: function (params) { return gagaAgGrid.lookupKey(planGbList, params.newValue); }
 		},
+		{headerName: "사이트"			, field:'siteCd'	, width:100, cellClass: 'text-center',
+			cellEditor: 'agRichSelectCellEditor',
+			cellEditorParams: { values: gagaAgGrid.extractValues(siteCdList) },
+			valueFormatter: function (params) { return gagaAgGrid.lookupValue(siteCdList, params.value); },
+			valueParser: function (params) { return gagaAgGrid.lookupKey(siteCdList, params.newValue); }
+		},
 		{headerName: "프론트구분"	, field:'frontGb'	, width:120, cellClass: 'text-center',
 			cellEditor: 'agRichSelectCellEditor',
 			cellEditorParams: { values: gagaAgGrid.extractValues(wmGbList) },
@@ -174,12 +179,6 @@
 			cellRenderer: function(params) { return '<a href="javascript:void(0);">' + params.value + '</a>'; }
 		},
 		{headerName: "서브제목"		, field:'dtlTitle1'	, width:300 , cellClass: 'text-center'},
-		{headerName: "사이트"			, field:'siteCd'	, width:100, cellClass: 'text-center',
-			cellEditor: 'agRichSelectCellEditor',
-			cellEditorParams: { values: gagaAgGrid.extractValues(siteCdList) },
-			valueFormatter: function (params) { return gagaAgGrid.lookupValue(siteCdList, params.value); },
-			valueParser: function (params) { return gagaAgGrid.lookupKey(siteCdList, params.newValue); }
-		},
 		{headerName: "기획전템플릿유형"	, field:'templateType'	, width:100, cellClass: 'text-center',
 			cellEditor: 'agRichSelectCellEditor',
 			cellEditorParams: { values: gagaAgGrid.extractValues(templateTypeList) },
@@ -212,7 +211,7 @@
 	// 바인딩
 	var fnBindDetail = function(field, rowData) {
 		if (field == 'planSq') { // 기획전 웹수정 팝업
-			fnEventWebDetailPopup(rowData.planSq);
+			fnEventDetailPopup(rowData.planSq);
 		}
 
 		if (field == 'planNm') { // 기획전 관리 팝업
@@ -222,15 +221,15 @@
 	
 
 	// 웹 등록 팝업
-	var fnPlanWebRegisterPopup = function() {
-		var actionUrl = "/marketing/planning/webdetail/form?mode=N";
-		cfnOpenModalPopup(actionUrl,'popupPlanWebDetail');
+	var fnPlanRegisterPopup = function() {
+		var actionUrl = "/marketing/planning/detail/form?mode=N";
+		cfnOpenModalPopup(actionUrl,'popupPlanDetail');
 	} 
 
 	// 웹 수정 팝업
-	var fnEventWebDetailPopup = function(planSq) {
-		var actionUrl = "/marketing/planning/webdetail/form?mode=U&planSq=" + planSq;
-		cfnOpenModalPopup(actionUrl,'popupPlanWebDetail');
+	var fnEventDetailPopup = function(planSq) {
+		var actionUrl = "/marketing/planning/detail/form?mode=U&planSq=" + planSq;
+		cfnOpenModalPopup(actionUrl,'popupPlanDetail');
 	}
 	
 	// 이벤트 코너 관리 팝업
@@ -348,7 +347,7 @@
 	}
 	
 	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());

+ 38 - 21
src/main/webapp/WEB-INF/views/marketing/PlanPopupForm.html

@@ -27,7 +27,7 @@
 
 		<div class="panelContent">
 			<form id="popupPlanSearchForm" name="popupPlanSearchForm" action="#"
-				th:action="@{'/marketing/planning/listPop'}"
+				th:action="@{'/marketing/planning/list/detail/popup'}"
 				onsubmit="$('#btnPlanPopupSearch').trigger('click'); return false;">
 				<table class="frmStyle">
 					<colgroup>
@@ -92,13 +92,11 @@
 
 						<tr>
 							<th>진행기간</th>
-							<td colspan="3" id="popupPlanTerms"></td>
-
-							
-
+							<td colspan="5" id="popupPlanTerms"></td>
+<!-- 
 							<th>등록자</th>
 							<td><input type="text" name="regId" id="regId" />
-							</td>
+							</td> -->
 						</tr>
 					</tbody>
 				</table>
@@ -144,29 +142,48 @@
 		$('#popupPlanSearchForm')[0].reset();
 	}
 
-	var columnDefs = [
- 		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
- 		{headerName: "미리보기"		, field:'plan'		, width:100, cellClass: 'text-center',
- 			cellRenderer: function(params) { return '<a href="javascript:void(0);" onclick="fnPreview(\'' + params.data.planSq + '\');">' + '미리보기' + '</a>'; }
- 		},
- 		{headerName: "기획전번호"		, field:'planSq'	, width:100, cellClass: 'text-center'},
- 		{headerName: "기획전명"		, field:'planNm'	, width:300, cellClass: 'text-left'},
- 		{headerName: "서브제목"		, field:'dtlTitle1'	, width:300 , cellClass: 'text-center'},
+	var columnDefs =  [
+		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+		{headerName: "미리보기"		, field:'plan'		, width:100, cellClass: 'text-center',
+			cellRenderer: function(params) { return '<a href="javascript:void(0);" onclick="fnPreview(\'' + params.data.planSq + '\');">' + '미리보기' + '</a>'; }
+		},
+		{headerName: "기획전구분"		, field:'planGb'	, width:100, cellClass: 'text-center',
+			cellEditor: 'agRichSelectCellEditor',
+			cellEditorParams: { values: gagaAgGrid.extractValues(planGbList) },
+			valueFormatter: function (params) { return gagaAgGrid.lookupValue(planGbList, params.value); },
+			valueParser: function (params) { return gagaAgGrid.lookupKey(planGbList, params.newValue); }
+		},
 		{headerName: "사이트"			, field:'siteCd'	, width:100, cellClass: 'text-center',
- 			cellEditor: 'agRichSelectCellEditor',
+			cellEditor: 'agRichSelectCellEditor',
 			cellEditorParams: { values: gagaAgGrid.extractValues(siteCdList) },
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(siteCdList, params.value); },
 			valueParser: function (params) { return gagaAgGrid.lookupKey(siteCdList, params.newValue); }
 		},
-		{headerName: "기획전구분"		, field:'planGb'	, width:100, cellClass: 'text-center'},
-		{headerName: "기획전템플릿유형"	, field:'templateType'	, width:100, cellClass: 'text-center'},
-		/* {headerName: "전시순서"		, field:'dispOrd'	, width:100, cellClass: 'text-right' }, */
+		{headerName: "프론트구분"	, field:'frontGb'	, width:120, cellClass: 'text-center',
+			cellEditor: 'agRichSelectCellEditor',
+			cellEditorParams: { values: gagaAgGrid.extractValues(wmGbList) },
+			valueFormatter: function (params) { return gagaAgGrid.lookupValue(wmGbList, params.value); },
+			valueParser: function (params) { return gagaAgGrid.lookupKey(wmGbList, params.newValue); }
+		},
+		{headerName: "오픈여부"		, field:'openYn'	, width:80 , cellClass: 'text-center'},
+		{headerName: "기획전번호"		, field:'planSq'	, width:100, cellClass: 'text-center',
+			cellRenderer: function(params) { return '<a href="javascript:void(0);">' + params.value + '</a>'; }
+		},
+		{headerName: "기획전명"		, field:'planNm'	, width:300, cellClass: 'text-left',
+			cellRenderer: function(params) { return '<a href="javascript:void(0);">' + params.value + '</a>'; }
+		},
+		{headerName: "서브제목"		, field:'dtlTitle1'	, width:300 , cellClass: 'text-center'},
+		{headerName: "기획전템플릿유형"	, field:'templateType'	, width:100, cellClass: 'text-center',
+			cellEditor: 'agRichSelectCellEditor',
+			cellEditorParams: { values: gagaAgGrid.extractValues(templateTypeList) },
+			valueFormatter: function (params) { return gagaAgGrid.lookupValue(templateTypeList, params.value); },
+			valueParser: function (params) { return gagaAgGrid.lookupKey(templateTypeList, params.newValue); }
+		},
+		{headerName: "전시순서"		, field:'dispOrd'	, width:100, cellClass: 'text-right' },
 		{headerName: "진행시작일시"		, field:'dispStdt'	, width:150, cellClass: 'text-center'},
 		{headerName: "진행종료일시"		, field:'dispEddt'	, width:150, cellClass: 'text-center'},
-		{headerName: "프론트구분"	, field:'frontGb'	, width:120, cellClass: 'text-center'	},
-		{headerName: "오픈여부"		, field:'openYn'	, width:80 , cellClass: 'text-center'},
 		{headerName: "등록자"			, field:'regNm'		, width:100, cellClass: 'text-center'},
-		{headerName: "등록일"			, field:'regDt'		, width:150, cellClass: 'text-center'},
+		{headerName: "등록일"			, field:'regDt'		, width:150, cellClass: 'text-center'}
 	];
 
 	var gridOptionsPopupPlan = gagaAgGrid.getGridOptions(columnDefs);

+ 1 - 1
src/main/webapp/ux/js/admin.popup.js

@@ -579,7 +579,7 @@ var cfnOpenCouponRetrievePopup = function(sName, oParam) {
  * @author : yujung
  */
 var cfnOpenPlanPopup = function(callbackfun) {
-	var actionUrl = "/marketing/plan/list/popup";
+	var actionUrl = "/marketing/planning/list/popup";
 	if (typeof(callbackfun) != 'undefined') actionUrl += "?callBackFun=" + callbackfun;
 
 	cfnOpenModalPopup(actionUrl,'popupPlan');