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

fix 优化needUpload判断

Browse Source
This commit is contained in:
liguoyang
2025-01-08 17:30:01 +08:00
parent 859bac29cc
commit a54efe83ad
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
View File

@@ -1,4 +1,5 @@
using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Basic.Enums;
using Dlhis.Entity.Device.Entities; using Dlhis.Entity.Device.Entities;
using Dlhis.Entity.Device.Enums; using Dlhis.Entity.Device.Enums;
using Dlhis.Jip.Api; using Dlhis.Jip.Api;
@@ -63,18 +64,21 @@ public class DeviceUploadLogService : IDeviceUploadLogService
var device = devices.First(x => x.UniqueNo == request.DeviceUniqueNo); var device = devices.First(x => x.UniqueNo == request.DeviceUniqueNo);
var userType = gainfos.FirstOrDefault(x => x.Code == request.UserUniqueNo)?.Type;
var needUpload = userType == GainfoUserTypeEnumType.Normal && (device.Type == DeviceTypeEnumType.Attendance || (device.Type == DeviceTypeEnumType.Door && device.AsAttendance));
var dataType = device.Type == DeviceTypeEnumType.Attendance
? DeviceUploadLogTypeEnumType.Attendance
: DeviceUploadLogTypeEnumType.Door;
inserts.Add(new DeviceUploadLogEntity inserts.Add(new DeviceUploadLogEntity
{ {
DeviceCode = device.Code, DeviceCode = device.Code,
DeviceUniqueNo = request.DeviceUniqueNo, DeviceUniqueNo = request.DeviceUniqueNo,
UserUniqueNo = request.UserUniqueNo, UserUniqueNo = request.UserUniqueNo,
UserType = gainfos.FirstOrDefault(x => x.Code == request.UserUniqueNo)?.Type, UserType = userType,
RaiseDateTime = request.RaiseDateTime, RaiseDateTime = request.RaiseDateTime,
SerialNo = request.SerialNo ?? string.Empty, SerialNo = request.SerialNo ?? string.Empty,
Type = device.Type == DeviceTypeEnumType.Attendance Type = dataType,
? DeviceUploadLogTypeEnumType.Attendance NeedUpload = needUpload,
: DeviceUploadLogTypeEnumType.Door,
NeedUpload = device.Type == DeviceTypeEnumType.Attendance || (device.Type == DeviceTypeEnumType.Door && device.AsAttendance),
TenantId = device.TenantId, TenantId = device.TenantId,
Status = request.Status ?? true, Status = request.Status ?? true,
CreatedBy = 1, CreatedBy = 1,