HC_YFZX
/
Infrastructure
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Insight' of http://123.132.248.154:10000/HC_YFZX/Infrastructure into Insight

Insight
continue 2024-11-21 14:42:38 +08:00
parent a47d0b8ffe d273395a58
commit d66347c2ec
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenAuth.App/ServiceApp/AdminTaskManageApp.cs
View File

@ -170,7 +170,7 @@ namespace OpenAuth.App.ServiceApp
RefAsync<int> totalCount = 0; RefAsync<int> totalCount = 0;
var tsakList = await db.InsTask.AsQueryable() var tsakList = await db.InsTask.AsQueryable()
.LeftJoin<InsAishp>((a, b) => a.ShpId == b.Id) .LeftJoin<InsAishp>((a, b) => a.ShpId == b.Id)
.WhereIF(!string.IsNullOrEmpty(taskName), r => r.TaskName.Contains(taskName)) .WhereIF(!string.IsNullOrEmpty(taskName), (a,b) => a.TaskName.Contains(taskName))
.Select((a, b) => new InsTaskForAdminResp() .Select((a, b) => new InsTaskForAdminResp()
{ {
Id = a.Id.SelectAll(), Id = a.Id.SelectAll(),
@ -180,7 +180,7 @@ namespace OpenAuth.App.ServiceApp
), ),
NoReceiveShpCount = SqlFunc.Subqueryable<InsTaskgroup>().Where(r => r.TaskId == a.Id && string.IsNullOrEmpty(r.ReciveUserId)).Sum(r => NoReceiveShpCount = SqlFunc.Subqueryable<InsTaskgroup>().Where(r => r.TaskId == a.Id && string.IsNullOrEmpty(r.ReciveUserId)).Sum(r =>
(r.EndNum - r.BeginNum + 1)), (r.EndNum - r.BeginNum + 1)),
}).ToPageListAsync(page, limit, totalCount); }).OrderByDescending((a)=>a.CreateTime).ToPageListAsync(page, limit, totalCount);
return new Response<PageInfo<List<InsTaskForAdminResp>>> return new Response<PageInfo<List<InsTaskForAdminResp>>>
{ {

1
OpenAuth.App/ServiceApp/Task/PersonTaskApp.cs
View File

@ -44,6 +44,7 @@ public class PersonTaskApp : SqlSugarBaseApp<InsTask, SugarDbContext>
.RightJoin<InsTaskgroup>((a, b) => a.Id == b.TaskId) .RightJoin<InsTaskgroup>((a, b) => a.Id == b.TaskId)
.Where((a, b) => userIds.Contains(b.ReciveUserId)) .Where((a, b) => userIds.Contains(b.ReciveUserId))
.WhereIF(!string.IsNullOrEmpty(req.key),(a,b)=>a.TaskName.Contains(req.key)) .WhereIF(!string.IsNullOrEmpty(req.key),(a,b)=>a.TaskName.Contains(req.key))
.OrderBy((a,b)=> b.CreateTime,OrderByType.Desc)
.Select((a, b) => new InsTaskExtend .Select((a, b) => new InsTaskExtend
{ {
RowNumber = SqlSugar.SqlFunc.RowNumber(b.Id), RowNumber = SqlSugar.SqlFunc.RowNumber(b.Id),