fix 增加获取当前档案的下发记录
This commit is contained in:
@@ -109,4 +109,6 @@ public class GainfoDetailResponse
|
|||||||
/// 人脸base64
|
/// 人脸base64
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Face { get; set; }
|
public string Face { get; set; }
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -396,7 +396,10 @@ public class GainfoService : IGainfoService
|
|||||||
|
|
||||||
if (info != null)
|
if (info != null)
|
||||||
{
|
{
|
||||||
info.Face = await _dbContext.ChangeDb("face").Queryable<GainfoFaceEntity>().Where(x => x.UserCode == info.Code).Select(x => x.Face).SingleAsync();
|
if (request.WithFace)
|
||||||
|
{
|
||||||
|
info.Face = await _dbContext.ChangeDb("face").Queryable<GainfoFaceEntity>().Where(x => x.UserCode == info.Code).Select(x => x.Face).SingleAsync();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return info;
|
return info;
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
using Dlhis.Entity.Device.Entities;
|
using Dlhis.Entity.Device.Entities;
|
||||||
using Dlhis.ScheduledTask.TaskAssignment.Request;
|
using Dlhis.ScheduledTask.TaskAssignment.Request;
|
||||||
using Dlhis.ScheduledTask.TaskAssignment.Response;
|
using Dlhis.ScheduledTask.TaskAssignment.Response;
|
||||||
|
using Kurisu.AspNetCore.Utils.Extensions;
|
||||||
using Kurisu.Core.DataAccess.Dto;
|
using Kurisu.Core.DataAccess.Dto;
|
||||||
using Kurisu.SqlSugar.Extensions;
|
using Kurisu.SqlSugar.Extensions;
|
||||||
using Kurisu.SqlSugar.Services;
|
using Kurisu.SqlSugar.Services;
|
||||||
@@ -21,6 +22,7 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
|
|||||||
{
|
{
|
||||||
var page = await _dbContext.Queryable<DeviceTaskEntity>()
|
var page = await _dbContext.Queryable<DeviceTaskEntity>()
|
||||||
.LeftJoin<GainfoEntity>((deviceTask, ga) => deviceTask.UserNo == ga.No)
|
.LeftJoin<GainfoEntity>((deviceTask, ga) => deviceTask.UserNo == ga.No)
|
||||||
|
.WhereIF(!request.Search.IsEmpty(), deviceTask => deviceTask.UserNo == request.Search)
|
||||||
.Select((deviceTask, ga) => new DeviceTaskAssignmentResponse
|
.Select((deviceTask, ga) => new DeviceTaskAssignmentResponse
|
||||||
{
|
{
|
||||||
DeviceUniqueNo = deviceTask.DeviceUniqueNo,
|
DeviceUniqueNo = deviceTask.DeviceUniqueNo,
|
||||||
|
|||||||
Reference in New Issue
Block a user