diff --git a/Src/Dlhis.Entity/Sys/Entities/MenuPermissionEntity.cs b/Src/Dlhis.Entity/Sys/Entities/MenuPermissionEntity.cs index a7660750..0f5b24e9 100644 --- a/Src/Dlhis.Entity/Sys/Entities/MenuPermissionEntity.cs +++ b/Src/Dlhis.Entity/Sys/Entities/MenuPermissionEntity.cs @@ -1,4 +1,5 @@ using Dlhis.Entity.Sys.Enums; +using Kurisu.AspNetCore.DataAccess.Entity; using Kurisu.AspNetCore.DataAccess.SqlSugar; using SqlSugar; using SqlSugar.DbConvert; @@ -9,7 +10,7 @@ namespace Dlhis.Entity.Sys.Entities; /// 菜单权限 /// [SugarTable(TableName = "MenuPermission", TableDescription = "菜单权限")] -public class MenuPermissionEntity : SugarBaseEntity +public class MenuPermissionEntity : SugarBaseEntity, ISoftDeleted { /// /// 权限分配类型 @@ -28,4 +29,7 @@ public class MenuPermissionEntity : SugarBaseEntity /// [SugarColumn(ColumnDescription = "菜单code")] public string Code { get; set; } + + /// + public bool IsDeleted { get; set; } } \ No newline at end of file diff --git a/Src/Dlhis.ScheduledTask/Jobs/SyncBusinessTripJob.cs b/Src/Dlhis.ScheduledTask/Jobs/SyncBusinessTripJob.cs index 88054f58..6027d7f7 100644 --- a/Src/Dlhis.ScheduledTask/Jobs/SyncBusinessTripJob.cs +++ b/Src/Dlhis.ScheduledTask/Jobs/SyncBusinessTripJob.cs @@ -37,7 +37,7 @@ public class SyncBusinessTripJob : BaseJob var validDepartments = tops.ToList(); tops.ForEach(x => RecursionGetNext(x, departments, validDepartments)); - foreach (var departmentNos in validDepartments.Select(x => x.No).Chunk(20)) + foreach (var departmentNos in validDepartments.Select(x => x.No).Chunk(5)) { try { @@ -63,6 +63,7 @@ public class SyncBusinessTripJob : BaseJob } + //获取今天和昨天的出差数据 var tripInfos = await DbContext.Queryable() .Where(x => (SqlFunc.DateIsSame(x.BeginDate, today) && SqlFunc.DateIsSame(x.BeginDate, today)) || (SqlFunc.DateIsSame(x.BeginDate, lastDay) && SqlFunc.DateIsSame(x.BeginDate, lastDay))) @@ -100,26 +101,24 @@ public class SyncBusinessTripJob : BaseJob bool isGenerateOrDeleted = false; - if (lastDayTripInfo != null && todayTripInfo != null) - { - todayTripInfo.Status = BusinessTripStatusEnumType.Generated; - await DbContext.UpdateAsync(todayTripInfo); - continue; - } - - if (lastDayTripInfo == null && todayTripInfo != null) { isGenerateOrDeleted = true; todayTripInfo.Status = BusinessTripStatusEnumType.Generated; } - if (todayTripInfo == null && lastDayTripInfo != null) + if (lastDayTripInfo != null && todayTripInfo == null) { - isGenerateOrDeleted = false; lastDayTripInfo.Status = BusinessTripStatusEnumType.Deleted; } + if (lastDayTripInfo != null && todayTripInfo != null) + { + todayTripInfo.Status = BusinessTripStatusEnumType.Generated; + await DbContext.UpdateAsync(todayTripInfo); + continue; + } + try { var beforeResult = await _devicePermissionApi.GetPermissionUsersInfoAsync(new List { code }); diff --git a/Src/Dlhis.Sys/Menu/Services/Implements/MenuService.cs b/Src/Dlhis.Sys/Menu/Services/Implements/MenuService.cs index 7b1aef8b..877faa4f 100644 --- a/Src/Dlhis.Sys/Menu/Services/Implements/MenuService.cs +++ b/Src/Dlhis.Sys/Menu/Services/Implements/MenuService.cs @@ -71,7 +71,7 @@ public class MenuService : IMenuService .Where(x => x.UniqueValue == request.UniqueValue) .ToListAsync(); - await _dbContext.DeleteReallyAsync(permissionsToDelete); + await _dbContext.DeleteAsync(permissionsToDelete); var permissions = request.Codes.Distinct().Select(x => new MenuPermissionEntity {