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; } + + + /// + /// 状态描述 + /// + 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; } + + /// + /// 状态描述 + /// + 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; } + + /// + /// 状态描述 + /// + public string ResultDescription + { + get + { + if (IsError) + { + return Sync ? "已上传" : "/"; + } + + if (NeedUpload) + { + return Sync ? "已上传" : "待上传"; + } + + return "/"; + } + } } \ No newline at end of file