2/9 임시커밋

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

@@ -46,6 +46,8 @@ import com.style24.persistence.domain.FreeGoodsPromotion;
 import com.style24.persistence.domain.Goods;
 import com.style24.persistence.domain.MailTemplate;
 import com.style24.persistence.domain.MktmailManagement;
+import com.style24.persistence.domain.MktmailManagementGoods;
+import com.style24.persistence.domain.MktmailManagementTc;
 import com.style24.persistence.domain.MoreBetter;
 import com.style24.persistence.domain.MoreBetterBurden;
 import com.style24.persistence.domain.MoreBetterGoods;
@@ -58,6 +60,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
+import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.gagaframework.web.util.GagaDateUtil;
 
 /**
@@ -907,9 +910,11 @@ public class TsaMarketingController extends TsaBaseController {
 	@GetMapping("/mailtemplate/detail/form")
 	public ModelAndView MailHeadeFooterDetailForm(@RequestParam(value = "mode") String mode, @RequestParam(value = "mailhfSq", required = false) Integer mailhfSq) {
 		ModelAndView mav = new ModelAndView();
+	
 		// 모드 값
 		mav.addObject("mode", mode);
 
+		
 		if ("U".equals(mode)) {
 			mav.addObject("mailhfInfo", mailTemplateService.getMailHFDetail(mailhfSq));
 		}
@@ -970,40 +975,28 @@ public class TsaMarketingController extends TsaBaseController {
 	 * @param mode - 모드(N:신규, U:상세)
 	 * @return
 	 * @author csh9191
-	 * @since 2021. 02. 01
+	 * @since 2021. 02. 08
 	 */
 	@GetMapping("/mktmailmanagement/detail/form")
-	public ModelAndView mktmailManagementDetailForm(@RequestParam(value = "mode") String mode, @RequestParam(value = "mailtSq", required = false) Integer mailtSq) {
+	public ModelAndView mktmailManagementDetailForm(@RequestParam(value = "mode") String mode, @RequestParam(value = "mailtSq", required = false) Integer mailtSq, MailTemplate mailTemplate) {
 		ModelAndView mav = new ModelAndView();
-		// 모드 값
+		
+		
+		mav.addObject("mailHsqList", mailTemplate.getMailhfNm());
+		
 		mav.addObject("mode", mode);
-
+		
 		if ("U".equals(mode)) {
-			mav.addObject("mailhfInfo", mailTemplateService.getMktmailManagementDetail(mailtSq));
+			mav.addObject("mktmailInfo", mailTemplateService.getMktmailManagementDetail(mailtSq));
 		}
-
+		
 		mav.setViewName("marketing/MktmailmanagementDetailForm");
 
 		return mav;
 	}
-	
-	/**
-	 * MKT 메일관리 상품추가 팝업
-	 * @param 
-	 * @return
-	 * @author csh9191
-	 * @since 2021. 02. 01
-	 */
-	
-	@PostMapping("/mktmailmanagement/goods/info")
-	@ResponseBody
-	public Collection<Goods> getOrderSampleGoodsInfo(@RequestBody String[] arrGoodsCd) {
-		Goods goods = new Goods();
-		goods.setArrGoodsCd(arrGoodsCd);
-		
-		return mailTemplateService.getOrderSampleGoodsInfo(goods);
-	}
-	
+
+
+
 	/* // CSB 진행 */
 
 	/**

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

@@ -143,7 +143,7 @@
 														<button type="button" class="btn btn-danger btn-lg" id="">상품삭제</button>
 													</li>
 													<li class="right">
-														<button type="button" class="btn btn-info btn-lg" onclick="fnOpenGoodsPopup();" id="AddGoods_num">상품추가</button>
+														<button type="button" class="btn btn-info btn-lg" onclick="fnOpenGoodsPopup('gridOptions_c1');">상품추가</button>
 													</li>													
 												</ul>
 												<!-- Agrid -->
@@ -201,7 +201,7 @@
 														<button type="button" class="btn btn-danger btn-lg" id="" >상품삭제</button>
 													</li>
 													<li class="right">
-														<button type="button" class="btn btn-info btn-lg" onclick="fnFetchGoods();" id="AddGoods_num2">상품추가</button>
+														<button type="button" class="btn btn-info btn-lg" onclick="fnOpenGoodsPopup(gridOptions_c2);">상품추가</button>
 													</li>													
 												</ul>
 												<!-- Agrid -->
@@ -412,7 +412,8 @@
 <script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=20201030"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
-	
+		
+		let AddgridRow;
 	
 		//상품 전시 그리드 그리기
 		var columnDefs = [
@@ -444,27 +445,37 @@
 				return false;
 			}
 		}
-
+		
 		// Add on options
 		var gridOptions_c1 = gagaAgGrid.getGridOptions(columnDefs);
 		var gridOptions_c2 = gagaAgGrid.getGridOptions(columnDefs);
 		var gridOptions_c3 = gagaAgGrid.getGridOptions(columnDefs);
 		var gridOptions_c4 = gagaAgGrid.getGridOptions(columnDefs);
 		var gridOptions_c5 = gagaAgGrid.getGridOptions(columnDefs);
-
+		
+		switch (fnOpenGoodsPopup){
+		case 'gridOptions_c1' : 
+			AddgridRow = gridOptions_c1;
+			break;
+		case 'gridOptions_c2' : 
+			AddgridRow = gridOptions_c2;
+			break;
+		case 'gridOptions_c3' : 
+			AddgridRow = gridOptions_c3;
+			break;
+		case 'gridOptions_c4' : 
+			AddgridRow = gridOptions_c4;
+			break;
+		case 'gridOptions_c5' : 
+			AddgridRow = gridOptions_c5;
+			break;
+		}
 		
 		// 상품조회 팡업
 		var fnOpenGoodsPopup = function() {
 			cfnOpenGoodsPopup('fnFetchGoods');
 		}
 		
-		//버튼
-		
-		if($('#AddGoods_num').on('click')){
-				var AddgridRow = gridOptions_c1;
-		}if($('#AddGoods_num2').on('click')){
-				var AddgridRow = gridOptions_c2;
-		}
 		
 		// 상품추가
 		var fnFetchGoods = function(goodsData) {