wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:0cce7c65274b83d263f895078daf7122864a855d
Branches Tags
wyw:master
..
compare: wyw:7989dbd0f6aa05fdc16d777b9e0a602da93b14ac
Branches Tags
wyw:master

2 Commits
0cce7c6527 ... 7989dbd0f6

Author SHA1 Message Date
何美荣
7989dbd0f6 Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe 2025-11-23 22:02:48 +08:00
何美荣
ce9729c176 检查清单导入 2025-11-23 22:02:43 +08:00
1 changed files with 17 additions and 10 deletions
Show Stats Expand all files Collapse all files

27
APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs
View File

@ -499,7 +499,7 @@ namespace APT.SK.WebApi.Controllers.Api
var dataTables = FileUtils.ReadExcelByOledb(filePath, startRowIndexs); var dataTables = FileUtils.ReadExcelByOledb(filePath, startRowIndexs);
string Msg = string.Empty; string Msg = string.Empty;
bool isOK = InsertModel2(dataTables.Tables[0], orgId, ref Msg); bool isOK = InsertModel5(dataTables.Tables[0], orgId, ref Msg);
try try
{ {
@ -1872,16 +1872,23 @@ namespace APT.SK.WebApi.Controllers.Api
} }
} }
} }
UnifiedCommit(() => if (!string.IsNullOrEmpty(Msg))
{
throw new Exception(Msg);
}
else
{ {
if (setLists != null && setLists.Any()) UnifiedCommit(() =>
BantchAddEntityNoCommit(setLists); {
if (setContentLists != null && setContentLists.Any()) if (setLists != null && setLists.Any())
BantchAddEntityNoCommit(setContentLists); BantchAddEntityNoCommit(setLists);
if (setUserLists != null && setUserLists.Any()) if (setContentLists != null && setContentLists.Any())
BantchAddEntityNoCommit(setUserLists); BantchAddEntityNoCommit(setContentLists);
}); if (setUserLists != null && setUserLists.Any())
Msg = "导入成功！"; BantchAddEntityNoCommit(setUserLists);
});
Msg = "导入成功！";
}
return true; return true;
} }
} }