diff --git a/Src/Dlhis.ScheduledTask/Packs/HangfirePack.cs b/Src/Dlhis.ScheduledTask/Packs/HangfirePack.cs index 97561c9c..c2d9332b 100644 --- a/Src/Dlhis.ScheduledTask/Packs/HangfirePack.cs +++ b/Src/Dlhis.ScheduledTask/Packs/HangfirePack.cs @@ -10,8 +10,6 @@ public class HangfirePack : BaseAppPack { public override int Order => 990; - public override bool IsBeforeUseRouting { get; } - public override void ConfigureServices(IServiceCollection services) { services.AddHangfire((sp, config) => diff --git a/Src/Dlhis.ScheduledTask/Packs/JinkoSapHttpClientPack.cs b/Src/Dlhis.ScheduledTask/Packs/JinkoSapHttpClientPack.cs index 3d865cc7..dace6138 100644 --- a/Src/Dlhis.ScheduledTask/Packs/JinkoSapHttpClientPack.cs +++ b/Src/Dlhis.ScheduledTask/Packs/JinkoSapHttpClientPack.cs @@ -6,7 +6,6 @@ namespace Dlhis.ScheduledTask.Packs; public class JinkoSapHttpClientPack : BaseAppPack { - public override bool IsBeforeUseRouting { get; } public override void ConfigureServices(IServiceCollection services) { diff --git a/Src/Dlhis.ScheduledTask/Packs/JobPack.cs b/Src/Dlhis.ScheduledTask/Packs/JobPack.cs index 342e24f5..b6922676 100644 --- a/Src/Dlhis.ScheduledTask/Packs/JobPack.cs +++ b/Src/Dlhis.ScheduledTask/Packs/JobPack.cs @@ -4,16 +4,13 @@ using Hangfire; using Hangfire.Common; using Kurisu.AspNetCore.Startup; using Kurisu.AspNetCore.Utils.Extensions; -using Kurisu.Scheduled; using Kurisu.Scheduled.Attributes; -using SqlSugar; namespace Dlhis.ScheduledTask.Packs; public class JobPack : BaseAppPack { public override int Order => 999; - public override bool IsBeforeUseRouting { get; } public override void Invoke(IServiceProvider serviceProvider) { diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/HangfireController.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/HangfireController.cs index 4767d0f4..c9f399ad 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/HangfireController.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/HangfireController.cs @@ -1,5 +1,4 @@ -using Dlhis.Basic.Api; -using Dlhis.Basic.Api.Request; +using Dlhis.Basic.Api.Request; using Dlhis.Entity.Canteen.Entities; using Dlhis.Entity.Canteen.Enums; using Dlhis.ScheduledTask.Common.Request; @@ -23,7 +22,7 @@ public class HangfireController : ControllerBase private readonly IHangfireService _hangfireService; private readonly IDbContext _dbContext; - public HangfireController(IHangfireService hangfireService , IDbContext dbContext) + public HangfireController(IHangfireService hangfireService, IDbContext dbContext) { _hangfireService = hangfireService; _dbContext = dbContext; @@ -58,8 +57,8 @@ public class HangfireController : ControllerBase { _hangfireService.GeneratePermissions(request); } - - + + [IgnoreTenant] [HttpPost("recalc")] public async Task ReCalc() @@ -77,6 +76,11 @@ public class HangfireController : ControllerBase .Having(x => SqlFunc.IsNull(x.Remark, "") != "" && SqlFunc.AggregateCount(1) > 1 && x.Remark != "用户取消" && x.Remark != "正常发放") .ToListAsync(); - return ls.Count; + var row = ls.First(); + var code = row.UserCode; + + var data = _dbContext.Queryable().Where(x => x.UserCode == code).Where(x => x.Remark == row.Remark); + + return data; } } \ No newline at end of file