검색키워드

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

@@ -397,4 +397,14 @@ public interface TsaDisplayDao {
 	 * @since 2021. 7. 1
 	 */
 	void updateSearchKeyword(SearchKeyword searchKeyword);
+
+	/**
+	 * 검색키워드 목록
+	 *
+	 * @param searchKeyword
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 7. 1
+	 */
+	Collection<SearchKeyword> getSearchKeywordList(SearchKeyword searchKeyword);
 }

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

@@ -778,4 +778,16 @@ public class TsaDisplayService {
 //		}
 		displayDao.createSearchKeyword(searchKeyword);
 	}
+
+	/**
+	 * 검색 키워드 목록
+	 *
+	 * @param SearchKeyword
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 7. 2
+	 */
+	public Collection<SearchKeyword> getSearchKeywordList(SearchKeyword searchKeyword) {
+		return displayDao.getSearchKeywordList(searchKeyword);
+	}
 }

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

@@ -1024,4 +1024,17 @@ public class TsaDisplayController extends TsaBaseController {
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 
+	/**
+	 * 검색 키워드 목록
+	 * @param SearchKeyword
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 7. 2
+	 */
+	@PostMapping("/search/keyword/list")
+	@ResponseBody
+	public Collection<SearchKeyword> getSearchKeywordList(@RequestBody SearchKeyword searchKeyword) {
+		return displayService.getSearchKeywordList(searchKeyword);
+	}
+
 }

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

@@ -20,5 +20,7 @@ public class SearchKeyword extends TscBaseDomain {
 	private String linkUrl;
 	private String dispStdt;
 	private String dispEddt;
+	private String stDate;
+	private String edDate;
 
 }

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

@@ -2100,8 +2100,8 @@
 		  #{keywordSq}
 		  , #{keyword}
 		  , #{linkUrl}
-		  , #{dispStdt}
-		  , #{dispEddt}
+		  , DATE_FORMAT(CONCAT(#{dispStdt},'000000') , '%Y-%m-%d %H:%i:%S')
+		  , DATE_FORMAT(CONCAT(#{dispEddt},'235959') , '%Y-%m-%d %H:%i:%S')
 		  , #{regNo}
 		  , NOW()
 		  , #{updNo}
@@ -2110,9 +2110,36 @@
 		ON DUPLICATE KEY UPDATE
 		    KEYWORD = #{keyword}
 		  , LINK_URL = #{linkUrl}
-		  , DISP_STDT = #{dispStdt}
-		  , DISP_EDDT = #{dispEddt}
+		  , DISP_STDT = DATE_FORMAT(CONCAT(#{dispStdt},'000000') , '%Y-%m-%d %H:%i:%S')
+		  , DISP_EDDT = DATE_FORMAT(CONCAT(#{dispEddt},'235959') , '%Y-%m-%d %H:%i:%S')
 		  , UPD_NO = #{updNo}
 		  , UPD_DT = NOW()
 	</insert>
+
+	<select id="getSearchKeywordList" parameterType="SearchKeyword" resultType="SearchKeyword">
+		/*TsaDisplay.getSearchKeywordList*/
+		SELECT KEYWORD_SQ
+		     , KEYWORD
+		     , LINK_URL
+		     , DISP_STDT
+		     , DISP_EDDT
+		     , REG_NO
+		     , FN_GET_USER_NM(REG_NO) AS REG_NM
+		     , REG_DT
+		     , UPD_NO
+		     , FN_GET_USER_NM(UPD_NO) AS UPD_NM
+		     , UPD_DT
+		FROM TB_SEARCH_KEYWORD
+		WHERE 1=1
+		<if test='edDate != null and edDate != ""'>
+		<![CDATA[
+		   AND DISP_STDT <= DATE_FORMAT(CONCAT(#{edDate},'235959') , '%Y-%m-%d %H:%i:%S')
+		]]>
+		</if>
+		<if test='stDate != null and stDate != ""'>
+		<![CDATA[
+		   AND DISP_EDDT >= DATE_FORMAT(CONCAT(#{stDate},'000000') , '%Y-%m-%d %H:%i:%S')
+		]]>
+		</if>
+	</select>
 </mapper>

src/main/webapp/WEB-INF/views/display/SearchKeywordForm.html

@@ -149,8 +149,10 @@
 			$(formId + " input[name=keywordSq]").val(event.data.keywordSq);
 			$(formId + " input[name=keyword]").val(event.data.keyword);
 			$(formId + " input[name=linkUrl]").val(event.data.linkUrl);
-			$(formId + " input[name=dispStdt]").val(event.data.dispStdt);
-			$(formId + " input[name=dispEddt]").val(event.data.dispEddt);
+			var dispStdt = event.data.dispStdt.replaceAll('-','');
+			$(formId + " input[name=dispStdt]").val(dispStdt.substr(0,4)+"-"+dispStdt.substr(4,2)+"-"+dispStdt.substr(6,2));
+			var dispEddt = event.data.dispEddt.replaceAll('-','');
+			$(formId + " input[name=dispEddt]").val(dispEddt.substr(0,4)+"-"+dispEddt.substr(4,2)+"-"+dispEddt.substr(6,2));
 		}
 	}
 	
@@ -166,15 +168,11 @@
 	
 	// 조회
 	$('#btnSearch').on('click', function() {
-		$("#goodsCd").val('');
-		$("#goodsNm").val('');
-		$("#goodsNum").val('');
-		$("#supplyGoodsCd").val('');
-		$("#"+$("#searchForm select[name=keyWord]").val()).val($("#searchForm input[name=searchTxt]").val());
-		
 		if(!fnConditionCheck()) return;
-		
-		
+
+		$('#searchForm').find('input[name=stDate]').val($('#searchForm').find('input[name=stDate]').val().replaceAll('-',''));
+		$('#searchForm').find('input[name=edDate]').val($('#searchForm').find('input[name=edDate]').val().replaceAll('-',''));
+
 		// Fetch data
 		gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptions, '#searchForm');
 		$("#btnNew").click();
@@ -184,25 +182,25 @@
 	var fnConditionCheck = function(){
 		var form = document.searchForm;
 
-		var searchFlag = false;
-		var cnt = 0;
-
-		for (i = 0; i < form.elements.length; i++ ) {
-			var el = form.elements[i];
-
-			if ($(el).prop("type") == "text" || ($(el).prop("type") == "select-one" && el.name != "search" && el.name != "pageSize" && el.name != "keyWord")) {
-				if (!(el.value == null || el.value == "")) {
-					cnt++;
-				}
-			}
-		}
-		if(cnt > 0) searchFlag = true;
-
-		
-		if(searchFlag == false){
-			mcxDialog.alert("검색조건을 입력하세요.");
-			return false;
-		}
+		// var searchFlag = false;
+		// var cnt = 0;
+		//
+		// for (i = 0; i < form.elements.length; i++ ) {
+		// 	var el = form.elements[i];
+		//
+		// 	if ($(el).prop("type") == "text" || ($(el).prop("type") == "select-one" && el.name != "search" && el.name != "pageSize" && el.name != "keyWord")) {
+		// 		if (!(el.value == null || el.value == "")) {
+		// 			cnt++;
+		// 		}
+		// 	}
+		// }
+		// if(cnt > 0) searchFlag = true;
+		//
+		//
+		// if(searchFlag == false){
+		// 	mcxDialog.alert("검색조건을 입력하세요.");
+		// 	return false;
+		// }
 		
 		// 기간 값 체크
 		if (!fnCalendarDateValidation('#sellTerms', 'stDate', 'edDate')){
@@ -245,8 +243,8 @@
 			});
 			return;
 		}
-		var stDate = $('#detailForm input[name=dispStdt]').val();
-		var edDate = $('#detailForm input[name=dispEddt]').val();
+		var stDate = $('#detailForm input[name=dispStdt]').val().replaceAll('-','');
+		var edDate = $('#detailForm input[name=dispEddt]').val().replaceAll('-','');
 
 		if (stDate > edDate) {
 			mcxDialog.alert("기간 종료일자는 시작일자 보다 클 수 없습니다.");