fix 优化已知问题

This commit is contained in:
2024-07-11 17:46:09 +08:00
parent 8ce7662e42
commit 03341bcb1d
3 changed files with 16 additions and 13 deletions

View File

@@ -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;
/// 菜单权限
/// </summary>
[SugarTable(TableName = "MenuPermission", TableDescription = "菜单权限")]
public class MenuPermissionEntity : SugarBaseEntity
public class MenuPermissionEntity : SugarBaseEntity, ISoftDeleted
{
/// <summary>
/// 权限分配类型
@@ -28,4 +29,7 @@ public class MenuPermissionEntity : SugarBaseEntity
/// </summary>
[SugarColumn(ColumnDescription = "菜单code")]
public string Code { get; set; }
/// <inheritdoc />
public bool IsDeleted { get; set; }
}

View File

@@ -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<BusinessTripEntity>()
.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<string> { code });

View File

@@ -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
{