From 5e0c46d02739fde41c7ab70f9f7b8d47e2bf640b Mon Sep 17 00:00:00 2001
From: dev02 <dev02@yourteam.tw>
Date: Wed, 26 Jul 2023 16:52:26 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E4=BF=AE=E6=94=B9router?=
 =?UTF-8?q?=20method=20[=E5=89=8D=E7=AB=AF]=20=E4=BF=AE=E6=94=B9=E9=81=8B?=
 =?UTF-8?q?=E7=B6=AD=E5=89=8D=E7=AB=AF=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/_operation.html                       | 18 +++++++++---------
 .../ApiControllers/UtilityController.cs        |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Frontend/_operation.html b/Frontend/_operation.html
index 3389a83..c605d4f 100644
--- a/Frontend/_operation.html
+++ b/Frontend/_operation.html
@@ -861,7 +861,6 @@
 		}
 
 		opeRecTable = new YourTeam.JqDataTables.getTableByAjax(ajaxObj, tag, null, columns, column_defs);
-		$(tag).DataTable().order([10, 'desc']);
 	}
 
 	function setType(wt) {
@@ -894,23 +893,23 @@
 			let ytd = displayDate(new Date(new Date().setDate(new Date().getDate() - 1)), 'date').replaceAll('/', '-')
 
 			if (dateType == 'tdy') {
-				pageAct.startdate = displayDate(new Date(new Date().setDate(new Date().getDate() + 1)), 'datetime');
-				pageAct.enddate = new Date(displayDate(new Date(new Date().setDate(new Date().getDate() + 2)), 'date'));
+				pageAct.startdate = displayDate(new Date(new Date().setDate(new Date().getDate())), 'datetime').toString().replaceAll("/", "-").split(" ")[0] + "T00:00:00";
+				pageAct.enddate = displayDate(new Date(new Date().setDate(new Date().getDate())), 'datetime').toString().replaceAll("/", "-").split(" ")[0] + "T23:59:59";
 				$('#startdate').val(today);
 				$('#startdate').data('val', today);
 				$('#enddate').val(today);
 				$('#enddate').data('val', today);
 			}
 			else if (dateType == 'ytd') {
-				pageAct.startdate = new Date(displayDate(new Date(new Date().setDate(new Date().getDate())), 'date'));
-				pageAct.enddate = new Date(displayDate(new Date(new Date().setDate(new Date().getDate() + 1)), 'date'));
+				pageAct.startdate = displayDate(new Date(new Date().setDate(new Date().getDate() - 1)), 'datetime').toString().replaceAll("/", "-").split(" ")[0] + "T00:00:00";
+				pageAct.enddate = displayDate(new Date(new Date().setDate(new Date().getDate() - 1)), 'datetime').toString().replaceAll("/", "-").split(" ")[0] + "T23:59:59";
 				$('#startdate').val(ytd);
 				$('#startdate').data('val', ytd);
 				$('#enddate').val(ytd);
 				$('#enddate').data('val', ytd);
 			}
 			else {
-				pageAct.enddate = new Date(displayDate(new Date(pageAct.enddate.valueOf()).setDate(pageAct.enddate.getDate() + 2), 'date'));
+				pageAct.enddate = displayDate(new Date(pageAct.enddate.valueOf()).setDate(pageAct.enddate.getDate()), 'date').toString().replaceAll("/", "-") + "T23:59:59";
 				$(`[onclick^=setDate]`).removeClass('btn-info');
 				$(`[onclick^=setDate]`).addClass('btn-secondary');
 				if ($('#startdate').val() == $('#enddate').val()) {
@@ -1005,14 +1004,15 @@
 	}
 
 	function exportExcel(e) {
-		
+		console.log("export", e)
 		let url = baseApiUrl + "/operation/OpeExportExcel";
+
 		objSendData.Data = {
 			work_type: pageAct.work_type,
 			startdate: pageAct.startdate == undefined ? null : pageAct.startdate,
 			enddate: pageAct.enddate == undefined ? null : pageAct.enddate,
 		};
-		
+		console.log("data", objSendData.Data)
 		ytAjax = new YourTeam.Ajax(url, objSendData, function (rel) {
 			if (rel.code == "0000")
 				location.href = baseApiUrl + "/api/df?path=" + rel.data.split('/')[0] + "&fileName=" + rel.data.split('/')[1] + "&token=" + cookies.get("JWT-Authorization");
@@ -1504,7 +1504,7 @@
 
 		$.each(res.data, function (i, v) {
 			msg = v.msgText != null ? ($.trim(v.msgText.toString()).length > 0 ? v.msgText.split(':')[0] : '') : '';
-            strHtml += `<option value=${v.uuid}>${v.uuid.split("-")[0]}</option>`;
+			strHtml += `<option value=${v.uuid}>${v.uuid.split("-")[0]}</option>`;
 		});
 		if (res.count > 0)
 			$(pageAct.work_type == '1' ? '#inpErrCode' : '#inpErrCode_2').html(strHtml);
diff --git a/FrontendWebApi/ApiControllers/UtilityController.cs b/FrontendWebApi/ApiControllers/UtilityController.cs
index 4eb46d2..f057de4 100644
--- a/FrontendWebApi/ApiControllers/UtilityController.cs
+++ b/FrontendWebApi/ApiControllers/UtilityController.cs
@@ -156,6 +156,7 @@ namespace FrontendWebApi.ApiControllers
             return apiResult;
         }
 
+        [HttpPost]
         public async Task<ActionResult<ApiResult<bool>>> isShowBuilding()
         {
             ApiResult<bool> apiResult = new ApiResult<bool>(jwt_str);