fix 调整时段码结构

This commit is contained in:
2024-07-19 16:10:38 +08:00
parent b4459edfc4
commit 5733a3907f
4 changed files with 7 additions and 17 deletions

View File

@@ -1,11 +0,0 @@
namespace Dlhis.Basic.Device.Dtos;
public class DeviceTimePeriodDto
{
public int CardType { get; set; }
public TimeOnly OnStart { get; set; }
public TimeOnly OnEnd { get; set; }
public TimeOnly OffStart { get; set; }
public TimeOnly OffEnd { get; set; }
}

View File

@@ -1,9 +1,10 @@
using System.ComponentModel.DataAnnotations;
using Dlhis.Entity.Device.Enums;
using Dlhis.Entity.Device.Models;
namespace Dlhis.Basic.Device.Request;
public class DeviceTimePeriodSaveRequest : IValidatableObject
public class DeviceTimePeriodSaveRequest
{
public long? Id { get; set; }

View File

@@ -3,9 +3,12 @@ using Dlhis.Entity.Device.Models;
namespace Dlhis.Basic.Device.Response;
public class DeviceTimePeriodResponse
public class DeviceTimePeriodResponse
{
public long Id { get; set; }
/// <summary>
/// 名称
/// </summary>
public string Name { get; set; }
/// <summary>
/// 名称

View File

@@ -1,4 +1,3 @@
using Dlhis.Basic.Device.Dtos;
using Dlhis.Basic.Device.Request;
using Dlhis.Basic.Device.Response;
using Dlhis.Entity.Basic.Entity;
@@ -27,7 +26,6 @@ public class DeviceTimePeriodService : IDeviceTimePeriodService
{
var pageOri = await _dbContext.Queryable<DeviceTimePeriodEntity>()
.Where(x => x.AssignType == request.AssignType)
.Select<DeviceTimePeriodResponse>()
.ToPageListAsync(request);
var page = pageOri.Adapt<Pagination<DeviceTimePeriodResponse>>();
@@ -195,7 +193,6 @@ public class DeviceTimePeriodService : IDeviceTimePeriodService
.Where(item => item.AssignType == DeviceTimePeriodAssignEnumType.Device && item.Value == x.Code)
.ToList();
foreach (var setting in dSettings)
{
var s = tSettings.FirstOrDefault(item => item.CardType == setting.CardType);