이태영 - 20210716 BOS 수정사항 수정 중

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

@@ -26,6 +26,9 @@
 		<if test="vendorId != null and vendorId != ''">
 		AND    VENDOR_ID = #{vendorId}
 		</if>
+		<if test="searchTxt != null and searchTxt != ''">
+		AND    EXTMALL_NM LIKE CONCAT('%', #{searchTxt}, '%')
+		</if>
 		ORDER  BY VENDOR_ID, EXTMALL_ID, EXTMALL_USER_ID
 	</select>
 

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

@@ -751,12 +751,16 @@
 			return false;
 		}
 
-		// 행사기간 확인
-		let fromDate = $('#freeGoodsPromotionForm input[name=freegiftStdt]').val();
-		let toDate = $('#freeGoodsPromotionForm input[name=freegiftEddt]').val();
+		let fromDate = $("#freeGoodsPromotionForm input[name=freegiftStDate]").val() + " " + $("#freeGoodsPromotionForm select[name=freegiftStHH]").val() + ":" + $("#freeGoodsPromotionForm select[name=freegiftStMM]").val() + ":00";
+		let toDate = $("#freeGoodsPromotionForm input[name=freegiftEdDate]").val();
+		if($("#freeGoodsPromotionForm select[name=freegiftEdHH]").val() == "24") {
+			toDate += " 23:59:59";
+		} else {
+			toDate += " " + $("#freeGoodsPromotionForm select[name=freegiftEdHH]").val() + ":" + $("#freeGoodsPromotionForm select[name=freegiftEdMM]").val() + ":00";
+		}
 
-		if (fromDate > toDate) {
-			mcxDialog.alert("시작일자는 종료일자 보다 늦을 수 없습니다.");
+		if (fromDate >= toDate) {
+			mcxDialog.alert("시작일자는 종료일자 보다 늦거나 같을 수 없습니다.");
 			return false;
 		}
 

src/main/webapp/WEB-INF/views/ocm/ExtmallSearchForm.html

@@ -25,8 +25,7 @@
 
 		<!-- 검색 조건 -->
 		<div class="panelContent">
-			<form id="searchExtmallListForm" name="searchExtmallListForm" action="#" th:action="@{'/ocm/extmall/list'}" onsubmit="$('#btnSearchExtmallList').trigger('click'); return false;">
-
+			<form id="searchExtmallListForm" class="searchExtmallListForm" name="searchExtmallListForm" action="#" th:action="@{'/ocm/extmall/list'}" onsubmit="$('#btnSearchExtmallList').trigger('click'); return false;">
 				<table class="frmStyle" aria-describedby="검색조건">
 					<colgroup>
 						<col style="width:15%;"/>
@@ -90,6 +89,7 @@
 		$('#btnSearchExtmallList').on('click', function() {
 			// Fetch data
 			gagaAgGrid.fetch($('#searchExtmallListForm').prop('action'), gridOptionsExtmallPopupList, '#searchExtmallListForm');
+			gridOptions.api.setRowData(result.morebetterList);
 		});
 
 		// 확인