fix 兼容老系统设备记录

This commit is contained in:
2024-10-28 16:51:15 +08:00
parent 043221c9ea
commit 7f4950090e
2 changed files with 15 additions and 0 deletions

View File

@@ -15,6 +15,8 @@ public class DeviceUploadLogUploadRequest
/// </summary>
public string UserUniqueNo { get; set; }
public string CardNo { get; set; }
/// <summary>
/// 产生时间
/// </summary>

View File

@@ -134,6 +134,19 @@ public class DeviceUploadLogService : IDeviceUploadLogService
continue;
}
if (request.CardNo.IsPresent() && request.UserUniqueNo != request.CardNo)
{
//UserUniqueNo为老系统档案号(自动生成),CardNo为工号
if (await _dbContext.Queryable<OldDeviceGainfoEntity>()
.Where(x => x.DeviceUniqueNo == request.DeviceUniqueNo)
.Where(x => x.No == request.UserUniqueNo && x.Code == request.CardNo)
.Select(x => x.Code)
.AnyAsync())
{
request.UserUniqueNo = request.CardNo;
}
}
var device = devices.First(x => x.UniqueNo == request.DeviceUniqueNo);
inserts.Add(new DeviceUploadLogEntity