yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 增加获取当前档案的下发记录

Browse Source
This commit is contained in:
cheche
2024-02-28 12:13:25 +08:00
parent 09165983cc
commit e3d6f72243
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs
View File

@@ -109,4 +109,6 @@ public class GainfoDetailResponse
/// 人脸base64
/// </summary>
public string Face { get; set; }
}

5
Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
View File

@@ -396,7 +396,10 @@ public class GainfoService : IGainfoService
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;

2
Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
View File

@@ -2,6 +2,7 @@
using Dlhis.Entity.Device.Entities;
using Dlhis.ScheduledTask.TaskAssignment.Request;
using Dlhis.ScheduledTask.TaskAssignment.Response;
using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.DataAccess.Dto;
using Kurisu.SqlSugar.Extensions;
using Kurisu.SqlSugar.Services;
@@ -21,6 +22,7 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
{
var page = await _dbContext.Queryable<DeviceTaskEntity>()
.LeftJoin<GainfoEntity>((deviceTask, ga) => deviceTask.UserNo == ga.No)
.WhereIF(!request.Search.IsEmpty(), deviceTask => deviceTask.UserNo == request.Search)
.Select((deviceTask, ga) => new DeviceTaskAssignmentResponse
{
DeviceUniqueNo = deviceTask.DeviceUniqueNo,