From 01d22a2056deff272429486fb0c3b644df3c7f1a Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Mon, 17 Mar 2025 14:32:54 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkGridScheduleAttendancePageResponse.cs | 22 ++++++++++
 .../Response/DeviceUploadLogResponse.cs       | 42 +++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/Src/Dlhis.Basic/WorkGrids/Response/WorkGridScheduleAttendancePageResponse.cs b/Src/Dlhis.Basic/WorkGrids/Response/WorkGridScheduleAttendancePageResponse.cs
index 9a726bc5..561afdde 100644
--- a/Src/Dlhis.Basic/WorkGrids/Response/WorkGridScheduleAttendancePageResponse.cs
+++ b/Src/Dlhis.Basic/WorkGrids/Response/WorkGridScheduleAttendancePageResponse.cs
@@ -81,6 +81,28 @@ public class WorkGridScheduleAttendancePageResponse
 
     [JsonIgnore]
     public string WorkGridInfo { get; set; }
+    
+    
+    /// <summary>
+    /// 状态描述
+    /// </summary>
+    public string ResultDescription
+    {
+        get
+        {
+            if (IsError)
+            {
+                return Sync ? "已上传" : "/";
+            }
+
+            if (NeedUpload)
+            {
+                return Sync ? "已上传" : "待上传";
+            }
+
+            return "/";
+        }
+    }
 }
 
 public class WorkGridInfo
diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs
index 63fdb1f1..ccb232dc 100644
--- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs
+++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs
@@ -97,6 +97,27 @@ public class DeviceUploadLogResponse
 
     [JsonIgnore]
     public string WorkGridInfo { get; set; }
+
+    /// <summary>
+    /// 状态描述
+    /// </summary>
+    public string ResultDescription
+    {
+        get
+        {
+            if (IsError)
+            {
+                return Sync ? "已上传" : "/";
+            }
+
+            if (NeedUpload)
+            {
+                return Sync ? "已上传" : "待上传";
+            }
+
+            return "/";
+        }
+    }
 }
 
 public class WorkGridInfo2
@@ -187,4 +208,25 @@ public class DeviceUploadLogUserResponse
 
     [JsonIgnore]
     public string WorkGridInfo { get; set; }
+    
+    /// <summary>
+    /// 状态描述
+    /// </summary>
+    public string ResultDescription
+    {
+        get
+        {
+            if (IsError)
+            {
+                return Sync ? "已上传" : "/";
+            }
+
+            if (NeedUpload)
+            {
+                return Sync ? "已上传" : "待上传";
+            }
+
+            return "/";
+        }
+    }
 }
\ No newline at end of file