fix model转换

This commit is contained in:
2025-04-03 11:43:11 +08:00
parent ef93e5bd66
commit 24f6f1f535
5 changed files with 54 additions and 36 deletions

View File

@@ -1,4 +1,4 @@
using Dlhis.Entity.Basic.Enums;
using Dlhis.Entity.Device.Models;
using Kurisu.AspNetCore.Utils.Extensions;
using Newtonsoft.Json;
@@ -103,12 +103,4 @@ public class WorkGridScheduleAttendancePageResponse
return "/";
}
}
}
public class WorkGridInfo
{
public bool IsError { get; set; }
public object WorkGrid { get; set; }
public WorkGridTimePeriodEnumType? PeriodType { get; set; }
public object TimeSetting { get; set; }
}

View File

@@ -313,7 +313,7 @@ public class WorkGridScheduleService : IWorkGridScheduleService
)
.Where(log => log.WorkGridInfo.StartsWith(filterString))
.Where((log, d) => d.Type == DeviceTypeEnumType.Attendance || (d.Type == DeviceTypeEnumType.Door && d.AsAttendance))
.OrderBy(log => log.RaiseDateTime)
.OrderBy(log => log.RaiseDateTime, OrderByType.Desc)
.Select((log, d, ga) => new WorkGridScheduleAttendancePageResponse
{
Id = log.Id,