diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogUploadRequest.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogUploadRequest.cs index e5e260a8..d1fbf654 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogUploadRequest.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogUploadRequest.cs @@ -15,6 +15,8 @@ public class DeviceUploadLogUploadRequest /// public string UserUniqueNo { get; set; } + public string CardNo { get; set; } + /// /// 产生时间 /// diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs index 0f8e7d27..ffa3c824 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs @@ -134,6 +134,19 @@ public class DeviceUploadLogService : IDeviceUploadLogService continue; } + if (request.CardNo.IsPresent() && request.UserUniqueNo != request.CardNo) + { + //UserUniqueNo为老系统档案号(自动生成),CardNo为工号 + if (await _dbContext.Queryable() + .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