lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-09-21 02:57:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

同步openauth.Core：

Browse Source 
采用代码生成器的表结构控制前端显示，删除以前按照dbset获取数据库结构
优化注释
升级EF及所有三方的版本
This commit is contained in:
yubaolee
2021-10-18 00:42:29 +08:00
parent 3a70bf8e43
commit 9fd0405721
60 changed files with 371 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenAuth.App/FlowInstance/FlowInstanceApp.cs
View File

@@ -27,6 +27,7 @@ using System.Net.Http;
using System.Threading.Tasks;
using Infrastructure.Const;
using Infrastructure.Helpers;
using Microsoft.EntityFrameworkCore;
using OpenAuth.Repository;
namespace OpenAuth.App
@@ -632,9 +633,9 @@ namespace OpenAuth.App
waitExp = waitExp.And(t => t.CustomName.Contains(request.key));
}
result.count = UnitWork.Find(waitExp).Count();
result.count = await UnitWork.Find(waitExp).CountAsync();
result.data = UnitWork.Find(request.page, request.limit, "CreateDate descending", waitExp).ToList();
result.data =await UnitWork.Find(request.page, request.limit, "CreateDate descending", waitExp).ToListAsync();
}
else if (request.type == "disposed") //已办事项（即我参与过的流程）
{
@@ -650,10 +651,10 @@ namespace OpenAuth.App
query = query.Where(t => t.CustomName.Contains(request.key));
}
result.data = query.OrderByDescending(u => u.CreateDate)
result.data = await query.OrderByDescending(u => u.CreateDate)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToList();
result.count = instances.Count();
.Take(request.limit).ToListAsync();
result.count =await instances.CountAsync();
}
else //我的流程
{
@@ -665,9 +666,9 @@ namespace OpenAuth.App
myFlowExp = myFlowExp.And(t => t.CustomName.Contains(request.key));
}
result.count = UnitWork.Find(myFlowExp).Count();
result.data = UnitWork.Find(request.page, request.limit,
"CreateDate descending", myFlowExp).ToList();
result.count =await UnitWork.Find(myFlowExp).CountAsync();
result.data = await UnitWork.Find(request.page, request.limit,
"CreateDate descending", myFlowExp).ToListAsync();
}
return result;