yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 优化数据range,优化400提醒

Browse Source
This commit is contained in:
liguoyang
2024-11-20 10:54:49 +08:00
parent c371e2a8e5
commit 2a97798118
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Src/Dlhis.External/Appointment/Dto/AppointmentReceiveItemDto.cs
View File

@@ -14,20 +14,19 @@ public class AppointmentReceiveItemDto : IValidatableObject
/// <summary> /// <summary>
/// 手机号 /// 手机号
/// </summary> /// </summary>
[StringLength(11, MinimumLength = 11)] [Required(ErrorMessage = "手机号不能为空")]
[Required]
public string Phone { get; set; } public string Phone { get; set; }
/// <summary> /// <summary>
/// 证件类型 /// 证件类型
/// </summary> /// </summary>
[Required] [Required(ErrorMessage = "证件类型不能为空")]
public string IdType { get; set; } public string IdType { get; set; }
/// <summary> /// <summary>
/// 证件号/工号 /// 证件号/工号
/// </summary> /// </summary>
[Required(ErrorMessage = "证件号/工号")] [Required(ErrorMessage = "证件号/工号不能为空")]
public string IdNo { get; set; } public string IdNo { get; set; }
/// <summary> /// <summary>

4
Src/Dlhis.ScheduledTask/Jobs/SyncOriginCardInfoJob.cs
View File

@@ -23,17 +23,17 @@ public class SyncOriginCardInfoJob : BaseJob
protected override async Task RunAsync(IServiceProvider serviceProvider) protected override async Task RunAsync(IServiceProvider serviceProvider)
{ {
var start = DateTime.Now.AddDays(-7); var start = DateTime.Now.AddHours(-1);
var requests = await DbContext.Queryable<DeviceUploadLogEntity>() var requests = await DbContext.Queryable<DeviceUploadLogEntity>()
.LeftJoin<DeviceEntity>((x, device) => x.DeviceUniqueNo == device.UniqueNo) .LeftJoin<DeviceEntity>((x, device) => x.DeviceUniqueNo == device.UniqueNo)
.Where(x => x.ModifiedTime > start)
.Where(x => !string.IsNullOrEmpty(x.UserUniqueNo)) .Where(x => !string.IsNullOrEmpty(x.UserUniqueNo))
.Where(x => x.Sync == false) .Where(x => x.Sync == false)
.Where(x => SqlFunc.Subqueryable<OutsourceEntity>().Where(p => p.Code == x.UserUniqueNo).NotAny()) .Where(x => SqlFunc.Subqueryable<OutsourceEntity>().Where(p => p.Code == x.UserUniqueNo).NotAny())
.Where(x => SqlFunc.Subqueryable<DeviceEntity>() .Where(x => SqlFunc.Subqueryable<DeviceEntity>()
.Where(p => p.UniqueNo == x.DeviceUniqueNo) .Where(p => p.UniqueNo == x.DeviceUniqueNo)
.Where(p => p.Type == DeviceTypeEnumType.Attendance || (p.Type == DeviceTypeEnumType.Door && p.AsAttendance)).Any()) .Where(p => p.Type == DeviceTypeEnumType.Attendance || (p.Type == DeviceTypeEnumType.Door && p.AsAttendance)).Any())
.Where(x => x.RaiseDateTime > start)
.Select((x, device) => new UploadAttendanceRequest .Select((x, device) => new UploadAttendanceRequest
{ {
Id = x.Id, Id = x.Id,