fix 修复已知问题
This commit is contained in:
@@ -34,14 +34,14 @@ public class BusinessTripEntity : SugarBaseEntity
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 开始时间
|
/// 开始时间
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[SugarColumn(IsNullable = false, ColumnDataType = "time")]
|
[SugarColumn(IsNullable = true, ColumnDataType = "time")]
|
||||||
public TimeOnly BeginDateTime { get; set; }
|
public TimeOnly? BeginDateTime { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 结束时间
|
/// 结束时间
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[SugarColumn(IsNullable = false, ColumnDataType = "time")]
|
[SugarColumn(IsNullable = true, ColumnDataType = "time")]
|
||||||
public TimeOnly EndDateTime { get; set; }
|
public TimeOnly? EndDateTime { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 出差类型
|
/// 出差类型
|
||||||
|
|||||||
@@ -41,13 +41,13 @@ public class SapBusinessTripInfoItem
|
|||||||
/// 开始时间
|
/// 开始时间
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[JsonProperty("OV_BEGUZ")]
|
[JsonProperty("OV_BEGUZ")]
|
||||||
public TimeOnly BeginDateTime { get; set; }
|
public TimeOnly? BeginDateTime { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 结束时间
|
/// 结束时间
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[JsonProperty("OV_ENDUZ")]
|
[JsonProperty("OV_ENDUZ")]
|
||||||
public TimeOnly EndDateTime { get; set; }
|
public TimeOnly? EndDateTime { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 出差类型
|
/// 出差类型
|
||||||
@@ -72,7 +72,7 @@ public class SapBusinessTripInfoItem
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
[JsonProperty("OV_ABWTG")]
|
[JsonProperty("OV_ABWTG")]
|
||||||
public double Day { get; set; }
|
public double Day { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 出差目的地
|
/// 出差目的地
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -95,4 +95,9 @@ public class DeviceTaskAssignmentResponse
|
|||||||
return LastHeartbeatTime.AddSeconds(HeartbeatInterval) < DateTime.Now;
|
return LastHeartbeatTime.AddSeconds(HeartbeatInterval) < DateTime.Now;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 创建人
|
||||||
|
/// </summary>
|
||||||
|
public int CreateBy { get; set; }
|
||||||
}
|
}
|
||||||
@@ -70,6 +70,7 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
|
|||||||
LastHeartbeatTime = deviceRegistry.LastHeartbeatTime,
|
LastHeartbeatTime = deviceRegistry.LastHeartbeatTime,
|
||||||
HeartbeatInterval = device.HeartbeatInterval,
|
HeartbeatInterval = device.HeartbeatInterval,
|
||||||
DeployPlace = device.DeployPlace,
|
DeployPlace = device.DeployPlace,
|
||||||
|
CreateBy = deviceTask.CreatedBy
|
||||||
})
|
})
|
||||||
.ToPageListAsync(request);
|
.ToPageListAsync(request);
|
||||||
|
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ public class MenuService : IMenuService
|
|||||||
if (!allCodes.Any())
|
if (!allCodes.Any())
|
||||||
{
|
{
|
||||||
//todo 管理员
|
//todo 管理员
|
||||||
if (_currentUser.GetName() == "admin")
|
if (_currentUser.GetIntSubjectId() == 1)
|
||||||
{
|
{
|
||||||
return await GetListAsync(PlatformEnumType.PCAdmin);
|
return await GetListAsync(PlatformEnumType.PCAdmin);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user