From fbbadec3388392fb082ad5ab8d60d8452f0108e6 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 3 Apr 2025 14:34:50 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkGridScheduleAttendancePageResponse.cs | 39 +++++++++++++++----
 .../Response/DeviceUploadLogResponse.cs       | 13 -------
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/Src/Dlhis.Basic/WorkGrids/Response/WorkGridScheduleAttendancePageResponse.cs b/Src/Dlhis.Basic/WorkGrids/Response/WorkGridScheduleAttendancePageResponse.cs
index dedfcd35..a89311df 100644
--- a/Src/Dlhis.Basic/WorkGrids/Response/WorkGridScheduleAttendancePageResponse.cs
+++ b/Src/Dlhis.Basic/WorkGrids/Response/WorkGridScheduleAttendancePageResponse.cs
@@ -62,6 +62,36 @@ public class WorkGridScheduleAttendancePageResponse
     /// </summary>
     public bool Status { get; set; }
 
+    [JsonIgnore]
+    public string WorkGridInfo { get; set; }
+    
+    [JsonIgnore]
+    public WorkGridInfo WorkGridInfoObj
+    {
+        get
+        {
+            if (WorkGridInfo.IsPresent())
+            {
+                return WorkGridInfo.ToObject<WorkGridInfo>();
+            }
+
+            return null;
+        }
+    }
+    
+    public string WorkGridName
+    {
+        get
+        {
+            if (WorkGridInfoObj != null)
+            {
+                return WorkGridInfoObj?.WorkGrid?.WorkGridName;
+            }
+
+            return string.Empty;
+        }
+    }
+
     /// <summary>
     /// 是否是异常记录
     /// </summary>
@@ -69,20 +99,15 @@ public class WorkGridScheduleAttendancePageResponse
     {
         get
         {
-            if (WorkGridInfo.IsEmpty())
+            if (NeedUpload || WorkGridInfo.IsEmpty())
             {
                 return false;
             }
 
-            var obj = WorkGridInfo.ToObject<WorkGridInfo>();
-            return obj.IsError;
+            return WorkGridInfoObj.IsError;
         }
     }
 
-    [JsonIgnore]
-    public string WorkGridInfo { get; set; }
-    
-    
     /// <summary>
     /// 状态描述
     /// </summary>
diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs
index bd5b772c..201cad78 100644
--- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs
+++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs
@@ -201,19 +201,6 @@ public class DeviceUploadLogUserResponse
         }
     }
 
-    public string WorkGridName
-    {
-        get
-        {
-            if (WorkGridInfoObj != null)
-            {
-                return WorkGridInfoObj?.WorkGrid?.WorkGridName;
-            }
-
-            return string.Empty;
-        }
-    }
-
     [JsonIgnore]
     public string WorkGridInfo { get; set; }