From 7be83034022d9f3b12b198a3ed820bdd7e0900ad Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 25 十二月 2023 18:33:41 +0800
Subject: [PATCH] 模具清单查看履历接口修改
---
VueWebCoreApi/Controllers/ImportExcelController.cs | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/VueWebCoreApi/Controllers/ImportExcelController.cs b/VueWebCoreApi/Controllers/ImportExcelController.cs
index 3d67241..e2ef326 100644
--- a/VueWebCoreApi/Controllers/ImportExcelController.cs
+++ b/VueWebCoreApi/Controllers/ImportExcelController.cs
@@ -84,12 +84,12 @@
list.json2 = list.json2;
return Json(list);
}
- //list.json3 = ExcelCheckData(myModel); //鏁版嵁楠岃瘉
- //if (list.json3.code == "300")
- //{
- // list.json3 = list.json3;
- // return Json(list);
- //}
+ list.json3 = ExcelImportSubmit(dataTable, FileCode); //鏁版嵁瀵煎叆
+ if (list.json3.code == "300")
+ {
+ list.json3 = list.json3;
+ return Json(list);
+ }
return Json(list);
}
#endregion
@@ -119,7 +119,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
}
return mes;
}
@@ -145,7 +145,7 @@
List<DataTable> dataTable = myModel.TableData;
list = ExcelCheckBLL.ExcelCheckData(FileCode, dataTable, out StuCode, out message, out count);
mes.code = StuCode;
- mes.Message = message;
+ mes.message = message;
mes.count = count;
mes.data = list;
return mes;
@@ -167,7 +167,8 @@
ToMessage mes = new ToMessage();
try
{
- var token = HttpContext.Request.Headers["Token"].ToString();
+ //var token = HttpContext.Request.Headers["Token"].ToString();
+ var token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyY29kZSI6Ijk5OSIsInVzZXJuYW1lIjoi5rWL6K-V6LSm5Y-3Iiwic3RvcmdfY29kZSI6IlNDQjAxXzEiLCJzdG9yZ19uYW1lIjoi55Sf5Lqn5LiA6YOoIiwiaXNfc3lzdGVtX2FkbWluIjoiTiIsInJvbGVfY29kZSI6IlIyMzA4MjMwMiw5OTk5Iiwicm9sZV9kYXRhcGVybWlzc2lvbnMiOiIiLCJ1c2VydHlwZSI6IlBDIiwicmVkaXNrZXkiOiJOZXdNRVNMb2dpblVzZXJJRFBDOTk5IiwidGltZW91dCI6IjIwMjMtMTItMTVUMTc6MTg6MjEuMTQyMjc1MiswODowMCJ9.IPaJpspiHjk4Qh9keXNy8lJl1Scj87EnnksKd8Hnj8o";
User us = JwtTools.Denocode(token.ToString());
mes = ExcelCheckBLL.ExcelImportSubmit(FileCode, dataTable, us);
if (mes.code == "300")
@@ -179,7 +180,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
}
return mes;
}
--
Gitblit v1.9.3