From 381c11f69359d325dd5567a7e36b8bc49931eb58 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 4 Jul 2024 11:25:45 +0800 Subject: [PATCH 1/8] fix oldNo --- .../TaskAssignment/Services/Implements/AssignmentService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs index 5234b18c..4a068a8d 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs @@ -85,6 +85,7 @@ public class AssignmentService : IAssignmentService { UserId = item.UserId ?? 0, UserNo = item.UserNo, + OldUserNo = item.OldUserNo, UserCode = item.UserCode, UserName = item.UserName, DepartmentNo = item.DepartmentNo, From f752c0101c83b48ec7b60f17f647cd4ca4be76ab Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 4 Jul 2024 11:25:45 +0800 Subject: [PATCH 2/8] fix oldNo --- .../TaskAssignment/Services/Implements/AssignmentService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs index 5234b18c..4a068a8d 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs @@ -85,6 +85,7 @@ public class AssignmentService : IAssignmentService { UserId = item.UserId ?? 0, UserNo = item.UserNo, + OldUserNo = item.OldUserNo, UserCode = item.UserCode, UserName = item.UserName, DepartmentNo = item.DepartmentNo, From 5d74ec2f73f92f07a442f6aa4d06582b06f45275 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 4 Jul 2024 15:04:06 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix=20=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87t?= =?UTF-8?q?ype=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Entity/Sys/Entities/DataPermissionEntity.cs | 10 ++++++++++ .../Controllers/DataPermissionsController.cs | 9 ++++++--- .../Request/DataPermissionSaveRequest.cs | 4 ++++ .../DataPermission/Services/IDataPermissionService.cs | 3 ++- .../Services/Implements/DataPermissionService.cs | 5 ++++- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/Src/Dlhis.Entity/Sys/Entities/DataPermissionEntity.cs b/Src/Dlhis.Entity/Sys/Entities/DataPermissionEntity.cs index 803502d0..0980fd61 100644 --- a/Src/Dlhis.Entity/Sys/Entities/DataPermissionEntity.cs +++ b/Src/Dlhis.Entity/Sys/Entities/DataPermissionEntity.cs @@ -1,17 +1,27 @@ +using Dlhis.Entity.Device.Enums; using Dlhis.Entity.Sys.Enums; using Kurisu.AspNetCore.DataAccess.SqlSugar; using SqlSugar; +using SqlSugar.DbConvert; namespace Dlhis.Entity.Sys.Entities; [SugarTable(TableName = "DataPermissions")] public class DataPermissionEntity : SugarBaseEntity { + [SugarColumn(IsNullable = false, ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))] public AssignTypeEnumType AssignType { get; set; } + [SugarColumn(IsNullable = false)] public string AssignValue { get; set; } + [SugarColumn(IsNullable = false, ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))] public DeviceAssignmentTypeEnumType UniqueType { get; set; } + [SugarColumn(IsNullable = false)] public Guid UniqueValue { get; set; } + + + [SugarColumn(IsNullable = false, ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))] + public DeviceTypeEnumType DeviceType { get; set; } } \ No newline at end of file diff --git a/Src/Dlhis.Sys/DataPermission/Controllers/DataPermissionsController.cs b/Src/Dlhis.Sys/DataPermission/Controllers/DataPermissionsController.cs index 5469b7b6..2f7ed8cd 100644 --- a/Src/Dlhis.Sys/DataPermission/Controllers/DataPermissionsController.cs +++ b/Src/Dlhis.Sys/DataPermission/Controllers/DataPermissionsController.cs @@ -1,4 +1,5 @@ using System.ComponentModel.DataAnnotations; +using Dlhis.Entity.Device.Enums; using Dlhis.Entity.Sys.Enums; using Dlhis.Sys.DataPermission.Request; using Dlhis.Sys.DataPermission.Services; @@ -28,10 +29,12 @@ public class DataPermissionsController : ControllerBase await _dataPermissionService.SaveAsync(request); } - + [HttpGet("assignments")] - public async Task> GetAssignmentsAsync(string assignValue, [EnumDataType(typeof(DeviceAssignmentTypeEnumType))] DeviceAssignmentTypeEnumType uniqueType) + public async Task> GetAssignmentsAsync(string assignValue, + [EnumDataType(typeof(DeviceAssignmentTypeEnumType))] DeviceAssignmentTypeEnumType uniqueType, + DeviceTypeEnumType type) { - return await _dataPermissionService.GetAssignmentsAsync(assignValue, uniqueType); + return await _dataPermissionService.GetAssignmentsAsync(assignValue, uniqueType, type); } } \ No newline at end of file diff --git a/Src/Dlhis.Sys/DataPermission/Request/DataPermissionSaveRequest.cs b/Src/Dlhis.Sys/DataPermission/Request/DataPermissionSaveRequest.cs index 952deeee..2b1584d3 100644 --- a/Src/Dlhis.Sys/DataPermission/Request/DataPermissionSaveRequest.cs +++ b/Src/Dlhis.Sys/DataPermission/Request/DataPermissionSaveRequest.cs @@ -1,4 +1,5 @@ using System.ComponentModel.DataAnnotations; +using Dlhis.Entity.Device.Enums; using Dlhis.Entity.Sys.Enums; namespace Dlhis.Sys.DataPermission.Request; @@ -13,6 +14,9 @@ public class DataPermissionSaveRequest : IValidatableObject public List Codes { get; set; } = new(); + [EnumDataType(typeof(DeviceTypeEnumType))] + public DeviceTypeEnumType Type { get; set; } + public IEnumerable Validate(ValidationContext validationContext) { diff --git a/Src/Dlhis.Sys/DataPermission/Services/IDataPermissionService.cs b/Src/Dlhis.Sys/DataPermission/Services/IDataPermissionService.cs index fcfdb329..b89d6542 100644 --- a/Src/Dlhis.Sys/DataPermission/Services/IDataPermissionService.cs +++ b/Src/Dlhis.Sys/DataPermission/Services/IDataPermissionService.cs @@ -1,3 +1,4 @@ +using Dlhis.Entity.Device.Enums; using Dlhis.Entity.Sys.Enums; using Dlhis.Sys.DataPermission.Request; @@ -7,5 +8,5 @@ public interface IDataPermissionService : IScopeDependency { Task SaveAsync(DataPermissionSaveRequest request); - Task> GetAssignmentsAsync(string assignValue, DeviceAssignmentTypeEnumType uniqueType); + Task> GetAssignmentsAsync(string assignValue, DeviceAssignmentTypeEnumType uniqueType, DeviceTypeEnumType type); } \ No newline at end of file diff --git a/Src/Dlhis.Sys/DataPermission/Services/Implements/DataPermissionService.cs b/Src/Dlhis.Sys/DataPermission/Services/Implements/DataPermissionService.cs index 662da832..fddd3b90 100644 --- a/Src/Dlhis.Sys/DataPermission/Services/Implements/DataPermissionService.cs +++ b/Src/Dlhis.Sys/DataPermission/Services/Implements/DataPermissionService.cs @@ -1,3 +1,4 @@ +using Dlhis.Entity.Device.Enums; using Dlhis.Entity.Sys.Entities; using Dlhis.Entity.Sys.Enums; using Dlhis.Sys.DataPermission.Request; @@ -21,6 +22,7 @@ public class DataPermissionService : IDataPermissionService .Where(x => x.AssignValue == request.AssignValue) .Where(x => x.AssignType == AssignTypeEnumType.User) .Where(x => x.UniqueType == request.UniqueType) + .Where(x => x.DeviceType == request.Type) .ToListAsync(); await _dbContext.DeleteReallyAsync(data); @@ -34,12 +36,13 @@ public class DataPermissionService : IDataPermissionService }).ToList()); } - public async Task> GetAssignmentsAsync(string assignValue, DeviceAssignmentTypeEnumType uniqueType) + public async Task> GetAssignmentsAsync(string assignValue, DeviceAssignmentTypeEnumType uniqueType, DeviceTypeEnumType type) { return await _dbContext.Queryable() .Where(x => x.AssignValue == assignValue) .Where(x => x.AssignType == AssignTypeEnumType.User) .Where(x => x.UniqueType == uniqueType) + .Where(x => x.DeviceType == type) .Select(x => x.UniqueValue) .ToListAsync(); } From f61bf9b4c70d52afc3a22d9d7658da8b005dd569 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 4 Jul 2024 15:37:01 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix=20=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E7=A6=BB=E8=81=8C=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Request/GainfoMealPageRequest.cs | 5 +++ .../Services/Implements/GainfoMealService.cs | 5 +-- .../Implements/DeviceUploadLogService.cs | 34 ++++++++----------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/Src/Dlhis.Basic/Organization/Request/GainfoMealPageRequest.cs b/Src/Dlhis.Basic/Organization/Request/GainfoMealPageRequest.cs index ed70f63e..2867d1fa 100644 --- a/Src/Dlhis.Basic/Organization/Request/GainfoMealPageRequest.cs +++ b/Src/Dlhis.Basic/Organization/Request/GainfoMealPageRequest.cs @@ -6,4 +6,9 @@ namespace Dlhis.Basic.Organization.Request; public class GainfoMealPageRequest : PageDto { public DateTimePeriod DateTimePeriod { get; set; } + + /// + /// 是否离职 + /// + public bool IsLeave { get; set; } } \ No newline at end of file diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoMealService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoMealService.cs index 5273418d..0b816dc9 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoMealService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoMealService.cs @@ -4,6 +4,7 @@ using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Canteen.Entities; using Dlhis.Entity.Canteen.Enums; using Kurisu.AspNetCore.Authentication.Abstractions; +using Kurisu.AspNetCore.CustomClass; using Kurisu.AspNetCore.DataAccess.Dto; using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions; using Kurisu.AspNetCore.DataAccess.SqlSugar.Services; @@ -37,6 +38,7 @@ public class GainfoMealService : IGainfoMealService || gainfo.Name.Contains(request.Search) || gainfoLeave.Name.Contains(request.Search)) .Where((meal, gainfo, gainfoLeave) => gainfo.Factory == tenantId || gainfoLeave.Factory == tenantId) + .WhereIF(request.IsLeave, (meal, gainfo, gainfoLeave) => SqlFunc.IsNullOrEmpty(gainfo.No)) .Select((meal, gainfo, gainfoLeave, dept1, dept2) => new GainfoMealResponse { Balance = meal.Balance, @@ -52,8 +54,7 @@ public class GainfoMealService : IGainfoMealService var userCodes = page.Data.Select(x => x.UserCode).ToList(); var summary = await _dbContext.Queryable() .Where(x => userCodes.Contains(x.Code)) - .WhereIF(request.DateTimePeriod?.Start.HasValue == true && request.DateTimePeriod?.End.HasValue == true, - x => x.Date >= request.DateTimePeriod.Start && x.Date <= request.DateTimePeriod.End) + .WhereIF(request.DateTimePeriod.HasValue(), x => x.Date >= request.DateTimePeriod.Start && x.Date <= request.DateTimePeriod.End) .GroupBy(x => x.Code) .Select(x => new { diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs index 100cae69..aef1a533 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs @@ -1,9 +1,9 @@ -using System.Linq.Expressions; -using Dlhis.Entity.Basic.Entity; +using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Device.Entities; using Dlhis.Entity.Device.Enums; using Dlhis.ScheduledTask.DeviceUploadLog.Request; using Dlhis.ScheduledTask.DeviceUploadLog.Response; +using Kurisu.AspNetCore.CustomClass; using Kurisu.AspNetCore.DataAccess.Dto; using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions; using Kurisu.AspNetCore.DataAccess.SqlSugar.Services; @@ -25,19 +25,19 @@ public class DeviceUploadLogService : IDeviceUploadLogService public async Task> GetPageAsync(DeviceUploadLogPageRequest request) { - DeviceUploadLogTypeEnumType? type = request.Type == DeviceTypeEnumType.Attendance - ? DeviceUploadLogTypeEnumType.Attendance - : request.Type == DeviceTypeEnumType.Door - ? DeviceUploadLogTypeEnumType.Door - : null; + DeviceUploadLogTypeEnumType? type = request.Type switch + { + DeviceTypeEnumType.Attendance => DeviceUploadLogTypeEnumType.Attendance, + DeviceTypeEnumType.Door => DeviceUploadLogTypeEnumType.Door, + _ => null + }; return await _dbContext.Queryable() .LeftJoin((deviceUp, device) => deviceUp.DeviceUniqueNo == device.UniqueNo) .LeftJoin((deviceUp, device, ga) => deviceUp.UserUniqueNo == ga.Code) .WhereIF(type.HasValue, (deviceUp, device) => deviceUp.Type == type) .WhereIF(request.Sync.HasValue, deviceUp => deviceUp.Sync == request.Sync) - .WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, deviceUp => deviceUp.RaiseDateTime >= request.SearchDateTimePeriod.Start) - .WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, deviceUp => deviceUp.RaiseDateTime <= request.SearchDateTimePeriod.End) + .WhereIF(request.SearchDateTimePeriod.HasValue(), deviceUp => deviceUp.RaiseDateTime >= request.SearchDateTimePeriod.Start && deviceUp.RaiseDateTime <= request.SearchDateTimePeriod.End) .WhereIF(request.IsOutSource.HasValue && request.IsOutSource.Value, deviceUp => SqlFunc.Subqueryable().Where(x => x.Code == deviceUp.UserUniqueNo).Any()) .WhereIF(request.IsOutSource.HasValue && !request.IsOutSource.Value, deviceUp => SqlFunc.Subqueryable().Where(x => x.Code == deviceUp.UserUniqueNo).NotAny()) .WhereIF(request.Search.IsPresent(), (deviceUp, device, ga) => @@ -112,17 +112,13 @@ public class DeviceUploadLogService : IDeviceUploadLogService (uniqueNos.Count != devices.Count).ThrowIfTrue("存在非考勤和门禁的设备"); var tenantId = devices.FirstOrDefault().TenantId; - var logs = new List(requests.Count); - foreach (var request in requests) + var logs = requests.Select(request => new DeviceUploadLogEntity { - logs.Add(new DeviceUploadLogEntity - { - DeviceUniqueNo = request.DeviceUniqueNo, - Type = DeviceUploadLogTypeEnumType.Raise, - RaiseDateTime = request.Begin, - TenantId = tenantId - }); - } + DeviceUniqueNo = request.DeviceUniqueNo, + Type = DeviceUploadLogTypeEnumType.Raise, + RaiseDateTime = request.Begin, + TenantId = tenantId + }).ToList(); await _dbContext.InsertAsync(logs); } From 4511a8ef098afe500c8a3f7c1f8813fcf2318b5b Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 4 Jul 2024 15:55:15 +0800 Subject: [PATCH 5/8] fix . --- .../Services/Implements/DataPermissionService.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Src/Dlhis.Sys/DataPermission/Services/Implements/DataPermissionService.cs b/Src/Dlhis.Sys/DataPermission/Services/Implements/DataPermissionService.cs index fddd3b90..1f9b09a9 100644 --- a/Src/Dlhis.Sys/DataPermission/Services/Implements/DataPermissionService.cs +++ b/Src/Dlhis.Sys/DataPermission/Services/Implements/DataPermissionService.cs @@ -32,7 +32,8 @@ public class DataPermissionService : IDataPermissionService AssignType = AssignTypeEnumType.User, AssignValue = request.AssignValue, UniqueType = request.UniqueType, - UniqueValue = x + UniqueValue = x, + DeviceType = request.Type }).ToList()); } From ac70d6c72433c152866d77c5e69910c2117131bf Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 4 Jul 2024 18:19:20 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix=20=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=87=BA=E5=B7=AE=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Device/Entities/DeviceGroupEntity.cs | 6 ++++++ .../Jobs/CreateDefinitelyGroupJob.cs | 19 ++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs b/Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs index 1b7a35d3..4b2b916f 100644 --- a/Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs +++ b/Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs @@ -61,6 +61,12 @@ public class DeviceGroupEntity : SugarBaseEntity, ITenantId, ISoftDeleted [SugarColumn(ColumnDataType = "bit", DefaultValue = "0")] public bool AsAppointment { get; set; } = false; + + /// + /// 是否为出差分组 + /// + [SugarColumn(ColumnDataType = "bit", DefaultValue = "0")] + public bool IsBusinessTrip { get; set; } = false; public string TenantId { get; set; } diff --git a/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs b/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs index 40cc38fe..6c47d56c 100644 --- a/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs +++ b/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs @@ -117,10 +117,11 @@ public class CreateDefinitelyGroupJob : BaseJob var factoryName = $"*{type.GetDescription()}厂区系统组({factory.Name})"; if (!await DbContext.Queryable().Where(x => x.PCode == workplaceGrp.Code).AnyAsync(x => x.Name == factoryName)) { + var currentCode = Guid.NewGuid(); await DbContext.InsertAsync(new DeviceGroupEntity { PCode = workplaceGrp.Code, - Code = Guid.NewGuid(), + Code = currentCode, Type = type, Name = factoryName, Editable = false, @@ -129,6 +130,22 @@ public class CreateDefinitelyGroupJob : BaseJob TenantId = factory.Code, }); + + if (type == DeviceTypeEnumType.Door) + { + await DbContext.InsertAsync(new DeviceGroupEntity + { + PCode = currentCode, + Code = currentCode, + Type = type, + Name = "出差组", + Editable = false, + AbleSetNext = false, + Remark = _remark, + IsBusinessTrip = true, + TenantId = factory.Code + }); + } } } } From 930c9fba1aa30d088570378d19e2bc21c5c36489 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 4 Jul 2024 18:27:53 +0800 Subject: [PATCH 7/8] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E5=87=BA=E5=B7=AE?= =?UTF-8?q?=E7=BB=84=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Jobs/CreateDefinitelyGroupJob.cs | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs b/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs index 6c47d56c..fb350d69 100644 --- a/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs +++ b/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs @@ -115,13 +115,13 @@ public class CreateDefinitelyGroupJob : BaseJob foreach (var factory in tenants.Where(x => x.PCode == workplace.Code)) { var factoryName = $"*{type.GetDescription()}厂区系统组({factory.Name})"; - if (!await DbContext.Queryable().Where(x => x.PCode == workplaceGrp.Code).AnyAsync(x => x.Name == factoryName)) + var factoryGrp = await DbContext.Queryable().Where(x => x.PCode == workplaceGrp.Code).FirstAsync(x => x.Name == factoryName); + if (factoryGrp == null) { - var currentCode = Guid.NewGuid(); - await DbContext.InsertAsync(new DeviceGroupEntity + factoryGrp = new DeviceGroupEntity { PCode = workplaceGrp.Code, - Code = currentCode, + Code = Guid.NewGuid(), Type = type, Name = factoryName, Editable = false, @@ -129,21 +129,26 @@ public class CreateDefinitelyGroupJob : BaseJob Remark = _remark, TenantId = factory.Code, - }); + }; + await DbContext.InsertAsync(factoryGrp); + } - if (type == DeviceTypeEnumType.Door) + if (type == DeviceTypeEnumType.Door) + { + if (!await DbContext.Queryable().Where(x => x.PCode == factoryGrp.Code).AnyAsync(x => x.IsBusinessTrip)) { await DbContext.InsertAsync(new DeviceGroupEntity { - PCode = currentCode, - Code = currentCode, + PCode = factoryGrp.Code, + Code = Guid.NewGuid(), Type = type, - Name = "出差组", + Name = "*出差组", Editable = false, AbleSetNext = false, - Remark = _remark, IsBusinessTrip = true, - TenantId = factory.Code + Remark = _remark, + + TenantId = factory.Code, }); } } From 1de75cdad4d6b206be2eafcdf16f9f71cdd7d5c9 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 4 Jul 2024 18:31:11 +0800 Subject: [PATCH 8/8] fix . --- Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs b/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs index fb350d69..b5c74188 100644 --- a/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs +++ b/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs @@ -133,7 +133,7 @@ public class CreateDefinitelyGroupJob : BaseJob await DbContext.InsertAsync(factoryGrp); } - if (type == DeviceTypeEnumType.Door) + if (type == DeviceTypeEnumType.Door && grp == "*共用区域") { if (!await DbContext.Queryable().Where(x => x.PCode == factoryGrp.Code).AnyAsync(x => x.IsBusinessTrip)) {