Compare commits

..

No commits in common. "4b45940efb7088746ed72c04fbaeb70503e01cef" and "12f43f0d84c7dacd2041b1daa4a76ca960ffdaf0" have entirely different histories.

2 changed files with 1 additions and 15 deletions

View File

@ -45,13 +45,11 @@ public class PersonTaskApp : SqlSugarBaseApp<InsTask, SugarDbContext>
.Where((a, b) => userIds.Contains(b.ReciveUserId))
.Select((a, b) => new InsTaskExtend
{
RowNumber = SqlSugar.SqlFunc.RowNumber(b.Id),
TaskName = a.TaskName, // 任务名称
GroupName = b.GroupName, // 任务分组包
Sort = b.Sort, // 序号
BeginNum = b.BeginNum,
EndNum = b.EndNum,
TubanNum = b.EndNum - b.BeginNum + 1,
TaskId = b.TaskId,
CreateTime = a.CreateTime, // 创建时间
ReciveTime = b.ReciveTime, // 接收时间
@ -80,17 +78,14 @@ public class PersonTaskApp : SqlSugarBaseApp<InsTask, SugarDbContext>
{
var result = await Repository.AsQueryable()
.RightJoin<InsTaskgroup>((a, b) => a.Id == b.TaskId)
.InnerJoin<InsAishp>((a, b, c) => a.ShpId == c.Id)
.Where((a, b) => b.Id == taskGroupId)
.Select((a, b,c) => new InsTaskExtend
.Select((a, b) => new InsTaskExtend
{
TaskName = a.TaskName, // 任务名称
GroupName = b.GroupName, // 任务分组包
Sort = b.Sort, // 序号
BeginNum = b.BeginNum,
ShpName = c.ShpName,
EndNum = b.EndNum,
TubanNum = b.EndNum - b.BeginNum + 1,
TaskId = b.TaskId,
CreateTime = a.CreateTime, // 创建时间
ReciveTime = b.ReciveTime, // 接收时间

View File

@ -42,17 +42,8 @@ public class InsTaskExtend : InsTaskgroup
/// </summary>
/// <returns></returns>
public List<string> PrePhaseList { get; set; }
/// <summary>
/// 后时相
/// </summary>
public List<string> NextPhaseList { get; set; }
public int TubanNum { get; set; }
public int RowNumber { get; set; }
/// <summary>
/// aishp名称
/// </summary>
public string ShpName { get; set; }
}