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 11:07:16 +08:00
parent 627cdd1445 4fdcbb3c02
commit ef64316c8f
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
OpenAuth.App/ServiceApp/InsTaskHallManager/InsTaskHallApp.cs
View File

@ -31,7 +31,7 @@ namespace OpenAuth.App.ServiceApp.InsTaskHallManager
/// <returns></returns>
public async Task<List<dynamic>> GetTaskList()
{
var query = await client.Queryable<InsTask>().Where(r => r.IsCompleted == false)
var query = await client.Queryable<InsTask>().Where(r => r.State!=2)
.LeftJoin<InsAishp>((r, p) => r.ShpId == p.Id)
.OrderByDescending(r=>r.CreateTime)
.Select<dynamic>((r, p) => new
@ -40,7 +40,7 @@ namespace OpenAuth.App.ServiceApp.InsTaskHallManager
r.TaskName,
r.State,
p.ShpCount,
CompleteCount = SqlFunc.Subqueryable<InsTaskgroup>().Where(a => a.TaskId == r.Id).Count() > 0 ? SqlFunc.Subqueryable<InsTaskgroup>().Where(a => a.TaskId == r.Id).Sum(r => (r.EndNum - r.BeginNum)+1) : 0
CompleteCount = SqlFunc.Subqueryable<InsTaskgroup>().Where(a => a.TaskId == r.Id&&a.ReciveUserId!=null).Count() > 0 ? SqlFunc.Subqueryable<InsTaskgroup>().Where(a => a.TaskId == r.Id && a.ReciveUserId != null).Sum(r => (r.EndNum - r.BeginNum)+1) : 0
}).ToListAsync();
return query;
@ -79,17 +79,17 @@ namespace OpenAuth.App.ServiceApp.InsTaskHallManager
public async Task<List<dynamic>> GetRankingList(string flag)
{
DateTime begindate = DateTime.Now;
if (flag == "week")
if (flag == "day")
{
DateTime today = DateTime.Today; // 获取今天的日期
int diff = today.DayOfWeek - DayOfWeek.Monday;
DateTime today = DateTime.Now; // 获取今天的日期
//int diff = today.DayOfWeek - DayOfWeek.Monday;
// 如果是星期天，DayOfWeek.Sunday 的值是 0，调整为 -6
if (diff < 0)
{
diff += 7;
}
begindate= today.AddDays(-diff);
//// 如果是星期天，DayOfWeek.Sunday 的值是 0，调整为 -6
//if (diff < 0)
//{
// diff += 7;
//}
begindate= today.Date;
}
if (flag == "month")
{
@ -242,7 +242,14 @@ namespace OpenAuth.App.ServiceApp.InsTaskHallManager
{
var task = await client.Queryable<InsTask>().Where(t => t.Id == taskGroup.TaskId).FirstAsync();
taskId = task.Id;
if(task != null)
//更新分组任务信息
await uwo.InsTaskgroup.UpdateSetColumnsTrueAsync(r => new InsTaskgroup
{
ReciveTime = DateTime.Now,
ReciveUserId = userId,
}, r => r.Id == taskGroup.Id);
if (task != null)
{
//查询并判断任务是否领完
var groups = await client.Queryable<InsTaskgroup>()
@ -259,12 +266,6 @@ namespace OpenAuth.App.ServiceApp.InsTaskHallManager
State = state
}, r => r.Id == task.Id);
}
//更新分组任务信息
await uwo.InsTaskgroup.UpdateSetColumnsTrueAsync(r => new InsTaskgroup
{
ReciveTime=DateTime.Now,
ReciveUserId=userId,
}, r => r.Id == taskGroup.Id);
}
else
{

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

@ -43,6 +43,7 @@ public class PersonTaskApp : SqlSugarBaseApp<InsTask, SugarDbContext>
var result = await Repository.AsQueryable()
.RightJoin<InsTaskgroup>((a, b) => a.Id == b.TaskId)
.Where((a, b) => userIds.Contains(b.ReciveUserId))
.WhereIF(!string.IsNullOrEmpty(req.key),(a,b)=>a.TaskName.Contains(req.key))
.Select((a, b) => new InsTaskExtend
{
RowNumber = SqlSugar.SqlFunc.RowNumber(b.Id),

2
OpenAuth.WebApi/Controllers/ServiceControllers/InsTaskHallController.cs
View File

@ -65,7 +65,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <summary>
/// 最佳牛马排行
/// </summary>
/// <param name="flag">标识（周榜：week，月榜：month，总榜：total）</param>
/// <param name="flag">标识（日榜：day，月榜：month，总榜：total）</param>
/// <returns></returns>
[HttpGet]
public async Task<Response<List<dynamic>>> GetRankingList(string flag)