2/15 MKT 메일관리 임시커밋

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

@@ -6,6 +6,7 @@ import com.style24.core.support.annotation.ShopDs;
 import com.style24.persistence.domain.Goods;
 import com.style24.persistence.domain.MailTemplate;
 import com.style24.persistence.domain.MktmailManagement;
+import com.style24.persistence.domain.MktmailManagementTc;
 import com.style24.persistence.domain.OrderSample;
 
 /**
@@ -59,7 +60,14 @@ public interface TsaMailTemplateDao {
 	 * @since 2021. 02. 05
 	 */
 	MktmailManagement getMktmailManagementDetail(Integer mktmailManagement);
-	
+	/**
+	 * mkt메일관리 상세
+	 * @param mktmailManagement - 메일관련 정보
+	 * @return
+	 * @author csh9191
+	 * @since 2021. 02. 15
+	 */
+	MktmailManagementTc getMktmailManagementTCDetail(Integer mktmailManagementTc);
 	/**
 	 * MKT메일 등록수정
 	 * @param  mailtemplate - 메일관련 정보
@@ -72,11 +80,31 @@ public interface TsaMailTemplateDao {
 	 * MKT메일 등록수정
 	 * @param  mailtemplate - 메일관련 정보
 	 * @author csh9191
-	 * @since 2021. 02. 09
+	 * @since 2021. 02. 13
 	 */
 	void saveMktMailTemplate(MktmailManagement mktMailManagement);
+	int saveMktmailform(MktmailManagement mktMailManagement);
+	int saveMailTc(MktmailManagement mktMailManagement);
+	int saveMailGoods(MktmailManagement mktMailManagement);
+	
 	
 	/* MKT 메일 전시 */
-	Collection<Goods> getOrderSampleGoodsInfo(Goods goods);
+	Collection<Goods> getMailGoodsInfo(Goods goods);
+	
+	/**
+	 * 메일헤더푸터 관리 목록
+	 * @param mailtemplate - 메일관련 정보
+	 * @return
+	 * @author csh9191
+	 * @since 2021. 02. 13
+	 */
+	Collection<MktmailManagement> getMktMailList(MktmailManagement mktMailManagement);
+	/**
+	 * 메일헤더푸터 리스트 삭제
+	 * @param  mailtemplate - 메일관련 정보
+	 * @author csh9191
+	 * @since 2021. 02. 15
+	 */
+	void deleteMktmailList(MktmailManagement mktMailManagement);
 
 }

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

@@ -8,12 +8,14 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.style24.admin.biz.dao.TsaMailTemplateDao;
 import com.style24.admin.support.security.session.TsaSession;
 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 lombok.extern.slf4j.Slf4j;
 
@@ -98,45 +100,271 @@ public class TsaMailTemplateService {
 	public MktmailManagement getMktmailManagementDetail(Integer mktmailManagement) {
 		return mailtempletDao.getMktmailManagementDetail(mktmailManagement);
 	}
-	
 	/**
-	 * MKT메일 상세 등록/수정
-	 * @param mailtemplate - 메일관련 정보
+	 * MKT메일관리 상세화면
+	 * @param mktmailManagement - 메일템플릿TC관련 정보
+	 * @return
 	 * @author csh9191
-	 * @since 2021. 02. 03
+	 * @since 2021. 02. 05
 	 */
-	@Transactional("shopTxnManager")
-	public void saveMktMailDetail(MktmailManagement mktMailManagement) {
-		// 내용 유무 확인
-		if (StringUtils.isNotBlank(mktMailManagement.getMailContent())) {
-			mktMailManagement.setMailContent(mktMailManagement.getMailContent().replaceAll("&lt;", "<").replaceAll("&gt;", ">"));
-		}
-
-		mailtempletDao.saveMktMailDetail(mktMailManagement);
-	
+	public MktmailManagementTc getMktmailManagementTCDetail(Integer mktmailManagementTc) {
+		return mailtempletDao.getMktmailManagementTCDetail(mktmailManagementTc);
 	}
-		
+
 	
 	/**
 	 * MKT 상세 등록/수정
 	 * @param mailtemplate - 메일관련 정보
 	 * @author csh9191
-	 * @since 2021. 02. 03
+	 * @since 2021. 02. 13
 	 */
 	public GagaMap saveMktMailTemplate (MktmailManagement mktMailManagement) {
 		GagaMap result = new GagaMap();
 		
+		int mailHsq = mktMailManagement.getMktHeader();
+		int mailFsq = mktMailManagement.getMktFooter();
+		String mailtNm = mktMailManagement.getMailtNm();
+		String mailtGb = mktMailManagement.getMailtGb();
+		String mailContent = mktMailManagement.getMailContent();
+		
+		MktmailManagement mktmail = new MktmailManagement();
+		mktmail.setMktHeader(mailHsq);
+		mktmail.setMktFooter(mailFsq);
+		mktmail.setMailtNm(mailtNm);
+		mktmail.setMailtGb(mailtGb);
+		mktmail.setMailContent(mailContent);
+		
+		//메일 헤더 푸터 타이틀 내용 등록
+		mailtempletDao.saveMktmailform(mktMailManagement); 
+		mktMailManagement.getMailtSq();
+		mktMailManagement.getMailtcSq();
 		
+		//구분자1 등록
+		for(MktmailManagementTc mktmailManagementTc : mktMailManagement.getMktmailManagementTc()) {
+			if(!StringUtils.isEmpty(mktmailManagementTc.getMailtcNm())) {
+				String mailtcNm = mktmailManagementTc.getMailtcNm();
+				String mailtcLink = mktmailManagementTc.getMailtcLink();
+				int goodsCpr = mktmailManagementTc.getGoodsCpr();
+				
+				MktmailManagement mktmailtc = new MktmailManagement();
+				
+				mktmailtc.setRegNo(TsaSession.getInfo().getUserNo());
+				mktmailtc.setUpdNo(TsaSession.getInfo().getUserNo());
+				mktmailtc.setMailtcNm(mailtcNm);
+				mktmailtc.setMailtcLink(mailtcLink);
+				mktmailtc.setGoodsCpr(goodsCpr);
+				mktmailtc.setMailtSq(mktMailManagement.getMailtSq());
+				
+				mailtempletDao.saveMailTc(mktmailtc);
+				//grid1
+				for (MktmailManagementGoods mktmailManagementGoods : mktMailManagement.getMktmailManagementGoods()) {
+					
+					
+					String goodsCd = mktmailManagementGoods.getGoodsCd();
+					int dispOrd = mktmailManagementGoods.getDispOrd();
+	
+					MktmailManagement mktmailGoods = new MktmailManagement();
+					
+					mktmailGoods.setRegNo(TsaSession.getInfo().getUserNo());
+					mktmailGoods.setUpdNo(TsaSession.getInfo().getUserNo());
+					mktmailGoods.setDispOrd(dispOrd);
+					mktmailGoods.setGoodsCd(goodsCd);
+					mktmailGoods.setMailtcSq(mktmailtc.getMailtcSq());
+					//grid 데이터 등록
+					mailtempletDao.saveMailGoods(mktmailGoods);
+				}
+			}
+		}
+		
+
+		//구분자2 등록
+		for(MktmailManagementTc mktmailManagementTc : mktMailManagement.getMktmailManagementTc2()) {
+			if(!StringUtils.isEmpty(mktmailManagementTc.getMailtcNm())) {
+				String mailtcNm = mktmailManagementTc.getMailtcNm();
+				String mailtcLink = mktmailManagementTc.getMailtcLink();
+				int goodsCpr = mktmailManagementTc.getGoodsCpr();
+	
+				MktmailManagement mktmailtc = new MktmailManagement();
+	
+				mktmailtc.setRegNo(TsaSession.getInfo().getUserNo());
+				mktmailtc.setUpdNo(TsaSession.getInfo().getUserNo());
+				mktmailtc.setMailtcNm(mailtcNm);
+				mktmailtc.setMailtcLink(mailtcLink);
+				mktmailtc.setGoodsCpr(goodsCpr);
+				mktmailtc.setMailtSq(mktMailManagement.getMailtSq());
+	
+				mailtempletDao.saveMailTc(mktmailtc);
+				//grid2
+				for (MktmailManagementGoods mktmailManagementGoods : mktMailManagement.getMktmailManagementGoods2()) {
+	
+					String goodsCd = mktmailManagementGoods.getGoodsCd();
+					int dispOrd = mktmailManagementGoods.getDispOrd();
+	
+					MktmailManagement mktmailGoods = new MktmailManagement();
+	
+					mktmailGoods.setRegNo(TsaSession.getInfo().getUserNo());
+					mktmailGoods.setUpdNo(TsaSession.getInfo().getUserNo());
+					mktmailGoods.setDispOrd(dispOrd);
+					mktmailGoods.setGoodsCd(goodsCd);
+					mktmailGoods.setMailtcSq(mktmailtc.getMailtcSq());
+					//grid 데이터 등록
+					mailtempletDao.saveMailGoods(mktmailGoods);
+				}
+			}
+		}
+		
+		//구분자3 등록
+		for(MktmailManagementTc mktmailManagementTc : mktMailManagement.getMktmailManagementTc3()) {
+			if(!StringUtils.isEmpty(mktmailManagementTc.getMailtcNm())) {
+			String mailtcNm = mktmailManagementTc.getMailtcNm();
+			String mailtcLink = mktmailManagementTc.getMailtcLink();
+			int goodsCpr = mktmailManagementTc.getGoodsCpr();
+
+			MktmailManagement mktmailtc = new MktmailManagement();
+
+			mktmailtc.setRegNo(TsaSession.getInfo().getUserNo());
+			mktmailtc.setUpdNo(TsaSession.getInfo().getUserNo());
+			mktmailtc.setMailtcNm(mailtcNm);
+			mktmailtc.setMailtcLink(mailtcLink);
+			mktmailtc.setGoodsCpr(goodsCpr);
+			mktmailtc.setMailtSq(mktMailManagement.getMailtSq());
+
+			mailtempletDao.saveMailTc(mktmailtc);
+			//grid3
+			for (MktmailManagementGoods mktmailManagementGoods : mktMailManagement.getMktmailManagementGoods3()) {
+
+				String goodsCd = mktmailManagementGoods.getGoodsCd();
+				int dispOrd = mktmailManagementGoods.getDispOrd();
+
+				MktmailManagement mktmailGoods = new MktmailManagement();
+
+				mktmailGoods.setRegNo(TsaSession.getInfo().getUserNo());
+				mktmailGoods.setUpdNo(TsaSession.getInfo().getUserNo());
+				mktmailGoods.setDispOrd(dispOrd);
+				mktmailGoods.setGoodsCd(goodsCd);
+				mktmailGoods.setMailtcSq(mktmailtc.getMailtcSq());
+				//grid 데이터 등록
+				mailtempletDao.saveMailGoods(mktmailGoods);
+			}
+			}
+		}
+
+		//구분자4 등록
+		for(MktmailManagementTc mktmailManagementTc : mktMailManagement.getMktmailManagementTc4()) {
+			if(!StringUtils.isEmpty(mktmailManagementTc.getMailtcNm())) {
+			String mailtcNm = mktmailManagementTc.getMailtcNm();
+			String mailtcLink = mktmailManagementTc.getMailtcLink();
+			int goodsCpr = mktmailManagementTc.getGoodsCpr();
+			
+			MktmailManagement mktmailtc = new MktmailManagement();
+
+			mktmailtc.setRegNo(TsaSession.getInfo().getUserNo());
+			mktmailtc.setUpdNo(TsaSession.getInfo().getUserNo());
+			mktmailtc.setMailtcNm(mailtcNm);
+			mktmailtc.setMailtcLink(mailtcLink);
+			mktmailtc.setGoodsCpr(goodsCpr);
+			mktmailtc.setMailtSq(mktMailManagement.getMailtSq());
+			
+			mailtempletDao.saveMailTc(mktmailtc);
+			//grid4
+			for (MktmailManagementGoods mktmailManagementGoods : mktMailManagement.getMktmailManagementGoods4()) {
+				
+				String goodsCd = mktmailManagementGoods.getGoodsCd();
+				int dispOrd = mktmailManagementGoods.getDispOrd();
+				
+				MktmailManagementTc mailTc = new MktmailManagementTc();
+				
+				int mailtcSq = mailTc.getMailtcSq();
+				log.info("mailtcSq={}", mailtcSq);
+				MktmailManagement mktmailGoods = new MktmailManagement();
+				
+				mktmailGoods.setMailtcSq(mailtcSq);
+				mktmailGoods.setRegNo(TsaSession.getInfo().getUserNo());
+				mktmailGoods.setUpdNo(TsaSession.getInfo().getUserNo());
+				mktmailGoods.setDispOrd(dispOrd);
+				mktmailGoods.setGoodsCd(goodsCd);
+				mktmailGoods.setMailtcSq(mktmailtc.getMailtcSq());
+				//grid 데이터 등록
+				mailtempletDao.saveMailGoods(mktmailGoods);
+			}
+			}
+		}
+		
+		//구분자5 등록
+		for(MktmailManagementTc mktmailManagementTc : mktMailManagement.getMktmailManagementTc5()) {
+			if(!StringUtils.isEmpty(mktmailManagementTc.getMailtcNm())) {
+			String mailtcNm = mktmailManagementTc.getMailtcNm();
+			String mailtcLink = mktmailManagementTc.getMailtcLink();
+			int goodsCpr = mktmailManagementTc.getGoodsCpr();
+
+			MktmailManagement mktmailtc = new MktmailManagement();
+
+			mktmailtc.setRegNo(TsaSession.getInfo().getUserNo());
+			mktmailtc.setUpdNo(TsaSession.getInfo().getUserNo());
+			mktmailtc.setMailtcNm(mailtcNm);
+			mktmailtc.setMailtcLink(mailtcLink);
+			mktmailtc.setGoodsCpr(goodsCpr);
+			mktmailtc.setMailtSq(mktMailManagement.getMailtSq());
+
+			mailtempletDao.saveMailTc(mktmailtc);
+			
+			//grid5
+			for (MktmailManagementGoods mktmailManagementGoods : mktMailManagement.getMktmailManagementGoods5()) {
+				
+				String goodsCd = mktmailManagementGoods.getGoodsCd();
+				int dispOrd = mktmailManagementGoods.getDispOrd();
+				
+				MktmailManagement mktmailGoods = new MktmailManagement();
+				
+				mktmailGoods.setRegNo(TsaSession.getInfo().getUserNo());
+				mktmailGoods.setUpdNo(TsaSession.getInfo().getUserNo());
+				mktmailGoods.setDispOrd(dispOrd);
+				mktmailGoods.setGoodsCd(goodsCd);
+				mktmailGoods.setMailtcSq(mktmailtc.getMailtcSq());
+				//grid 데이터 등록
+				mailtempletDao.saveMailGoods(mktmailGoods);
+			}
+			}
+		}
+
+
+		result.set("status", GagaResponseStatus.SUCCESS.getCode());
 
 		return result;
 	}
 	
 	/* MKT 메일 전시 */
-	public Collection<Goods> getOrderSampleGoodsInfo(Goods goods) {
-		return mailtempletDao.getOrderSampleGoodsInfo(goods);
+	public Collection<Goods> getMailGoodsInfo(Goods goods) {
+		return mailtempletDao.getMailGoodsInfo(goods);
 	}
 	
-
+	/**
+	 * MKT메일관리 목록
+	 * @param mailtemplate - 메일관련 정보
+	 * @return
+	 * @author csh9191
+	 * @since 2021. 02. 13
+	 */
+	public Collection<MktmailManagement> getMktMailList(MktmailManagement mktmailManagement) {
+		return mailtempletDao.getMktMailList(mktmailManagement);
+	}
+	
+	/**
+	 * 메일헤더푸터 리스트 삭제
+	 * @param mailtemplate - 메일관련 정보
+	 * @author csh9191
+	 * @since 2021. 02. 15
+	 */
+	@Transactional("shopTxnManager")
+	public void deleteMktmailList(Collection<MktmailManagement> mktmailManagementList) {
+		int userId = TsaSession.getInfo().getUserNo();
+		
+		for(MktmailManagement mktmailManagement : mktmailManagementList) {
+			mktmailManagement.setRegNo(userId);
+			mktmailManagement.setUpdNo(userId);
+			mailtempletDao.deleteMktmailList(mktmailManagement);
+		}
+	}
 	
 
 }

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

@@ -1091,11 +1091,11 @@ public class TsaMarketingController extends TsaBaseController {
 	 * @since 2021. 02. 08
 	 */
 	@GetMapping("/mktmailmanagement/detail/form")
-	public ModelAndView mktmailManagementDetailForm(MailTemplate mailTemplate) {
+	public ModelAndView mktmailManagementDetailForm(MktmailManagement mktmailManagement) {
 		ModelAndView mav = new ModelAndView();
 		
-		Integer mailtSq = mailTemplate.getMailtSq();
-		String mode = mailTemplate.getMode();
+		Integer mailtSq = mktmailManagement.getMailtSq();
+		String mode = mktmailManagement.getMode();
 		
 		MailTemplate param = new MailTemplate();
 		
@@ -1106,8 +1106,11 @@ public class TsaMarketingController extends TsaBaseController {
 		mav.addObject("mailFsqList", mailTemplateService.getmailHFList(param));
 		
 		mav.addObject("mode", mode);
+		
 		if ("U".equals(mode)) {
 			mav.addObject("mktmailInfo", mailTemplateService.getMktmailManagementDetail(mailtSq));
+			
+			log.info("mktmailInfo {}",mailTemplateService.getMktmailManagementDetail(mailtSq));
 		}
 		
 		mav.setViewName("marketing/MktmailmanagementDetailForm");
@@ -1129,7 +1132,7 @@ public class TsaMarketingController extends TsaBaseController {
 		Goods goods = new Goods();
 		goods.setArrGoodsCd(arrGoodsCd);
 		
-		return mailTemplateService.getOrderSampleGoodsInfo(goods);
+		return mailTemplateService.getMailGoodsInfo(goods);
 	}
 	
 	/**
@@ -1137,31 +1140,47 @@ public class TsaMarketingController extends TsaBaseController {
 	 * @param 메일헤더푸터관리 - 메일헤더푸터 정보
 	 * @return
 	 * @author csh9191	
-	 * @since 2021. 02. 09
+	 * @since 2021. 02. 13
 	 */
 	@PostMapping("/mktMailManagement/save")
 	@ResponseBody
 	public GagaMap saveMktMailTemplate(@RequestBody MktmailManagement mktmailManagement){
 		GagaMap result = new GagaMap();
+		mktmailManagement.setRegNo(TsaSession.getInfo().getUserNo());
+		mktmailManagement.setUpdNo(TsaSession.getInfo().getUserNo());
 		result.set("status", GagaResponseStatus.FAIL.getCode());
-		
+
 		result = mailTemplateService.saveMktMailTemplate(mktmailManagement);
-			
-		log.info("mktmailManagement : {}", mktmailManagement);
-		for(int i = 0; i < mktmailManagement.getMktmailManagementGoods().size();i++) {
-			
-			log.info("mktmailManagement.getMktmailManagementGoods() " + mktmailManagement.getMktmailManagementGoods().get(i).toString());
-			log.info("mktmailManagement.getMktmailManagementGoods2() " + mktmailManagement.getMktmailManagementGoods2().get(i).toString());
-			log.info("mktmailManagement.getMktmailManagementGoods3() " + mktmailManagement.getMktmailManagementGoods3().get(i).toString());
-			log.info("mktmailManagement.getMktmailManagementGoods4() " + mktmailManagement.getMktmailManagementGoods4().get(i).toString());
-			log.info("mktmailManagement.getMktmailManagementGoods5() " + mktmailManagement.getMktmailManagementGoods5().get(i).toString());
-		}
+		result.set("message", message.getMessage("SUCC_0001"));
 		return result;
 	}
 
-
+	/**
+	 * MKT메일관리 목록
+	 * @param MKT메일관리관리 - MKT메일관리 정보
+	 * @return
+	 * @author csh9191
+	 * @since 2021. 02. 14
+	 */
+	@PostMapping("/mktmailManagement/list")
+	@ResponseBody
+	public Collection<MktmailManagement> getMktMailList(@RequestBody MktmailManagement mktmailManagement) {
+		return mailTemplateService.getMktMailList(mktmailManagement);
+	}
+	/**
+	 * 메일헤더푸터 리스트 삭제
+	 * @param 메일헤더푸터관리 - 메일헤더푸더 정보
+	 * @return
+	 * @author csh9191	
+	 * @since 2021. 02. 15
+	 */
+	@PostMapping("/mktmailManagement/delete")
+	@ResponseBody
+	public GagaResponse deleteMktmailList(@RequestBody Collection<MktmailManagement> mktmailManagementList) {
+		mailTemplateService.deleteMktmailList(mktmailManagementList);
+		return super.ok(message.getMessage("SUCC_0003"));
+	}
 	
-
 	/* // CSB 진행 */
 
 	/**

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

@@ -18,40 +18,57 @@ import lombok.Data;
 @Data
 public class MktmailManagement extends TscBaseDomain{
 	// MKT 메일관리
+	private String mktmailStdt;				// 검색 시작일
+	private String mktmailEddt;				// 검색 마지막일
 	private Integer mailtSq; 				// 메일템플릿 번호
 	private String mailtNm;					// 메일템플릿 명
-	private String mailGb;					// 메일템플릿 구분
-	private Integer mailHsq;				// 메일헤더 일련번호
-	private Integer mailFsq;				// 메일푸터 일련번호
+	private String mailtGb;					// 메일템플릿 구분
+	private Integer mktHeader;				// 메일헤더 일련번호
+	private Integer mktFooter;				// 메일푸터 일련번호
 	private String mailContent;				// 메일 내용
 	private String useYn;					// 사용구분
 	private String regDt;					// 등록일시
 	private String updDt;					// 수정일시
-
-	private String searchTxt;				// 검색어
+	private String mode;
 	
+	private String searchTxt;				// 검색어
+	private String searchGb; 				// 검색구분
+		
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	List<MktmailManagementGoods> mktmailManagementGoods; //메일 전시
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	List<MktmailManagementGoods> mktmailManagementGoods2; //메일 전시
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	List<MktmailManagementGoods> mktmailManagementGoods3; //메일 전시
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	List<MktmailManagementGoods> mktmailManagementGoods4; //메일 전시
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	List<MktmailManagementGoods> mktmailManagementGoods5; //메일 전시
 	
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	List<MktmailManagementTc> mktmailManagementTc; //메일템플릿 구분자
-	// 메일 템플릿 코너 
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	List<MktmailManagementTc> mktmailManagementTc2; 
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	List<MktmailManagementTc> mktmailManagementTc3; 
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	List<MktmailManagementTc> mktmailManagementTc4; 
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	List<MktmailManagementTc> mktmailManagementTc5; 
 	// 메일 템플릿 코너 
 	private Integer mailtcSq;				// 메일템플릿 코너번호
 	private String mailtcNm;				// 메일템플릿 코너명
 	private Integer goodsCpr;				// 상품 노출건수
 	private String mailtcLink;				// 메일템플릿 코너 링크
-
 	
-
 	//상품정보
 	private String brandKnm;				// 브랜드명
 	private String goodNms;					// 상품명
 	private String cdNm;					// 판매상태
 	private String listPrice;				// 정상가
 	private String currPrice;				// 판매가
+	private String goodsCd;					// 상품코드(상품)
+	private Integer dispOrd;				// 표시순서
 
 
 	

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

@@ -22,7 +22,7 @@ public class MktmailManagementGoods extends TscBaseDomain{
 	private String updDt;					// 수정일시
 	
 	//상품정보
-	private String brandKnm;				// 브랜드명
+	private String brandEnm;				// 브랜드명
 	private String goodNms;					// 상품명
 	private String cdNm;					// 판매상태
 	private String listPrice;				// 정상가

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

@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.style24.admin.biz.dao.TsaMailTemplateDao">
+
+		<select id="getmailHFList" parameterType="MailTemplate" resultType="MailTemplate">
+		/* TsaMailTemplate.getmailHFList */
+		SELECT MAILHF_SQ                                             /*메일헤더푸터 일련번호*/
+		   	 , MAILHF_NM                                             /*메일헤더푸터 명*/
+		     , MAILHF_GB                                             /*메일 헤더푸터 구분 H:헤더 F:푸터*/
+		     , MAILHF_CONTENT                                        /*메일 헤더푸터 내용*/
+		     , USE_YN                                                /*사용여부*/
+		     , FN_GET_USER_NM(REG_NO)             AS REG_NM
+		     , DATE_FORMAT(REG_DT,'%Y%m%d%H%i%S') AS REG_DT
+		     , FN_GET_USER_NM(UPD_NO)             AS UPD_NM
+		     , DATE_FORMAT(UPD_DT,'%Y%m%d%H%i%S') AS UPD_DT
+		FROM   TB_MAILHF
+		WHERE  USE_YN = 'Y'
+		<if test="mailhfNm != null and mailhfNm !='' ">
+		AND    LOWER(MAILHF_NM) LIKE CONCAT('%',LOWER(#{mailhfNm}),'%')
+		</if>
+		<if test="mailhfGb !=null and mailhfGb !='' ">
+		AND    MAILHF_GB = #{mailhfGb}
+		</if> 
+		<if test="searchTxt !=null and searchTxt !='' ">
+		AND    FN_GET_USER_NM(REG_NO) LIKE CONCAT('%',LOWER(#{searchTxt}), '%')
+		</if>
+		ORDER  BY MAILHF_SQ
+		</select>
+	
+		<insert id="saveMailHF" parameterType="MailTemplate">
+		/* TsaMailTemplate.saveMailHF 메일헤더푸터관리 등록/수정*/
+		INSERT INTO TB_MAILHF (
+			   MAILHF_SQ                                        /*메일헤더푸터 일련번호*/
+		     , MAILHF_NM                                        /*메일헤더푸터 명*/
+		     , MAILHF_GB                                        /*메일헤더푸터 구분 H:헤더 F:푸터*/
+		     , MAILHF_CONTENT                                   /* 메일헤더푸터 내용*/
+		     , USE_YN                                           /*사용여부*/
+		     , REG_NO
+		     , REG_DT
+		     , UPD_NO
+		     , UPD_DT
+		)
+	     VALUES (
+		       #{mailhfSq}
+		     , #{mailhfNm}
+		     , #{mailhfGb}
+		     , #{mailhfContent}
+		     , IFNULL(#{useYn},'Y')
+		     , #{regNo}
+		     , NOW()
+		     , #{updNo}
+		     , NOW()
+		)
+		ON DUPLICATE KEY UPDATE
+		        MAILHF_SQ = #{mailhfSq}
+		     , MAILHF_NM = #{mailhfNm}
+		     , MAILHF_GB = #{mailhfGb}
+		     , MAILHF_CONTENT = #{mailhfContent}
+		     , UPD_NO = #{updNo}
+		     , UPD_DT = NOW()
+		</insert>
+	
+		<select id="getMailHFDetail" parameterType="Integer" resultType="MailTemplate">
+		/* TsaMailTemplate.getMailHFDetail */
+		SELECT MAILHF_SQ
+		     , MAILHF_NM
+		     , MAILHF_GB
+		     , MAILHF_CONTENT
+		FROM   TB_MAILHF
+		WHERE  MAILHF_SQ = #{mailhfSq}
+		</select>
+	
+		<update id='deleteMailHFList' parameterType='MailTemplate'>
+		/* TsaMailTemplate.deleteMailHFList */
+		UPDATE TB_MAILHF
+		SET    USE_YN = 'N'
+		WHERE  MAILHF_SQ = #{mailhfSq}
+		</update>
+	
+		<select id="getMailGoodsInfo" parameterType="Goods" resultType="Goods">
+		/*메일 템플릿 상품 전시*/
+		SELECT GOODS_CD
+		     , GOODS_NM
+		     , BRAND_ENM 
+		     , STOCK_QTY_SUM
+	         , GOODS_STAT
+	         , STYLE_YEAR
+		     , SEASON_CD
+	         , LIST_PRICE
+	         , CURR_PRICE
+	         , PRICE_UPD_DT
+	         , ERP_STOCK_LINK_YN
+	         , FORMAL_GB
+	         , RETURNABLE_YN
+	         , REG_DT
+	         , REG_NM
+		     , UPD_DT
+	         , UPD_NM
+	         , REP_GOODS_CD
+		     , GROUP_CONCAT(OPT_CD2 ORDER BY DISP_ORD DESC, OPT_CD2 SEPARATOR ',')        AS SITE_CD
+	      FROM (
+		SELECT   GI.SYS_IMG_NM
+			   , G.GOODS_CD
+			   , G.GOODS_NM
+			   , B.BRAND_ENM 
+			   , (CASE WHEN G.GOODS_TYPE = 'G056_N' THEN (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = G.GOODS_CD)
+		   ELSE  (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK_COMPOSE WHERE GOODS_CD = G.GOODS_CD)
+				 END) AS STOCK_QTY_SUM
+			   , G.GOODS_STAT
+			   , G.STYLE_YEAR
+			   , G.SEASON_CD
+			   , G.LIST_PRICE
+			   , G.CURR_PRICE
+			   , G.PRICE_UPD_DT
+			   , G.ERP_STOCK_LINK_YN
+			   , G.FORMAL_GB
+			   , G.RETURNABLE_YN
+			   , G.REG_DT
+			   , FN_GET_USER_NM(G.REG_NO) AS REG_NM
+			   , G.UPD_DT
+			   , FN_GET_USER_NM(G.UPD_NO) AS UPD_NM
+			   , IFNULL(GC.COMPS_GOODS_CD, G.GOODS_CD) AS REP_GOODS_CD
+			   , OP.OPT_CD2
+			   , OP.DISP_ORD
+			FROM TB_GOODS G
+			LEFT OUTER JOIN TB_GOODS_COMPOSE GC
+			  ON G.GOODS_CD = GC.GOODS_CD
+		   INNER JOIN TB_OPTION OP
+			  ON IFNULL(GC.COMPS_GOODS_CD, G.GOODS_CD) = OP.GOODS_CD
+			LEFT OUTER JOIN TB_GOODS_IMG GI
+			  ON G.GOODS_CD = GI.GOODS_CD
+		   INNER JOIN TB_BRAND B
+			  ON G.BRAND_CD = B.BRAND_CD
+		   WHERE G.GOODS_CD IN
+		<foreach collection="arrGoodsCd" item="item" index="index"  open="(" close=")" separator=",">
+			 #{item}
+		</foreach>
+		  ) Z
+		    GROUP BY SYS_IMG_NM, GOODS_CD, GOODS_NM, STOCK_QTY_SUM, GOODS_STAT, STYLE_YEAR
+				   , SEASON_CD, LIST_PRICE, CURR_PRICE, PRICE_UPD_DT, ERP_STOCK_LINK_YN, FORMAL_GB, RETURNABLE_YN, REG_DT, REG_NM
+				   , UPD_DT, UPD_NM, REP_GOODS_CD
+		</select>
+	
+	
+		<insert id="saveMktmailform" parameterType="MktmailManagement" keyProperty="mailtSq">
+		/* TsaMailTemplate.saveMktmailform   mkt메일 등록/수정 */
+		INSERT INTO TB_MAILT (
+				    MAILT_SQ
+				  , MAILT_NM
+				  , MAILT_GB
+				  , MAILH_SQ
+				  , MAILF_SQ
+				  , MAIL_CONTENT
+				  , USE_YN
+				  , REG_NO
+				  , REG_DT
+				  , UPD_NO
+				  , UPD_DT
+			)
+		     VALUES (
+				    #{mailtSq}
+				  , #{mailtNm}
+				  , #{mailtGb}
+				  , #{mktHeader}
+				  , IFNULL(#{mktFooter}, null )
+				  , #{mailContent}
+				  , IFNULL(#{useYn},'Y')
+				  , #{regNo}
+				  , NOW()
+				  , #{updNo}
+				  , NOW()
+			)
+		ON DUPLICATE KEY UPDATE
+			        MAILT_SQ = #{mailtSq}
+		          , MAILT_NM = #{mailtNm}
+		          , MAILT_GB = #{mailtGb}
+		          , MAILH_SQ = #{mktHeader}
+		          , MAILF_SQ = #{mktFooter}
+		          , MAIL_CONTENT = #{mailContent}
+		          , UPD_NO = #{updNo}
+		          , UPD_DT = NOW()
+		</insert>
+	
+		<insert id="saveMailTc" parameterType="MktmailManagement" keyProperty="mailtcSq">
+		/* TsaMailTemplate.saveMailTc 메일구분자 */
+		INSERT INTO TB_MAILTC ( 
+				    MAILTC_SQ
+				  , MAILT_SQ
+				  , MAILTC_NM
+				  , GOODS_CPR
+				  , MAILTC_LINK
+				  , USE_YN
+				  , REG_NO
+				  , REG_DT
+				  , UPD_NO
+				  , UPD_DT
+			)
+		     VALUES ( 
+				    #{mailtcSq}
+				  , #{mailtSq}
+				  , #{mailtcNm}
+				  , #{goodsCpr}
+				  , #{mailtcLink}
+				  , IFNULL(#{useYn},'Y')
+				  , #{regNo}
+				  , NOW()
+				  , #{updNo}
+				  , NOW()
+			)
+		ON DUPLICATE KEY UPDATE
+				    MAILTC_NM = #{mailtcNm}
+				  , GOODS_CPR = #{goodsCpr}
+				  , MAILTC_LINK = #{mailtcLink}
+				  , UPD_NO = #{updNo}
+				  , UPD_DT = NOW()
+		</insert>
+	
+		<insert id="saveMailGoods" parameterType="MktmailManagement">
+		/* TsaMailTemplate.saveMailGoods 메일 전시상품등록 */
+		INSERT INTO TB_MAILTC_GOODS (
+				    MAILTC_SQ
+				  , GOODS_CD
+				  , DISP_ORD
+				  , REG_NO
+				  , REG_DT
+				  , UPD_NO
+				  , UPD_DT
+			)
+		     VALUES (
+				    #{mailtcSq}
+				  , #{goodsCd}
+				  , #{dispOrd}
+				  , #{regNo}
+				  , NOW()
+				  , #{updNo}
+				  , NOW()
+			)
+		ON DUPLICATE KEY UPDATE
+				    MAILTC_SQ = #{mailtcSq}
+				  , GOODS_CD = #{goodsCd}
+				  , DISP_ORD = #{dispOrd}
+				  , UPD_NO = #{updNo}
+				  , UPD_DT = NOW()
+		</insert>
+		
+		<select id="getMktMailList" parameterType="MktmailManagement" resultType="MktmailManagement">
+		/* TsaMailTemplate.getMktMailList mkt메일 조회*/
+		SELECT MAILT_SQ
+			 , MAILT_GB
+			 , MAILT_NM
+			 , FN_GET_USER_NM(REG_NO)             AS REG_NM
+			 , DATE_FORMAT(REG_DT,'%Y%m%d%H%i%S') AS REG_DT
+			 , FN_GET_USER_NM(UPD_NO)             AS UPD_NM
+			 , DATE_FORMAT(UPD_DT,'%Y%m%d%H%i%S') AS UPD_DT
+		FROM   TB_MAILT 
+		WHERE  USE_YN = 'Y'
+		<if test="mktmailStdt != null and mktmailStdt != '' and mktmailEddt != null and mktmailEddt != ''">
+		AND  REG_DT BETWEEN STR_TO_DATE(#{mktmailStdt}, '%Y-%m-%d%H%i%S') AND STR_TO_DATE(CONCAT(#{mktmailEddt}, '235959'),'%Y-%m-%d%H%i%S')
+		</if> 
+		<if test="searchTxt != null and searchTxt != ''">
+			<if test="searchGb != null and searchGb == 'mailtSq'">
+				AND MAILT_SQ = #{searchTxt}
+			</if>
+			<if test="searchGb != null and searchGb == 'mailtNm'">
+				AND MAILT_NM LIKE CONCAT('%',LOWER(#{searchTxt}), '%')
+			</if>
+		</if>
+		ORDER BY MAILT_SQ
+		</select>
+		
+		<select id="getMktmailManagementDetail" parameterType="Integer" resultType="MktmailManagement">
+		/* TsaMailTemplate.getMktmailManagementDetail */
+		SELECT MAILT_SQ
+			 , MAILT_GB
+			 , MAILH_SQ
+			 , MAILF_SQ
+			 , MAILT_NM
+			 , MAIL_CONTENT
+		FROM   TB_MAILT
+		WHERE  MAILT_SQ = #{mailtSq}
+		</select>
+		
+		<select id="getMktmailManagementTCDetail" parameterType="Integer" resultType="MktmailManagement">
+		/* TsaMailTemplate.getMktmailManagementDetail */
+
+		</select>
+	
+		
+		<update id='deleteMktmailList' parameterType='MktmailManagement'>
+		/* TsaMailTemplate.deleteMailHFList 리스트 삭제*/
+		UPDATE  TB_MAILT
+	  	SET     USE_YN = 'N'
+		WHERE   MAILT_SQ = #{mailtSq}
+		</update>
+	
+</mapper>

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

@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.style24.admin.biz.dao.TsaMailTemplateDao">
-
-	<!-- 메일헤더푸터관리 리스트 -->
-	<select id="getmailHFList" parameterType="MailTemplate" resultType="MailTemplate">
-			/* TsaMailTemplateManagement.getmailHFList */
-			SELECT  MAILHF_SQ                                             /*메일헤더푸터 일련번호*/
-			   	 ,  MAILHF_NM                                             /*메일헤더푸터 명*/
-			     ,  MAILHF_GB                                             /*메일 헤더푸터 구분 H:헤더 F:푸터*/
-			     ,  MAILHF_CONTENT                                        /*메일 헤더푸터 내용*/
-			     ,  USE_YN                                                /*사용여부*/
-			     ,  FN_GET_USER_NM(REG_NO)             AS REG_NM
-			     ,  DATE_FORMAT(REG_DT,'%Y%m%d%H%i%S') AS REG_DT
-			     ,  FN_GET_USER_NM(UPD_NO)             AS UPD_NM
-			     ,  DATE_FORMAT(UPD_DT,'%Y%m%d%H%i%S') AS UPD_DT
-			  FROM  TB_MAILHF
-			 WHERE  USE_YN = 'Y'
-		<if test="mailhfNm != null and mailhfNm !='' ">
-			   AND  LOWER(MAILHF_NM) LIKE CONCAT('%',LOWER(#{mailhfNm}),'%')
-		</if>
-		<if test="mailhfGb !=null and mailhfGb !='' ">
-			   AND  MAILHF_GB = #{mailhfGb}
-		</if> 
-		<if test="searchTxt !=null and searchTxt !='' ">
-			   AND  FN_GET_USER_NM(REG_NO) LIKE CONCAT('%',LOWER(#{searchTxt}), '%')
-		</if>
-			 ORDER  BY MAILHF_SQ
-	</select>
-	
-	
-	<!-- 메일헤더푸터관리 등록/수정 -->
-	<insert id="saveMailHF" parameterType="MailTemplate">
-			/* TsaMailTemplateManagement.saveMailHF */
-			 INSERT INTO TB_MAILHF (
-		     	    MAILHF_SQ                                        /*메일헤더푸터 일련번호*/
-		   	      , MAILHF_NM                                        /*메일헤더푸터 명*/
-		          , MAILHF_GB                                        /*메일헤더푸터 구분 H:헤더 F:푸터*/
-		          , MAILHF_CONTENT                                   /* 메일헤더푸터 내용*/
-		          , USE_YN                                           /*사용여부*/
-		          , REG_NO
-		          , REG_DT
-		          , UPD_NO
-		          , UPD_DT
-			        )
-		     VALUES (
-		            #{mailhfSq}
-		          , #{mailhfNm}
-		          , #{mailhfGb}
-		          , #{mailhfContent}
-		          , IFNULL(#{useYn},'Y')
-		          , #{regNo}
-		          , NOW()
-		          , #{updNo}
-		          , NOW()
-			      )
-       ON DUPLICATE KEY UPDATE
-			        MAILHF_SQ = #{mailhfSq}
-		          , MAILHF_NM = #{mailhfNm}
-		          , MAILHF_GB = #{mailhfGb}
-		          , MAILHF_CONTENT = #{mailhfContent}
-		          , UPD_NO = #{updNo}
-		          , UPD_DT = NOW()
-	</insert>
-	
-	<!-- 메일헤더푸터 상세화면 팝업 -->
-	<select id="getMailHFDetail" parameterType="Integer" resultType="MailTemplate">
-		/* TsaMailTemplateManagement.getMailHFDetail */
-			SELECT 	MAILHF_SQ
-				 ,  MAILHF_NM
-				 ,  MAILHF_GB
-				 ,  MAILHF_CONTENT
-			  FROM 	TB_MAILHF
-			 WHERE	MAILHF_SQ = #{mailhfSq}
-	</select>
-	
-	<!--메일헤더푸터관리 리스트 삭제 -->
-	<update id='deleteMailHFList' parameterType='MailTemplate'>
-			/* TsaMailManagement.deleteMailHFList */
-			UPDATE  TB_MAILHF
-	  		   SET  USE_YN = 'N'
-			 WHERE  MAILHF_SQ = #{mailhfSq}
-	</update>
-	
-	
-	<select id="getOrderSampleGoodsInfo" parameterType="Goods" resultType="Goods">
-			/*메일 템플릿 상품 전시*/
-			SELECT GOODS_CD
-		         , GOODS_NM
-		         , BRAND_ENM 
-		         , STOCK_QTY_SUM
-		         , GOODS_STAT
-		         , STYLE_YEAR
-			     , SEASON_CD
-		         , LIST_PRICE
-		         , CURR_PRICE
-		         , PRICE_UPD_DT
-		         , ERP_STOCK_LINK_YN
-		         , FORMAL_GB
-		         , RETURNABLE_YN
-		         , REG_DT
-		         , REG_NM
-			     , UPD_DT
-		         , UPD_NM
-		         , REP_GOODS_CD
-			     , GROUP_CONCAT(OPT_CD2 ORDER BY DISP_ORD DESC, OPT_CD2 SEPARATOR ',')        AS SITE_CD
-		      FROM (
-			SELECT   GI.SYS_IMG_NM
-				   , G.GOODS_CD
-				   , G.GOODS_NM
-   				   , B.BRAND_ENM 
-				   , (CASE WHEN G.GOODS_TYPE = 'G056_N' THEN (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = G.GOODS_CD)
-			   ELSE  (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK_COMPOSE WHERE GOODS_CD = G.GOODS_CD)
-					 END) AS STOCK_QTY_SUM
-				   , G.GOODS_STAT
-				   , G.STYLE_YEAR
-				   , G.SEASON_CD
-				   , G.LIST_PRICE
-				   , G.CURR_PRICE
-				   , G.PRICE_UPD_DT
-				   , G.ERP_STOCK_LINK_YN
-				   , G.FORMAL_GB
-				   , G.RETURNABLE_YN
-				   , G.REG_DT
-				   , FN_GET_USER_NM(G.REG_NO) AS REG_NM
-				   , G.UPD_DT
-				   , FN_GET_USER_NM(G.UPD_NO) AS UPD_NM
-				   , IFNULL(GC.COMPS_GOODS_CD, G.GOODS_CD) AS REP_GOODS_CD
-				   , OP.OPT_CD2
-				   , OP.DISP_ORD
-				FROM TB_GOODS G
-				LEFT OUTER JOIN TB_GOODS_COMPOSE GC
-				  ON G.GOODS_CD = GC.GOODS_CD
-			   INNER JOIN TB_OPTION OP
-				  ON IFNULL(GC.COMPS_GOODS_CD, G.GOODS_CD) = OP.GOODS_CD
-				LEFT OUTER JOIN TB_GOODS_IMG GI
-				  ON G.GOODS_CD = GI.GOODS_CD
-			   INNER JOIN TB_BRAND B
-				  ON G.BRAND_CD = B.BRAND_CD
-			   WHERE G.GOODS_CD IN
-		<foreach collection="arrGoodsCd" item="item" index="index"  open="(" close=")" separator=",">
-			 #{item}
-		</foreach>
-		  ) Z
-		    GROUP BY SYS_IMG_NM, GOODS_CD, GOODS_NM, STOCK_QTY_SUM, GOODS_STAT, STYLE_YEAR
-				   , SEASON_CD, LIST_PRICE, CURR_PRICE, PRICE_UPD_DT, ERP_STOCK_LINK_YN, FORMAL_GB, RETURNABLE_YN, REG_DT, REG_NM
-				   , UPD_DT, UPD_NM, REP_GOODS_CD
-	</select>
-	
-	
-	
-	<!-- 메일헤더푸터관리 등록/수정 -->
-	<insert id="saveMktMailTemplate" parameterType="MktmailManagement">
-			/* TsaMailTemplateManagement.saveMktMailTemplate */
-			
-	</insert>
-</mapper>

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

@@ -40,12 +40,19 @@
 								<input type="text" name="mailtSq" maxlength="20" placeholder="자동생성" readonly="readonly"/>
 							</td>
 						</tr>
+						<tr>
+							<th>메일구분</th>
+							<td>
+								<label class="rdoBtn"><input type="radio" name="mailtGb" value="M" checked="checked"/>마케팅</label>
+								<label class="rdoBtn"><input type="radio" name="mailtGb" value="A"/>자동</label>
+							</td>
+						</tr>
 						<tr>
 							<th>헤더</th>
 							<td>
 								<select name="mailHsq">
 									<option>선택하기 ▼</option>
-									<option th:if="${mailHsqList}" th:each="oneData, status : ${mailHsqList}" th:text="|${oneData.mailhfNm}|">></option>
+									<option th:if="${mailHsqList}" th:each="oneData, status : ${mailHsqList}" th:value="|${oneData.mailhfSq}|" th:text="|${oneData.mailhfNm}|" selected="selected"></option>
 								</select>
 							</td>
 						</tr>
@@ -54,12 +61,12 @@
 							<td>
 								<select name="mailFsq">
 										<option>선택하기 ▼</option>
-										<option th:if="${mailFsqList}" th:each="oneData, status : ${mailFsqList}" th:text="|${oneData.mailhfNm}|"></option>
+										<option th:if="${mailFsqList}" th:each="oneData, status : ${mailFsqList}" th:value="|${oneData.mailhfSq}|" th:text="|${oneData.mailhfNm}|" selected="selected"></option>
 								</select>
 							</td>
 						</tr>
 						<tr>
-							<th>타이틀</th>
+							<th>타이틀<em class="required" title="필수"></em></th>
 							<td><input type="text" name="mailtNm" maxlength="50" required="required" data-valid-name="타이틀" /></td>
 						</tr>
 						
@@ -75,6 +82,7 @@
 		<!-- 팝업창 상단부분 끝-->
 		
 		<!-- 팡업창 하단부분 시작 -->
+		
 		<div class="panelStyle" style="margin:unset;">
 				<!-- TITLE -->
 				<div class="panelTitle">
@@ -97,6 +105,8 @@
 					</ul>
 						<!-- 구분 1 -->
 						<div class="inner-panelContent" id="btnAddGridNum" style="display:none;">
+							<input type="hidden" name="btnAddGridNumUseYn"  value ="Y">
+							<input type="hidden" name="mailtcSq">
 							<div class="panelContent">
 								<table class="frmStyle">
 									<colgroup>
@@ -134,7 +144,7 @@
 														<td>
 															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="1"/>1개</label>
 															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="2"/>2개</label>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="3" checked/>3개</label>						
+															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="3" checked/>3개</label>
 															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="4"/>4개</label>
 															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="5"/>5개</label>
 														</td>
@@ -160,6 +170,7 @@
 						
 						<!-- 구분2 -->
 						<div class="inner-panelContent" id="btnAddGridNum2" style="display:none;">
+							<input type="hidden" name="btnAddGridNum2UseYn" value="Y">
 							<div class="panelContent">
 								<table class="frmStyle">
 									<colgroup>
@@ -176,23 +187,23 @@
 													<tr>
 														<th class="w100">구분자 명</th>
 														<td>
-															<input type="text" name="mailtcNm"/>
+															<input type="text" name="mailtcNm2"/>
 														</td>
 													</tr>
 													<tr>
 														<th>링크</th>
 														<td>
-															<input type="text" name="mailtcLink"/>								
+															<input type="text" name="mailtcLink2"/>
 														</td>
 													</tr>
 													<tr>
 														<th>상품 노출 기준</th>
 														<td>
-															<label class="rdoBtn"><input type="radio" name="" value="1"/>1개</label>
-															<label class="rdoBtn"><input type="radio" name="" value="2"/>2개</label>
-															<label class="rdoBtn"><input type="radio" name="" value="3" checked/>3개</label>						
-															<label class="rdoBtn"><input type="radio" name="" value="4"/>4개</label>
-															<label class="rdoBtn"><input type="radio" name="" value="5"/>5개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr2" value="1"/>1개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr2" value="2"/>2개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr2" value="3" checked/>3개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr2" value="4"/>4개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr2" value="5"/>5개</label>
 														</td>
 													</tr>
 												</table>
@@ -216,6 +227,7 @@
 						
 						<!-- 구분3 -->
 						<div class="inner-panelContent" id="btnAddGridNum3" style="display:none;">
+							<input type="hidden" name="btnAddGridNum3UseYn" value="Y">
 							<div class="panelContent">
 								<table class="frmStyle">
 									<colgroup>
@@ -232,23 +244,23 @@
 													<tr>
 														<th class="w100">구분자 명</th>
 														<td>
-															<input type="text" name="mailtcNm"/>								
+															<input type="text" name="mailtcNm3"/>								
 														</td>
 													</tr>
 													<tr>
 														<th>링크</th>
 														<td>
-															<input type="text" name="mailtcLink"/>								
+															<input type="text" name="mailtcLink3"/>								
 														</td>
 													</tr>
 													<tr>
 														<th>상품 노출 기준</th>
 														<td>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="1"/>1개</label>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="2"/>2개</label>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="3" checked/>3개</label>						
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="4"/>4개</label>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="5"/>5개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr3" value="1"/>1개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr3" value="2"/>2개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr3" value="3" checked/>3개</label>						
+															<label class="rdoBtn"><input type="radio" name="goodsCpr3" value="4"/>4개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr3" value="5"/>5개</label>
 														</td>
 													</tr>
 												</table>
@@ -272,6 +284,7 @@
 						
 						<!-- 구분4 -->
 						<div class="inner-panelContent" id="btnAddGridNum4" style="display:none;">
+							<input type="hidden" name="btnAddGridNum4UseYn" value="Y">
 							<div class="panelContent">
 								<table class="frmStyle">
 									<colgroup>
@@ -288,23 +301,23 @@
 													<tr>
 														<th class="w100">번호</th>
 														<td>
-															<input type="text" name="mailtcNm"/>								
+															<input type="text" name="mailtcNm4"/>								
 														</td>
 													</tr>
 													<tr>
 														<th>링크</th>
 														<td>
-															<input type="text" name="mailtcLink"/>								
+															<input type="text" name="mailtcLink4"/>								
 														</td>
 													</tr>
 													<tr>
 														<th>상품 노출 기준</th>
 														<td>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="1"/>1개</label>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="2"/>2개</label>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="3" checked/>3개</label>						
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="4"/>4개</label>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="5"/>5개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr4" value="1"/>1개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr4" value="2"/>2개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr4" value="3" checked/>3개</label>						
+															<label class="rdoBtn"><input type="radio" name="goodsCpr4" value="4"/>4개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr4" value="5"/>5개</label>
 														</td>
 													</tr>
 												</table>
@@ -328,6 +341,7 @@
 						
 						<!-- 구분5 -->
 						<div class="inner-panelContent" id="btnAddGridNum5" style="display:none;">
+							<input type="hidden" name="btnAddGridNum5UseYn" value="Y">
 							<div class="panelContent">
 								<table class="frmStyle">
 									<colgroup>
@@ -344,23 +358,23 @@
 													<tr>
 														<th class="w100">구분자 명</th>
 														<td>
-															<input type="text" name=""/>								
+															<input type="text" name="mailtcNm5"/>								
 														</td>
 													</tr>
 													<tr>
 														<th>링크</th>
 														<td>
-															<input type="text" name=""/>								
+															<input type="text" name="mailtcLink5"/>								
 														</td>
 													</tr>
 													<tr>
 														<th>상품 노출 기준</th>
 														<td>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="1"/>1개</label>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="2"/>2개</label>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="3" checked/>3개</label>						
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="4"/>4개</label>
-															<label class="rdoBtn"><input type="radio" name="goodsCpr" value="5"/>5개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr5" value="1"/>1개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr5" value="2"/>2개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr5" value="3" checked/>3개</label>						
+															<label class="rdoBtn"><input type="radio" name="goodsCpr5" value="4"/>4개</label>
+															<label class="rdoBtn"><input type="radio" name="goodsCpr5" value="5"/>5개</label>
 														</td>
 													</tr>
 												</table>
@@ -408,6 +422,8 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 		let AddgridRow;		
+		let mode = [[${mode}]]; 
+		let mktmailInfo = [[${mktmailInfo}]];
 		
 		//팝업창 삭제버튼
 		$('#btndeleteMktmail').on('click', function() {
@@ -454,7 +470,7 @@
 		///저장
 		$('#btnSaveMktMail').on('click', function() {
 		
-		//타이틀 길이 제한 2자 이상 50자미만
+			//타이틀 길이 제한 2자 이상 50자미만
 			var check = $('#mailManagementForm input[name=mailtNm]').val();
 
 			if(check.length < 2){
@@ -468,9 +484,70 @@
 			let arrayData4 = gagaAgGrid.getAllRowData(gridOptions_c4)
 			let arrayData5 = gagaAgGrid.getAllRowData(gridOptions_c5)
 			
-			let arrayDataTc = $('#btnAddGridNum input[name=mailtcNm]').val();
+			let mailTc = {};
+	
+			mailTc.mailtcNm = $('#mailManagementForm input[name=mailtcNm]').val();
+			mailTc.mailtcLink = $('#mailManagementForm input[name=mailtcLink]').val();
+			mailTc.goodsCpr = $('#mailManagementForm input:radio[name=goodsCpr]:checked').val();
+			
+ 			let mailTc2 = {};
+			
+			mailTc2.mailtcNm = $('#mailManagementForm input[name=mailtcNm2]').val();
+			mailTc2.mailtcLink = $('#mailManagementForm input[name=mailtcLink2]').val();
+			mailTc2.goodsCpr = $('#mailManagementForm input:radio[name=goodsCpr2]:checked').val();
+			
+			let mailTc3 = {};
+			
+			mailTc3.mailtcNm = $('#mailManagementForm input[name=mailtcNm3]').val();
+			mailTc3.mailtcLink = $('#mailManagementForm input[name=mailtcLink3]').val();
+			mailTc3.goodsCpr = $('#mailManagementForm input:radio[name=goodsCpr3]:checked').val();
+			
+			let mailTc4 = {};
+			
+			mailTc4.mailtcNm = $('#mailManagementForm input[name=mailtcNm4]').val();
+			mailTc4.mailtcLink = $('#mailManagementForm input[name=mailtcLink4]').val();
+			mailTc4.goodsCpr = $('#mailManagementForm input:radio[name=goodsCpr4]:checked').val();
 			
+			let mailTc5 = {};
 			
+			mailTc5.mailtcNm = $('#mailManagementForm input[name=mailtcNm5]').val();
+			mailTc5.mailtcLink = $('#mailManagementForm input[name=mailtcLink5]').val();
+			mailTc5.goodsCpr = $('#mailManagementForm input:radio[name=goodsCpr5]:checked').val();
+			
+			//헤더 선택체크 내용 체크
+			if(!gagajf.validation('#mailManagementForm'))
+				return false;
+			
+			if(gagajf.isNull($('#mailContent').val())){
+				mcxDialog.alert('내용을 입력해 주세요.');
+				return false;
+			}
+			
+			if($('#btnAddGridNum').css('display') != 'none'){
+				if(gagajf.isNull($('#mailManagementForm input[name=mailtcNm]').val())){
+					mcxDialog.alert('구분자명을 입력해 주세요.');
+					return false;
+				}
+				var check = $('#mailManagementForm input[name=mailtcNm]').val();
+				
+				if(check.length < 2){
+					mcxDialog.alert('구분자명은 2자 이상 50자 미만으로 입력하세요.');
+					return false;
+				}
+				
+			}else if($('#btnAddGridNum2').css('display') != 'none'){
+				if(gagajf.isNull($('#mailManagementForm input[name=mailtcNm2]').val())){
+					mcxDialog.alert('구분자명을 입력해 주세요.');
+					return false;
+				}
+				var check = $('#mailManagementForm input[name=mailtcNm2]').val();
+				
+				if(check.length < 2){
+					mcxDialog.alert('구분자명은 2자 이상 50자 미만으로 입력하세요.');
+					return false;
+				}
+			}
+						
 			mcxDialog.confirm("내용을 등록 하시겠습니까?", {
 				cancelBtnText: "취소",
 				sureBtnText: "확인",
@@ -478,25 +555,23 @@
 					
 					let data = {
 					};
-
-// 					data.mktmailManagementTc = $('#btnAddGridNum input[name=mailtcLink]').val();
-// 					data.mktmailManagementTc = $('#btnAddGridNum input[name=goodsCpr]').val();
-
-					data.mktmailManagementTc = arrayDataTc;
-					console.log(data);
-					alert(1);
+					
+					data.mktmailManagementTc = mailTc;
+					data.mktmailManagementTc2 = mailTc2;
+					data.mktmailManagementTc3 = mailTc3;
+					data.mktmailManagementTc4 = mailTc4;
+					data.mktmailManagementTc5 = mailTc5;
+					
 					data.mktmailManagementGoods = arrayData;
 					data.mktmailManagementGoods2 = arrayData2;
 					data.mktmailManagementGoods3 = arrayData3;
 					data.mktmailManagementGoods4 = arrayData4;
 					data.mktmailManagementGoods5 = arrayData5;
-// 					data.mailtcNm = $('#mailManagementForm input[name=mailtcNm]').val(),
-// 					data.mailtcLink = $('#mailManagementForm input[name=mailtcLink]').val(),
-// 					data.goodsCpr = $('#mailManagementForm input:radio[name=goodsCpr]').val()
-
+					
 					data.mktHeader = $('#mailManagementForm select[name=mailHsq]').val();
 					data.mktFooter = $('#mailManagementForm select[name=mailFsq]').val();
 					data.mailtNm = $('#mailManagementForm input[name=mailtNm]').val();
+					data.mailtGb = $('#mailManagementForm input:radio[name=mailtGb]:checked').val();
 					data.mailContent = $('#mailManagementForm textarea[name=mailContent]').val();
 					
 					let jsonData = JSON.stringify(data);
@@ -514,15 +589,15 @@
 		// 상품 구분 추가 버튼 추가 버튼 표시는 1~5까지 순서대로 표시
 		$('#btnAddGrid').on('click', function(){
 			if($('#btnAddGridNum').css('display') == 'none'){
-				$('#btnAddGridNum').show();('#searchForm')
+				$('#btnAddGridNum').show();
 			}else if($('#btnAddGridNum2').css('display') == 'none' && $('#btnAddGridNum').css('display') != 'none'){
-				$('#btnAddGridNum2').show();('#searchForm2')
+				$('#btnAddGridNum2').show();
 			}else if($('#btnAddGridNum3').css('display') == 'none' && $('#btnAddGridNum2').css('display') != 'none'){
-				$('#btnAddGridNum3').show();('#searchForm3')
+				$('#btnAddGridNum3').show();
 			}else if($('#btnAddGridNum4').css('display') == 'none' && $('#btnAddGridNum3').css('display') != 'none'){
-				$('#btnAddGridNum4').show();('#searchForm4')
+				$('#btnAddGridNum4').show();
 			}else if($('#btnAddGridNum5').css('display') == 'none' && $('#btnAddGridNum4').css('display') != 'none'){
-				$('#btnAddGridNum5').show();('#searchForm5')
+				$('#btnAddGridNum5').show();
 			}else if($('#btnAddGridNum5').css('display') != 'none'){
 				mcxDialog.alertC("구분자는 최대 5개까지 등록가능합니다.", {
 					sureBtnText: "확인"
@@ -642,41 +717,44 @@
 			if($('#btnAddGridNum').css('display') !='none'){
 				$('#btnAddGridNum').hide();
 				$('#btnAddGridNum')[0].reset();
-				gagaAgGrid.removeRowData(AddgridRow, false);
 			}
 		}		
 		function btnDeleteGridNum2(param){
 			if($('#btnAddGridNum2').css('display') !='none'){
 				$('#btnAddGridNum2').hide();
 				$('#searchForm2')[0].reset();
-				gagaAgGrid.removeRowData(AddgridRow, false);
 			}			
 		}			
 		function btnDeleteGridNum3(param){
 			if ($('#btnAddGridNum3').css('display') !='none'){
 				$('#btnAddGridNum3').hide();
 				$('#searchForm3')[0].reset();
-				gagaAgGrid.removeRowData(AddgridRow, false);
 			}			
 		}		
 		function btnDeleteGridNum4(param){
 			if ($('#btnAddGridNum4').css('display') !='none'){
 				$('#btnAddGridNum4').hide();
 				$('#searchForm3')[0].reset();
-				gagaAgGrid.removeRowData(AddgridRow, false);
 			}			
 		}
 		function btnDeleteGridNum5(param){
 			if ($('#btnAddGridNum5').css('display') !='none'){
 				$('#btnAddGridNum5').hide();
 				$('#searchForm5')[0].reset();
-				gagaAgGrid.removeRowData(AddgridRow, false);
-			}			
+			}
 		} 
 
-
+	$(document).ready(function() {
 		
-		$(document).ready(function() {
+		if (mode == 'U') {
+			
+			$('#mailManagementForm input[name=mailtNm]').val(mktmailInfo.mailtNm);
+			$('#mailManagementForm textarea[name=mailContent]').val(mktmailInfo.mailContent);
+
+			if(mktmailInfo.mailtGb == "A"){
+				$('#mailManagementForm input:radio[name="mailtGb"]:radio[value="A"]').prop('checked', true);
+			}
+		}
 		
 		gagaAgGrid.createGrid("gridSectionGbList1", gridOptions_c1);
 		gagaAgGrid.createGrid("gridSectionGbList2", gridOptions_c2);

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

@@ -22,7 +22,7 @@
 		<!-- 메뉴 설명 -->
 		<div class="infoBox menu-desc"></div>
 
-		<form id="searchForm" name="searchForm" action="#" th:action="@{'/marketing/Mktmailmanagement/list'}">
+		<form id="searchForm" name="searchForm" action="#" th:action="@{'/marketing/mktmailManagement/list'}"  onsubmit="$('#btnSearch').trigger('click'); return false;">
 			<!-- 검색조건 영역 -->
 			<div class="panelStyle" >
 				<!-- //TITLE -->
@@ -40,8 +40,8 @@
 						<tr>
 							<th>조회</th>
 							<td>
-								<label class="rdoBtn"><input type="radio" name="mailtSq" value="mailtSq" checked/>메일번호</label>
-								<label class="rdoBtn"><input type="radio" name="mailtSq" value="mailtNm"/>타이틀</label>
+								<label class="rdoBtn"><input type="radio" name="searchGb" value="mailtSq"checked/>메일번호</label>
+								<label class="rdoBtn"><input type="radio" name="searchGb" value="mailtNm"/>타이틀</label>
 								<input type="text" class="w900" name="searchTxt" id="searchTxt"/>
 							</td>
 						</tr>
@@ -65,8 +65,6 @@
 					</li>
 					<li class="right">
 						<button type="button" class="btn btn-info btn-lg" onclick="fnOpenMailHFPopup('N');">메일템플릿 등록</button>
-						<!-- 상세보기 로직 완성 후 삭제할것 -->
-						<button type="button" class="btn btn-warning btn-lg" onclick="fnOpenMailHFPopup('U');">상세보기 임시버튼</button>
 				</ul>
 				<!-- //버튼 배치 영역 -->
 				<div id="gridList" style="width: 100%; height: 570px" class="ag-theme-balham"></div>
@@ -74,37 +72,43 @@
 		<!-- //리스트 영역 -->
 		</form>
 	</div>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
-
 /*<![CDATA[*/
+	
+	//메일구분
+	let mailtGb = {"M" :"마케팅메일", "A":"자동메일"};
+	
 	var columnDefs = [];
 	columnDefs = [
-		{
-			width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false
-		},
-		{headerName: "메일번호", field: "mailtSq", width: 100, cellClass: 'text-center'
-		},
-		{
-			headerName: "타이틀", field: "mailtNm", width: 350, cellClass: 'text-center'
-		},
-		{	//미리보기 
-			headerName: "미리보기", field: "", width: 150, cellClass: 'text-center',
-			cellRenderer: function(params) { 
+		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+		{headerName: "메일번호", field: "mailtSq", width: 100, cellClass: 'text-center'},
+		{headerName: "메일구분", field: "mailtGb", width: 200, cellClass: 'text-center',
+		 	valueFormatter: function (params) { return gagaAgGrid.lookupValue(mailtGb, params.value); }},
+		{	headerName: "타이틀", field: "mailtNm", width: 350, cellClass: 'text-center',
+			cellRenderer: function(params) 
+			{ 
 				return '<a href="javascript:void(0);">' + params.value + '</a>'; 
 			}
 		},
-		{
-			headerName: "등록자", field: "regNm", width: 150, cellClass: 'text-center'},
+		{	//미리보기 
+			headerName: "미리보기", width: 150, cellClass: 'text-center'
+		},
+		{headerName: "등록자", field: "regNm", width: 150, cellClass: 'text-center'},
 		{
 			headerName: "등록일시", field: "regDt", width: 200, cellClass: 'text-center',
-			cellRenderer: function(params) { return gagaAgGrid.toDateTimeFormat(params.value); }
+			cellRenderer: function(params) 
+			{ 
+				return gagaAgGrid.toDateTimeFormat(params.value); 
+			}
 		},
 		{
 			headerName: "수정자", field: "updNm", width: 150, cellClass: 'text-center'},
 		{
 			headerName: "수정일시", field: "updDt", width: 200, cellClass: 'text-center', 
-			cellRenderer: function(params) { return gagaAgGrid.toDateTimeFormat(params.value); }
+			cellRenderer: function(params) 
+			{ 
+				return gagaAgGrid.toDateTimeFormat(params.value); 
+			}
 		}
 	];
 	
@@ -115,17 +119,46 @@
 	//TODO
 	
 	
-	// 선택삭제 버튼 다중 선택 추가
+	// 다중 선택 추가
 	gridOptions.rowSelection = 'multiple';	
 	
 	//셀 클릭 이벤트 -> 팝업창
 	gridOptions.onCellClicked = function(event) {
-		if (event.colDef.field != 'mailhfNm')
+		if (event.colDef.field != 'mailtNm')
 			return;
 		
-		fnOpenMailHFPopup('U', event.data.mailhfSq);
+		fnOpenMailHFPopup('U', event.data.mailtSq);
 	}
 	
+	// grid row Delete
+	$('#btnDeleteRow').on('click', function() {
+		var removedData = gagaAgGrid.removeRowData(gridOptions);
+		
+		if (removedData.length == 0) {
+			mcxDialog.alert('선택된 행이 없습니다.');
+			return;
+		}
+		
+		mcxDialog.confirm("삭제하시겠습니까?", {
+			sureBtnText: "확인",
+			cancelBtnText: "취소",
+			sureBtnClick: function() {
+				// delete 대신 update 처리해야 하므로 다음과 같이 useYn 값으로 처리
+				var updatedData = [];
+				
+				$.each(removedData, function(idx, item) {
+					item.useYn = 'N';
+					updatedData.push(item);
+				});
+				
+				
+				var jsonData = JSON.stringify(updatedData);
+				gagajf.ajaxJsonSubmit('/marketing/mktmailManagement/delete', jsonData, function() {
+					$('#btnSearch').trigger('click');
+				});
+			}
+		});
+	});
 	
 	// 조회버튼 - 검색
 	$('#btnSearch').on('click', function() {
@@ -141,11 +174,9 @@
 		cfnOpenModalPopup(actionUrl, 'popupMktMail');
 	}
 	
-	
-	
 	$(document).ready(function() {
 	
-		cfnCreateCalendar('#sellTerms', 'tmtbStdt', 'tmtbEddt', true);
+		cfnCreateCalendar('#sellTerms', 'mktmailStdt', 'mktmailEddt', true);
 	
 		// Create a agGrid
 		gagaAgGrid.createGrid('gridList', gridOptions);