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 /// public bool Status { get; set; } + [JsonIgnore] + public string WorkGridInfo { get; set; } + + [JsonIgnore] + public WorkGridInfo WorkGridInfoObj + { + get + { + if (WorkGridInfo.IsPresent()) + { + return WorkGridInfo.ToObject(); + } + + return null; + } + } + + public string WorkGridName + { + get + { + if (WorkGridInfoObj != null) + { + return WorkGridInfoObj?.WorkGrid?.WorkGridName; + } + + return string.Empty; + } + } + /// /// 是否是异常记录 /// @@ -69,20 +99,15 @@ public class WorkGridScheduleAttendancePageResponse { get { - if (WorkGridInfo.IsEmpty()) + if (NeedUpload || WorkGridInfo.IsEmpty()) { return false; } - var obj = WorkGridInfo.ToObject(); - return obj.IsError; + return WorkGridInfoObj.IsError; } } - [JsonIgnore] - public string WorkGridInfo { get; set; } - - /// /// 状态描述 /// 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; }