From 7839cb076bc99f691c0d245daf53516e0d1e6429 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 04 十一月 2022 15:42:10 +0800
Subject: [PATCH] 设备清单导入接口修改、模板更改
---
VueWebApi/Tools/ImportExcelData.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/VueWebApi/Tools/ImportExcelData.cs b/VueWebApi/Tools/ImportExcelData.cs
index 45eb380..d1a7322 100644
--- a/VueWebApi/Tools/ImportExcelData.cs
+++ b/VueWebApi/Tools/ImportExcelData.cs
@@ -1756,7 +1756,7 @@
code = "300";
Message = "鐗╂枡娓呭崟妯℃澘(姣嶄欢淇℃伅)涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
}
- else if (excelTable[1].Columns.Count != 9)
+ else if (excelTable[1].Columns.Count != 10)
{
code = "300";
Message = "鐗╂枡娓呭崟妯℃澘(瀛愪欢淇℃伅)涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
@@ -2313,19 +2313,19 @@
}
}
//杞﹂棿鍒ゆ柇
- for (int m = 0; m < excelTable[1].Rows.Count; m++)
+ for (int m = 0; m < excelTable[2].Rows.Count; m++)
{
- if (excelTable[1].Rows[m][6].ToString().Trim() != null && excelTable[1].Rows[m][6].ToString().Trim() != "")
+ if (excelTable[2].Rows[m][6].ToString().Trim() != null && excelTable[2].Rows[m][6].ToString().Trim() != "")
{
sql = @"select * from TOrganization where org_name=@code and description='W'";
- dynamicParams.Add("@code", excelTable[1].Rows[m][6].ToString().Trim());
+ dynamicParams.Add("@code", excelTable[2].Rows[m][6].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt.Rows.Count<=0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{鐢熶骇杞﹂棿}";
- erro.ErrorCont = "璁惧琛�:{鐢熶骇杞﹂棿}瀛楁" + excelTable[1].Rows[m][6].ToString().Trim() + "涓嶅瓨鍦�";
+ erro.ErrorCont = "璁惧琛�:{鐢熶骇杞﹂棿}瀛楁" + excelTable[2].Rows[m][6].ToString().Trim() + "涓嶅瓨鍦�";
list.Add(erro);
}
}
@@ -2345,7 +2345,7 @@
{
StuCode = "200";
message = "鏁版嵁楠岃瘉鎴愬姛";
- count = excelTable[0].Rows.Count + excelTable[1].Rows.Count;
+ count = excelTable[0].Rows.Count + excelTable[1].Rows.Count+excelTable[2].Rows.Count;
}
return list;
}
--
Gitblit v1.9.3