diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Controllers/DeviceUploadLogsController.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Controllers/DeviceUploadLogsController.cs index f9dda4f0..eb60af5b 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Controllers/DeviceUploadLogsController.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Controllers/DeviceUploadLogsController.cs @@ -34,7 +34,7 @@ public class DeviceUploadLogsController : ControllerBase public async Task> GetPageAsync([FromQuery] DeviceUploadLogPageRequest request) { return await _deviceUploadLogService.GetPageAsync(request); - } + } /// /// 批量上传记录 diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs index 423d4c93..61c2ffae 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs @@ -17,8 +17,9 @@ public class DeviceUploadLogResponse public string OutsourceSupplier { get; set; } public string SapUserCode { get; set; } + public string SapUserName { get; set; } - + /// /// 设备部署点 @@ -65,6 +66,11 @@ public class DeviceUploadLogResponse /// public bool Sync { get; set; } + /// + /// 是否需要上传 + /// + public bool NeedUpload { get; set; } + /// /// 是否有效 /// diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs index 6421b77f..dd57d4dd 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs @@ -268,6 +268,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService UserCode = ga.Code, UserName = ga.Name, DeployPlace = device.DeployPlace, + NeedUpload = x.NeedUpload, Sync = x.Sync, Status = x.Status, }).ToPageListAsync(request.PageIndex, request.PageSize);