Merge remote-tracking branch 'origin/develop' into xodud1202

src/main/java/com/style24/scm/biz/web/TssMarketingController.java

@@ -867,7 +867,8 @@ public class TssMarketingController extends TssBaseController {
 
 		// 할인방식 목록
 		mav.addObject("dcWayList", rendererService.getAvailCommonCodeList("G240"));
-
+		// 쿠폰상태 목록
+		mav.addObject("cpnStatList", rendererService.getAvailCommonCodeList("G232"));
 		mav.setViewName("marketing/CouponRetrievePopupForm");
 
 		return mav;

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

@@ -96,15 +96,23 @@
 	let usableCustGbList = gagajf.convertToArray([[${usableCustGbList}]]);
 	let cpnTypeList = gagajf.convertToArray([[${cpnTypeList}]]);
 	let dcWayList = gagajf.convertToArray([[${dcWayList}]]);
+	let cpnStatList = gagajf.convertToArray([[${cpnStatList}]]);
+	let pdGbList = { "P":"기간", "D":"일수" };
 	
 	let columnDefsCouponList = [
-// 		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+		{width: 40, minWidth: 40, cellClass: 'text-center', pinned: 'left', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
 		{
 			headerName: "사이트", field: "siteCd", width: 80, cellClass: "text-center", pinned: 'left',
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(siteList, params.value); }
 		},
 		{headerName: "쿠폰ID", field: "cpnId", width: 90, cellClass: 'text-center', pinned: 'left'},
 		{headerName: "쿠폰명", field: "cpnNm", width: 150, pinned: 'left'},
+		{headerName: "쿠폰상태", field: "cpnStat", width: 140, cellClass: 'text-center' ,
+			cellEditor: 'agRichSelectCellEditor',
+			cellEditorParams: { values: gagaAgGrid.extractValues(cpnStatList) },
+			valueFormatter: function (params) { return gagaAgGrid.lookupValue(cpnStatList, params.value); },
+			valueParser: function (params) { return gagaAgGrid.lookupKey(cpnStatList, params.newValue); }
+		},
 		{
 			headerName: "사용가능고객", field: "usableCustGb", width: 120, cellClass: "text-center",
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(usableCustGbList, params.value); }
@@ -129,23 +137,27 @@
 			headerName: "최고할인값", field: "maxDcAmt", width: 100, cellClass: "text-center",
 			cellRenderer: function(params) { return (!gagajf.isNull(params.value) ? gagaAgGrid.toAddComma(params.value) : '') + (params.data.dcWay == '10' ? '원' : '%'); }
 		},
-// 		{
-// 			headerName: "기간/일수", field: "pdGb", width: 100, cellClass: "text-center", hide: true,
-// 			cellRenderer: function(params) { return (params.value == 'P' ? '기간' : '일수'); }
-// 		},
-// 		{
-// 			headerName: "유효시작일시", field: "availStdt", width: 150, cellClass: "text-center", hide: true,
-// 			cellRenderer: function(params) { return !gagajf.isNull(params.value) ? gagaAgGrid.toDateTimeFormat(params.value) : ''; }
-// 		},
-// 		{
-// 			headerName: "유효종료일시", field: "availEddt", width: 150, cellClass: "text-center", hide: true,
-// 			cellRenderer: function(params) { return !gagajf.isNull(params.value) ? gagaAgGrid.toDateTimeFormat(params.value) : ''; }
-// 		},
-// 		{headerName: "유효일수", field: "availDays", width: 100, cellClass: "text-center", hide: true},
-		{
-			headerName: "유효기간", field: "availPeriod", width: 300, cellClass: "text-center",
-			cellRenderer: function(params) { return params.data.pdGb == 'P' ? gagaAgGrid.toDateTimeFormat(params.data.availStdt) + '~' + gagaAgGrid.toDateTimeFormat(params.data.availStdt) : gagaAgGrid.toAddComma(params.data.availDays) + '일'; }
+		{headerName: "기간/일수구분", field: "pdGb", width: 140, cellClass: 'text-center' ,
+			cellEditor: 'agRichSelectCellEditor',
+			cellEditorParams: { values: gagaAgGrid.extractValues(pdGbList) },
+			valueFormatter: function (params) { return gagaAgGrid.lookupValue(pdGbList, params.value); },
+			valueParser: function (params) { return gagaAgGrid.lookupKey(pdGbList, params.newValue); }
+		},
+		{headerName: "유효시작일시", field: "availStdt", width: 140, cellClass: 'text-center' ,
+			cellRenderer: function(params) {
+				return !gagajf.isNull(params.value) ? params.value.toDate("YYYY-MM-DD HH:mm:ss").format("YYYY-MM-DD HH:mm:ss") : '';
+			}
+		},
+		{headerName: "유효종료일시", field: "availEddt", width: 140, cellClass: 'text-center' ,
+			cellRenderer: function(params) {
+				return !gagajf.isNull(params.value) ? params.value.toDate("YYYY-MM-DD HH:mm:ss").format("YYYY-MM-DD HH:mm:ss") : '';
+			}
 		},
+		{headerName: "유효일수", field: "availDays", width: 140, cellClass: 'text-center'},
+		// {headerName: "유효일수", field: "availDays", width: 140, cellClass: 'text-center'},		{
+		// 	headerName: "유효기간", field: "availPeriod", width: 300, cellClass: "text-center",
+		// 	cellRenderer: function(params) { return params.data.pdGb == 'P' ? gagaAgGrid.toDateTimeFormat(params.data.availStdt) + '~' + gagaAgGrid.toDateTimeFormat(params.data.availStdt) : gagaAgGrid.toAddComma(params.data.availDays) + '일'; }
+		// },
 		{headerName: "발행제한여부", field: "pubLimitYn", width: 100, cellClass: "text-center"},
 		{
 			headerName: "고객당발행제한수량", field: "custPubLimitQty", width: 100, cellClass: "text-center",

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

@@ -456,7 +456,7 @@
 					,excelFileNm : result.excelFileNm
 					};
 		var jsonData = JSON.stringify(data);
-		gagajf.ajaxJsonSubmit('/marketing/planning/corner/goods/excelupload', jsonData, fnCornerSearch);
+		gagajf.ajaxJsonSubmit('/marketing/planning/corner/goods/excelupload', jsonData, fnConnerGoodsSearch);
 	}
 
 	var fnOpenGoodsPopup = function() {

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

@@ -1686,7 +1686,7 @@
 			}else{
 				multiPlanFile.push($('#fileItemVal'+(i+1)).val());
 				multiPlanFile2.push($('#planTemplateForm input[name=fileLinkUrl'+(i+1)+']').val());
-				multiPlanFile3.push($('#planTemplateForm input:radio[name=linkOpenGb'+(i+1)+']:checked').val());
+				multiPlanFile3.push($('#planTemplateForm input:radio[name=fileLinkOpenGb'+(i+1)+']:checked').val());
 			}
 		}