From 7f4950090e9493c9dd034d52b62c02ca279273b0 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Mon, 28 Oct 2024 16:51:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=85=BC=E5=AE=B9=E8=80=81=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=BE=E5=A4=87=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Request/DeviceUploadLogUploadRequest.cs         |  2 ++
 .../Services/Implements/DeviceUploadLogService.cs   | 13 +++++++++++++
 2 files changed, 15 insertions(+)

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
     /// </summary>
     public string UserUniqueNo { get; set; }
 
+    public string CardNo { get; set; }
+
     /// <summary>
     /// 产生时间
     /// </summary>
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<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