다다익선- 종료일자, 업체브랜드 체크 수정

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

@@ -674,8 +674,8 @@ public class TsaMarketingController extends TsaBaseController {
 
 			moreBetter1.setEventStdt(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
 			moreBetter1.setEventEdHH(new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime()));
-			moreBetter1.setEventEdHH("23");
-			moreBetter1.setEventEdMM("59");
+			moreBetter1.setEventEdHH("24");
+			moreBetter1.setEventEdMM("00");
 			mav.addObject("tmtbMstInfo", moreBetter1);
 		}
 

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

@@ -61,12 +61,12 @@
 						<td>
 							<input type="hidden" name="tmtbStdt" id="tmtbStdt" required="required" data-valid-name="다다익선시작일시">
 							<input type="text" class="schDate w100" name="eventStdt" id="eventStdt" maxlength="10" th:value="${#calendars.format(#calendars.createNow(), 'yyyy-MM-dd')}"/>
-							<select name="eventStHH" data-valid-name="다다익선시작(시)" style="width: 65px;"> <!--th:disabled="${mode == 'U'}"-->
+							<select name="eventStHH" id="eventStHH" data-valid-name="다다익선시작(시)" style="width: 65px;"> <!--th:disabled="${mode == 'U'}"-->
 								<th:block th:each="num, index : ${#numbers.sequence(0,23)}">
 									<option  th:value="${#numbers.formatInteger(num,2)}" th:text="|${#numbers.formatInteger(num,2)}시|" th:selected="${tmtbMstInfo.eventStHH == #numbers.formatInteger(num,2)}">시간</option>
 								</th:block>
 							</select>
-							<select name="eventStMM" data-valid-name="다다익선시작(분)" style="width: 65px;">
+							<select name="eventStMM" id="eventStMM" data-valid-name="다다익선시작(분)" style="width: 65px;">
 								<th:block th:each="num, index : ${#numbers.sequence(0,59)}">
 									<option  th:value="${#numbers.formatInteger(num,2)}"  th:text="|${#numbers.formatInteger(num,2)}분|" th:selected="${tmtbMstInfo.eventStMM == #numbers.formatInteger(num,2)}">분</option>
 								</th:block>
@@ -76,12 +76,13 @@
 						<td>
 							<input type="hidden" name="tmtbEddt" id="tmtbEddt" required="required" data-valid-name="다다익선종료일시">
 							<input type="text" class="schDate w100" name="eventEddt" id="eventEddt" maxlength="10" th:value="${#calendars.format(#calendars.createNow(), 'yyyy-MM-dd')}"/>
-							<select name="eventEdHH" data-valid-name="다다익선종료(시)" style="width: 65px;">
+							<select name="eventEdHH" id="eventEdHH" data-valid-name="다다익선종료(시)" style="width: 65px;">
 								<th:block th:each="num, index : ${#numbers.sequence(0,23)}">
 									<option  th:value="${#numbers.formatInteger(num,2)}" th:text="|${#numbers.formatInteger(num,2)}시|" th:selected="${tmtbMstInfo.eventEdHH == #numbers.formatInteger(num,2)}">시간</option>
 								</th:block>
+								<option th:text="24시" th:value="24"></option>
 							</select>
-							<select name="eventEdMM" data-valid-name="다다익선종료(분)" style="width: 65px;">
+							<select name="eventEdMM" id="eventEdMM" data-valid-name="다다익선종료(분)" style="width: 65px;">
 								<th:block th:each="num, index : ${#numbers.sequence(0,59)}">
 									<option  th:value="${#numbers.formatInteger(num,2)}"  th:text="|${#numbers.formatInteger(num,2)}분|" th:selected="${tmtbMstInfo.eventEdMM == #numbers.formatInteger(num,2)}">분</option>
 								</th:block>
@@ -526,6 +527,15 @@
 			$("input:radio[name='dcWay']:radio[value="+tmtbMstInfo.dcWay+"]").prop('checked', true); // 선택하기
 			$("input:radio[name='multiYn']:radio[value="+tmtbMstInfo.multiYn+"]").prop('checked', true); // 선택하기
 
+			let edDtArr = tmtbMstInfo.tmtbEddt.split(" ");
+			if(edDtArr[1] == "23:59:59") {
+				edHour = "24";
+				edMinute = "00";
+				$('#moreBetterForm #eventEdHH option:last').show().prop("selected", true);
+				$("#moreBetterForm #eventEdMM option").hide();
+				$('#moreBetterForm #eventEdMM option:first').show().prop("selected", true);
+			}
+
 			if(tmtbMstInfo.tmtbStat == "G232_10"){
 				$("#btnMorebetterSave").show();		// 저장버튼
 				$("#btnChangeStatIng").show();		// 진행버튼
@@ -540,11 +550,27 @@
 		if(mode=="N"){
 			$("input:radio[name='disTmtbStat']:radio[value='G232_10']").prop('checked', true); // 선택하기
 			$("#btnMorebetterSave").show();	// 저장버튼
+
+			if(tmtbMstInfo.eventEdHH == "24"){
+				$("#moreBetterForm #eventEdHH option:last").show().prop("selected", true);
+				$("#moreBetterForm #eventEdMM option").hide();
+				$('#moreBetterForm #eventEdMM option:first').show().prop("selected", true);
+			}
 		}
 		//cfnCreateCalendar('#tmtbTerms', 'tmtbStdt', 'tmtbEddt', true, '행사기간', 'X');
 		cfnCreateCalendar('#tmtbTerms', 'eventStdt', 'eventEddt', true, '행사기간', 'X');
 	});
 
+	// 종료시간 클릭 시
+	$("#moreBetterForm #eventEdHH").bind('click change', function () {
+		if(this.value == 24) {
+			$("#moreBetterForm #eventEdMM option").hide();
+			$('#moreBetterForm #eventEdMM option:first').show().prop("selected", true);
+		} else {
+			$("#moreBetterForm #eventEdMM option").show();
+		}
+	});
+
 	var fnGoodsGbCheck = function (){
 		let applyGoodsData = gagaAgGrid.getAllRowData(gridOptionsFGApplyGoodsList);
 		var checkCnt = 0;
@@ -585,14 +611,18 @@
 			$('#moreBetterForm input[name=tmtbStdt]').focus();
 			return false;
 		}
+		var eventStDt = "";
+		var eventEdDt = "";
 
-		var eventStDt = $('#moreBetterForm input[name=eventStdt]').val()+$('#moreBetterForm select[name=eventStHH]').val()+$('#moreBetterForm select[name=eventStMM]').val()+'00';
-		var eventEdDt = $('#moreBetterForm input[name=eventEddt]').val()+$('#moreBetterForm select[name=eventEdHH]').val()+$('#moreBetterForm select[name=eventEdMM]').val()+'59';
+		eventStDt = $('#moreBetterForm input[name=eventStdt]').val()+$('#moreBetterForm select[name=eventStHH]').val()+$('#moreBetterForm select[name=eventStMM]').val()+'00';
+		if($('#moreBetterForm select[name=eventEdHH]').val() == "24"){
+			eventEdDt = $('#moreBetterForm input[name=eventEddt]').val()+'235959';
+		}else{
+			eventEdDt = $('#moreBetterForm input[name=eventEddt]').val()+$('#moreBetterForm select[name=eventEdHH]').val()+$('#moreBetterForm select[name=eventEdMM]').val()+'00';
+		}
 
 		eventStDt = eventStDt.replace(/[^0-9]/g, '');
 		eventEdDt = eventEdDt.replace(/[^0-9]/g, '');
-		console.log('2.eventStDt>>'+eventStDt);
-		console.log('3.eventEdDt>>'+eventEdDt);
 
 		let fromDate = $('#moreBetterForm input[name=tmtbStdt]').val(eventStDt);
 		let toDate = $('#moreBetterForm input[name=tmtbEddt]').val(eventEdDt);
@@ -611,19 +641,6 @@
 		let allApplyBurdenData = gagaAgGrid.getAllRowData(gridOptionsApplyBurdenList);
 		let allSectionGbData = gagaAgGrid.getAllRowData(gridOptionsSectionGbList);
 
-		if(allSupplyCompData.length > 0){
-			if(allBrandData.length < 1){
-				mcxDialog.alert('브랜드를 추가해주세요.');
-				return;
-			}
-		}
-		if(allBrandData.length > 0){
-			if(allSupplyCompData.length < 1){
-				mcxDialog.alert('공급업체를 추가해주세요.');
-				return;
-			}
-		}
-
 		if(allSectionGbData.length < 1){
 			mcxDialog.alert("할인구간을 설정해주세요.");
 			return false;
@@ -681,7 +698,7 @@
 
 		var jsonData = JSON.stringify(data);
 
-		gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, fnMorebetterSaveCollback);
+		//gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, fnMorebetterSaveCollback);
 	});
 
 	var fnMorebetterSaveCollback = function(result){