feat 增加任务类型获取
This commit is contained in:
@@ -40,6 +40,7 @@ public class AssignmentService : IAssignmentService
|
||||
.LeftJoin<DepartmentEntity>((deviceTask, deivce, deivceTamplate, ga, department) => department.No == ga.DepartmentNo)
|
||||
.WhereIF(request.Brand.IsPresent(), (deviceTask, deivce, deivceTamplate) => deivceTamplate.Brand == request.Brand)
|
||||
.WhereIF(request.DeviceUniqueNo.IsPresent(), (deviceTask, deivce) => deviceTask.DeviceUniqueNo == request.DeviceUniqueNo)
|
||||
.WhereIF(request.Types.IsPresent(), deviceTask => request.Types.Contains(deviceTask.Type))
|
||||
.WhereIF(!request.IsProcess, deviceTask => deviceTask.Status == DeviceTaskStatusEnumType.Wait)
|
||||
.WhereIF(request.IsProcess, deviceTask => deviceTask.Status == DeviceTaskStatusEnumType.Process)
|
||||
.OrderBy(deviceTask => deviceTask.CreateTime)
|
||||
@@ -98,6 +99,7 @@ public class AssignmentService : IAssignmentService
|
||||
}
|
||||
|
||||
return page.Data;
|
||||
|
||||
}, 5);
|
||||
|
||||
if (!data.Any())
|
||||
@@ -354,7 +356,7 @@ public class AssignmentService : IAssignmentService
|
||||
}
|
||||
catch (Exception ex) when (ex is VersionExceptions)
|
||||
{
|
||||
_logger.LogWarning(ex, ex.Message);
|
||||
_logger.LogWarning(ex, "并发更新失败:{message},", ex.Message);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user