From 9cc880253ce4bae4ef170d487d1de7b9cd89b72e Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 24 May 2024 14:37:03 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9C=89=E8=AF=AF=E5=A4=84=E7=90=86,=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Response/BusinessPlaceShiftTinyResponse.cs | 2 ++ .../Implements/BusinessPlaceShiftService.cs | 5 +++-- .../Services/Implements/DeviceConnectService.cs | 14 ++++++++------ .../Device/Services/Implements/DeviceService.cs | 9 +++++---- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/Src/Dlhis.Basic/BusinessShift/Response/BusinessPlaceShiftTinyResponse.cs b/Src/Dlhis.Basic/BusinessShift/Response/BusinessPlaceShiftTinyResponse.cs index 908425b3..359754c7 100644 --- a/Src/Dlhis.Basic/BusinessShift/Response/BusinessPlaceShiftTinyResponse.cs +++ b/Src/Dlhis.Basic/BusinessShift/Response/BusinessPlaceShiftTinyResponse.cs @@ -22,6 +22,8 @@ public class BusinessPlaceShiftTinyResponse /// public TimeOnly End { get; set; } + public int Sequence { get; set; } + /// /// 时间段描述 /// diff --git a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs index cef86728..5e30bf53 100644 --- a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs +++ b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs @@ -163,7 +163,8 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService CustomCode = shiftinfo.Id.ToString(), Name = shiftinfo.ShiftType.GetDescription(), Start = shiftinfo.Start, - End = shiftinfo.End + End = shiftinfo.End, + Sequence = shiftinfo.Sequence }; list.Add(shift); @@ -175,7 +176,7 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService Name = place.Name, TenantCode = tenantInfo.Code, TenantName = tenantInfo.Name, - Shifts = list + Shifts = list.OrderBy(x => x.Sequence).ToList() }; } diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs index cf295760..223cede3 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs @@ -71,7 +71,7 @@ public class DeviceConnectService : IDeviceConnectService if (request.BusinessPlaceCode.HasValue) { var businessPlace = await _dbContext.Queryable().Where(x => x.Code == request.BusinessPlaceCode).FirstAsync(); - businessPlace.ThrowIfNull("营业点不存在,无法设置到设备注册信息中"); + businessPlace.ThrowIfNull("营业点不存在,无法设置到设备注册信息中"); } //更新营业点信息 @@ -123,8 +123,8 @@ public class DeviceConnectService : IDeviceConnectService private async Task GetEnableDeviceAsync(string uniqueNo, bool checkExists = true, string deployPlace = "", string tenantId = "") { var device = await _dbContext.Queryable() - .Where(x => x.UniqueNo == uniqueNo) - .FirstAsync(); + .Where(x => x.UniqueNo == uniqueNo) + .FirstAsync(); if (checkExists) { @@ -135,7 +135,7 @@ public class DeviceConnectService : IDeviceConnectService { if (device == null) { - device = new DeviceEntity() + device = new DeviceEntity { Code = Guid.NewGuid(), ConnectionInfo = string.Empty, @@ -144,10 +144,12 @@ public class DeviceConnectService : IDeviceConnectService TenantId = tenantId, Supplier = string.Empty, Funcs = new List(), + Type = DeviceTypeEnumType.Meal, DeployPlace = deployPlace, - HeartbeatInterval = 0, + HeartbeatInterval = 30, DeployDirection = string.Empty, Enable = true, + AsAttendance = false, DeployPosition = string.Empty, CreatedBy = 1, CreateTime = DateTime.Now, @@ -161,4 +163,4 @@ public class DeviceConnectService : IDeviceConnectService return device; } -} +} \ No newline at end of file diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs index 1fa3645c..4fce1540 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs @@ -1,4 +1,4 @@ -using System.Diagnostics; + using Dlhis.Basic.Device.Request; using Dlhis.Basic.Device.Response; using Dlhis.Entity.Basic.Entity; @@ -42,7 +42,7 @@ public class DeviceService : IDeviceService .LeftJoin((d, dt, dr, bp) => dr.BusinessPlaceCode == bp.Code) .WhereIF(request.Type.HasValue, (d, dt) => d.Type == request.Type) .WhereIF(request.Enable.HasValue, (d, dt) => d.Enable == request.Enable) - .WhereIF(request.Search.IsPresent(), (d) => d.UniqueNo == request.Search || d.DeployPlace.Contains(request.Search)) + .WhereIF(request.Search.IsPresent(), d => d.UniqueNo == request.Search || d.DeployPlace.Contains(request.Search)) .Select((d, dt, dr, bp) => new DevicePageResponse { FuncsStr = d.Funcs.ToString(), @@ -57,6 +57,7 @@ public class DeviceService : IDeviceService var deviceUniqueNos = page.Data.Select(x => x.UniqueNo).ToList(); var balanceInfos = await _dbContext.Queryable().Where(x => x.Type == BalanceRecordTypeEnumType.Out) + .Where(x=>x.Status == BalanceRecordStatusEnumType.Valid) .Where(x => deviceUniqueNos.Contains(x.DeviceUniqueNo)) .Select(x => new { @@ -87,7 +88,7 @@ public class DeviceService : IDeviceService var template = await CheckTemplateExistsAsync(request.TemplateCode); await CheckTemplateFieldAsync(request.TemplateCode, request.ConnectionInfo); - DeviceEntity entity = null; + DeviceEntity entity; if (!request.Id.HasValue) { entity = request.Adapt(); @@ -525,7 +526,7 @@ public class DeviceService : IDeviceService var list = new List(); times.ForEach(time => { - var count = devices.Where(x => x.CreateTime.ToString("yyyy-MM-dd") == time).Count(); + var count = devices.Count(x => x.CreateTime.ToString("yyyy-MM-dd") == time); var res = new RecentNumberResponse { Date = time,