diff --git a/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs b/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs index 00c933af..d62df67e 100644 --- a/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs +++ b/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs @@ -32,7 +32,7 @@ public class MealUserService : IMealUserService public async Task AddAsync(MealUserAddRequest request) { - // 获取档案信息 + //todo 获取档案信息 var gainfoEntity = await _gainfoStore.Queryable(GainfoStatusEnumType.Working) .Where(x => x.No.ToString() == request.UserId) @@ -42,7 +42,7 @@ public class MealUserService : IMealUserService var entity = new CanteenUserEntity { - UserId = request.UserId, + UserNo = request.UserId, UserType = request.UserType, UserCode = gainfoEntity.Code, CarNo = gainfoEntity.CarNo, @@ -57,7 +57,7 @@ public class MealUserService : IMealUserService public async Task GetMealUserAsync(string userId) { return await _dbContext.Queryable() - .Where(x => x.UserId == userId) + .Where(x => x.UserNo == userId) .Select() .FirstAsync(); } diff --git a/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs b/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs index 93590dd6..798db5e4 100644 --- a/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs +++ b/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs @@ -78,5 +78,15 @@ public class GainfosController : ControllerBase { await _gainfoService.OnboardingAsync(request); } + + /// + /// 当前人员信息 + /// + /// + [HttpGet("current")] + public async Task CurrentUserInfoAsync() + { + return await _gainfoService.CurrentUserInfoAsync(); + } } diff --git a/Src/Dlhis.Basic/Organization/Response/DepartmentTreeResponse.cs b/Src/Dlhis.Basic/Organization/Response/DepartmentTreeResponse.cs index 6aafe244..c30d68b1 100644 --- a/Src/Dlhis.Basic/Organization/Response/DepartmentTreeResponse.cs +++ b/Src/Dlhis.Basic/Organization/Response/DepartmentTreeResponse.cs @@ -5,7 +5,7 @@ public class DepartmentTreeResponse /// /// 部门号 /// - public string Code { get; set; } + public string No { get; set; } /// /// 部门名称 diff --git a/Src/Dlhis.Basic/Organization/Response/GainfoCurrentMealInfoResponse.cs b/Src/Dlhis.Basic/Organization/Response/GainfoCurrentMealInfoResponse.cs new file mode 100644 index 00000000..4ccf513f --- /dev/null +++ b/Src/Dlhis.Basic/Organization/Response/GainfoCurrentMealInfoResponse.cs @@ -0,0 +1,9 @@ +namespace Dlhis.Basic.Organization.Response; + +public class GainfoCurrentMealInfoResponse +{ + /// + /// 余额 + /// + public decimal Balance { get; set; } +} diff --git a/Src/Dlhis.Basic/Organization/Response/GainfoCurrentResponse.cs b/Src/Dlhis.Basic/Organization/Response/GainfoCurrentResponse.cs new file mode 100644 index 00000000..774a39bc --- /dev/null +++ b/Src/Dlhis.Basic/Organization/Response/GainfoCurrentResponse.cs @@ -0,0 +1,52 @@ +using Dlhis.Entity.Basic.Enums; +using Kurisu.AspNetCore.Utils.Extensions; + +namespace Dlhis.Basic.Organization.Response; + +public class GainfoCurrentResponse +{ + /// + /// 用户档案号 + /// + public string UserNo { get; set; } + + /// + /// 用户姓名 + /// + public string UserName { get; set; } + + /// + /// 性别枚举 + /// + public GenderEnumType Gender { get; set; } + + /// + /// 性别描述 + /// + public string GenderDesc => Gender.GetDescription(); + + /// + /// 工号 + /// + public string UserCode { get; set; } + + /// + /// 部门号 + /// + public string DepartmentNo { get; set; } + + /// + /// 部门名称 + /// + public string DepartmentName { get; set; } + + /// + /// 出生日期/生日 + /// + public DateTime Birthday { get; set; } + + /// + /// 就餐信息 + /// + public GainfoCurrentMealInfoResponse MealInfo { get; set; } +} diff --git a/Src/Dlhis.Basic/Organization/Services/IGainfoService.cs b/Src/Dlhis.Basic/Organization/Services/IGainfoService.cs index 43fbd0f8..81c198a0 100644 --- a/Src/Dlhis.Basic/Organization/Services/IGainfoService.cs +++ b/Src/Dlhis.Basic/Organization/Services/IGainfoService.cs @@ -16,4 +16,6 @@ public interface IGainfoService : IScopeDependency Task DimissionAsync(GainfoDImissionRequest request); Task OnboardingAsync(GainfoDImissionRequest request); + + Task CurrentUserInfoAsync(); } diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs index 0bdf65b5..3c207dc8 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs @@ -18,7 +18,7 @@ public class DepartmentService : IDepartmentService public async Task> GetTreeAsync() { var departments = await _dbContext.Queryable().ToListAsync(); - var tops = departments.Where(x => x.PCode.IsEmpty()).Adapt>(); + var tops = departments.Where(x => x.PNo.IsEmpty()).Adapt>(); tops.ForEach(x => { @@ -31,7 +31,7 @@ public class DepartmentService : IDepartmentService private void RecursionGetNext(DepartmentTreeResponse current, List departments) { - var next = departments.Where(x => x.PCode == current.Code).ToList(); + var next = departments.Where(x => x.PNo == current.No).ToList(); current.Next = next.Adapt>(); foreach (var item in next) { diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs index 9b1bfa81..ab4afbf5 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs @@ -4,6 +4,7 @@ using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Basic.Enums; using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.Core.DataAccess.Dto; +using Kurisu.Core.User.Abstractions; using Kurisu.SqlSugar.Attributes; using Kurisu.SqlSugar.Extensions; using Kurisu.SqlSugar.Services; @@ -15,11 +16,13 @@ public class GainfoService : IGainfoService { private readonly IGainfoStore _gainfoStore; private readonly IDbContext _dbContext; + private readonly ICurrentUser _currentUser; - public GainfoService(IGainfoStore gainfoStore, IDbContext dbContext) + public GainfoService(IGainfoStore gainfoStore, IDbContext dbContext, ICurrentUser currentUser) { _gainfoStore = gainfoStore; _dbContext = dbContext; + _currentUser = currentUser; } /// @@ -112,6 +115,33 @@ public class GainfoService : IGainfoService await _gainfoStore.InsertAsync(gainfo); } + public async Task CurrentUserInfoAsync() + { + var identityId = _currentUser.GetIntSubjectId(); + + var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.Working) + .LeftJoin((ga, department) => ga.DepartmentNo == department.No) + .LeftJoin((ga, department, mealUser) => ga.No == mealUser.UserNo) + .Where((ga, department) => ga.IdentityUserId == identityId) + .Select((ga, department, mealUser) => new GainfoCurrentResponse + { + UserNo = ga.No, + Birthday = ga.Birthday, + DepartmentNo = department.No, + DepartmentName = department.Name, + Gender = ga.Gender, + UserCode = ga.Code, + UserName = ga.Name, + MealInfo = new GainfoCurrentMealInfoResponse + { + Balance = mealUser.Balance + } + }) + .FirstAsync(); + + return gainfo; + } + //-------------------------------------------help methods ------------------------------------------------ @@ -128,26 +158,26 @@ public class GainfoService : IGainfoService } var departments = await _dbContext.Queryable().ToListAsync(); - var currentNos = departments.Where(x => departmentNos.Contains(x.Code)).ToList(); + var currentNos = departments.Where(x => departmentNos.Contains(x.No)).ToList(); foreach (var item in currentNos) { - RecursionGetNext(item.Code, departments, departmentNos); + RecursionGetNext(item.No, departments, departmentNos); } return departmentNos.Distinct().ToList(); void RecursionGetNext(string currentCode, List departments, List result) { - var next = departments.Where(x => x.PCode == currentCode).ToList(); + var next = departments.Where(x => x.PNo == currentCode).ToList(); foreach (var item in next) { - result.Add(item.Code); + result.Add(item.No); } foreach (var item in next) { - RecursionGetNext(item.Code, departments, result); + RecursionGetNext(item.No, departments, result); } } } diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs index ee4c5d16..0781b29d 100644 --- a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs +++ b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs @@ -7,6 +7,9 @@ using Microsoft.AspNetCore.Mvc; namespace Dlhis.Canteen.Order.Controllers; +/// +/// 充值/消费 +/// [Authorize] [Route("api/[controller]")] [ApiController] diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs index 9d8bd945..2e6b59a3 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs @@ -59,11 +59,11 @@ public class OrderService : IOrderService //根据档案号 var canteenUser = await _dbContext.Queryable() - .Where(x => x.UserId == request.UserUniqueNo || x.UserCode == request.UserUniqueNo) + .Where(x => x.UserNo == request.UserUniqueNo || x.UserCode == request.UserUniqueNo) .FirstAsync(); var gafinfo = await _dbContext.Queryable() - .Where(x => x.No == canteenUser.UserId) + .Where(x => x.No == canteenUser.UserNo) .FirstAsync(); var settings = await _canteenSettingService.GetUserSettingAsync(gafinfo.No); @@ -102,7 +102,7 @@ public class OrderService : IOrderService OrderStatus = CanteenOrderStatusEnumType.Wait, Name = gafinfo.Name, Source = request.Source, - UserId = canteenUser.UserId, + UserId = canteenUser.UserNo, UserCode = canteenUser.UserCode, Amount = request.Amount, BusinessPlaceCode = businessPlace.Code, @@ -207,7 +207,7 @@ public class OrderService : IOrderService { try { - var canteenUser = await _dbContext.Queryable().Where(x => x.UserId == order.UserId).FirstAsync(); + var canteenUser = await _dbContext.Queryable().Where(x => x.UserNo == order.UserId).FirstAsync(); //金额+- canteenUser.Balance += order.Amount; @@ -222,7 +222,7 @@ public class OrderService : IOrderService var effect = await _dbContext.Updateable() .SetColumns(x => x.Balance == canteenUser.Balance + order.Amount) .SetColumns(x => x.Version == x.Version + 1) - .Where(x => x.UserId == order.UserId && x.Version == canteenUser.Version)//必须与查询时的version一致 + .Where(x => x.UserNo == order.UserId && x.Version == canteenUser.Version)//必须与查询时的version一致 .ExecuteCommandAsync(); if (effect <= 0) diff --git a/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs b/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs index b23ea9b7..af5cc8c2 100644 --- a/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs +++ b/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs @@ -25,7 +25,7 @@ public class CanteenSettingService : ICanteenSettingService public async Task> GetPageAsync(CanteenSettingPageRequest request) { var page = await _context.Queryable() - .LeftJoin((setting, user) => setting.UniqueValue == user.UserId) + .LeftJoin((setting, user) => setting.UniqueValue == user.UserNo) .WhereIF(request.UniqueType.HasValue, setting => setting.UniqueType == request.UniqueType) .WhereIF(request.Item.HasValue, setting => setting.Item == request.Item) .WhereIF(request.Search.IsPresent(), setting => setting.UniqueValue.Contains(request.Search)) diff --git a/Src/Dlhis.Canteen/SqlSugarPack.cs b/Src/Dlhis.Canteen/SqlSugarPack.cs index 03c33fa6..3abac33b 100644 --- a/Src/Dlhis.Canteen/SqlSugarPack.cs +++ b/Src/Dlhis.Canteen/SqlSugarPack.cs @@ -11,9 +11,4 @@ public class SqlSugarPack : BaseAppPack { services.AddSqlSugar(); } - - public override void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - - } } diff --git a/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs b/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs index e227b0d6..0b518021 100644 --- a/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs +++ b/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs @@ -16,7 +16,7 @@ public class CanteenUserEntity : SugarBaseEntity, IVersion, ITenantId /// 档案号 /// [SugarColumn(IsNullable = false, ColumnDescription = "档案号")] - public string UserId { get; set; } + public string UserNo { get; set; } /// diff --git a/Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs b/Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs index 7e4018e0..bf4dc26c 100644 --- a/Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs +++ b/Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs @@ -13,13 +13,13 @@ public class DepartmentEntity : SugarBaseEntity /// 部门号 /// [SugarColumn(ColumnDescription = "部门号")] - public string Code { get; set; } + public string No { get; set; } /// /// 上级部门号 /// [SugarColumn(ColumnDescription = "上级部门号")] - public string PCode { get; set; } + public string PNo { get; set; } /// /// 部门名称 diff --git a/Src/Dlhis.Entity/Basic/Enums/GenderEnumType.cs b/Src/Dlhis.Entity/Basic/Enums/GenderEnumType.cs index 51b3e6fc..25fedcb5 100644 --- a/Src/Dlhis.Entity/Basic/Enums/GenderEnumType.cs +++ b/Src/Dlhis.Entity/Basic/Enums/GenderEnumType.cs @@ -8,13 +8,13 @@ public enum GenderEnumType /// /// 女性 /// - [Description("女性")] + [Description("女")] Female = 0, /// /// 男性 /// - [Description("男性")] + [Description("男")] Male = 1, /// diff --git a/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderEntity.cs index 0e6cf988..38195904 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderEntity.cs +++ b/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderEntity.cs @@ -1,5 +1,4 @@ using Dlhis.Entity.Canteen.Enums; -using Kurisu.Core.DataAccess.Entity; using SqlSugar; using SqlSugar.DbConvert; @@ -9,7 +8,7 @@ namespace Dlhis.Entity.Canteen.Entities; /// 就餐订单 /// [SugarTable(TableName = "CanteenOrder", TableDescription = "就餐订单")] -public class CanteenOrderEntity : BalanceRecordEntity, ITenantId +public class CanteenOrderEntity : BalanceRecordEntity { /// /// 请求json @@ -40,5 +39,4 @@ public class CanteenOrderEntity : BalanceRecordEntity, ITenantId /// [SugarColumn(ColumnDescription = "处理结果")] public string Result { get; set; } - public string TenantId { get; set; } } \ No newline at end of file diff --git a/Src/Dlhis.ScheduledTask/Entities/GainfoSap.cs b/Src/Dlhis.ScheduledTask/Entities/GainfoSap.cs index a32ce79f..5a7b95e9 100644 --- a/Src/Dlhis.ScheduledTask/Entities/GainfoSap.cs +++ b/Src/Dlhis.ScheduledTask/Entities/GainfoSap.cs @@ -1,115 +1,113 @@ -namespace Dlhis.ScheduledTask.Entities +using SqlSugar; + +namespace Dlhis.ScheduledTask.Entities; + +[SugarTable(TableName = "GainfoSap")] +public class GainfoSapEntity { - public class GainfoSap - { - public GainfoSap() - { - } + [PkColumn] + public int id { get; set; } - [PkColumn] - public int id { get; set; } + public string ano { get; set; } + public string @class { get; set; } - public string ano { get; set; } - public string @class { get; set; } + public string passwd { get; set; } + public string question { get; set; } - public string passwd { get; set; } - public string question { get; set; } + public string answer { get; set; } + public string gname { get; set; } - public string answer { get; set; } - public string gname { get; set; } + [UpdateColumn] + public string ename { get; set; } - [UpdateColumn] - public string ename { get; set; } + public string country { get; set; } + public string idcls { get; set; } + public string idno { get; set; } + public string native { get; set; } + public string sex { get; set; } + public DateTime? birthday { get; set; } + public string address { get; set; } + public string postcode { get; set; } + public string occupation { get; set; } + public string appellation { get; set; } + public string nation { get; set; } + public string phone { get; set; } + public string fax { get; set; } + public string mobile { get; set; } + public string email { get; set; } + public string web { get; set; } + public string vip { get; set; } + public string sec { get; set; } + public string cropsno { get; set; } + public string cropname { get; set; } + public string fancy { get; set; } + public string remark { get; set; } - public string country { get; set; } - public string idcls { get; set; } - public string idno { get; set; } - public string native { get; set; } - public string sex { get; set; } - public DateTime? birthday { get; set; } - public string address { get; set; } - public string postcode { get; set; } - public string occupation { get; set; } - public string appellation { get; set; } - public string nation { get; set; } - public string phone { get; set; } - public string fax { get; set; } - public string mobile { get; set; } - public string email { get; set; } - public string web { get; set; } - public string vip { get; set; } - public string sec { get; set; } - public string cropsno { get; set; } - public string cropname { get; set; } - public string fancy { get; set; } - public string remark { get; set; } + public int amount { get; set; } + public int days { get; set; } + public decimal consume01 { get; set; } - public int amount { get; set; } - public int days { get; set; } - public decimal consume01 { get; set; } + public decimal consume02 { get; set; } - public decimal consume02 { get; set; } + public decimal consume03 { get; set; } - public decimal consume03 { get; set; } + public decimal consume04 { get; set; } + public string log_id { get; set; } + public string log_shift { get; set; } + public DateTime? log_date { get; set; } + public string log_ip { get; set; } + public int times { get; set; } + public int logmark { get; set; } + public string rmcode { get; set; } + public string mkt { get; set; } + public string src { get; set; } + public string isowner { get; set; } + public DateTime? createdate { get; set; } - public decimal consume04 { get; set; } - public string log_id { get; set; } - public string log_shift { get; set; } - public DateTime? log_date { get; set; } - public string log_ip { get; set; } - public int times { get; set; } - public int logmark { get; set; } - public string rmcode { get; set; } - public string mkt { get; set; } - public string src { get; set; } - public string isowner { get; set; } - public DateTime? createdate { get; set; } + public string PERNR { get; set; } - public string PERNR { get; set; } + public string WERKS { get; set; } - public string WERKS { get; set; } + public string ZSTATUS { get; set; } - public string ZSTATUS { get; set; } + public string KOSTL { get; set; } - public string KOSTL { get; set; } + public string ZZ_ZD { get; set; } - public string ZZ_ZD { get; set; } + public string Z_ZJ { get; set; } - public string Z_ZJ { get; set; } + public string STELL { get; set; } - public string STELL { get; set; } + public string STELL_NM { get; set; } - public string STELL_NM { get; set; } + public DateTime? ZLZRQ { get; set; } - public DateTime? ZLZRQ { get; set; } + public string MASSN { get; set; } + + public string MNTXT { get; set; } + public string MASSG { get; set; } + public string MGTXT { get; set; } + public DateTime? logdate { get; set; } + public DateTime? updatelogdate { get; set; } + public string guestno { get; set; } + public string ZZ_KLX { get; set; } + public DateTime? DAT01 { get; set; } +} + + +public class UpdateColumnAttribute : Attribute +{ + +} + +public class PkColumnAttribute : Attribute +{ + +} + + +public class IgnoreColumnAttribute : Attribute +{ - public string MASSN { get; set; } - - public string MNTXT { get; set; } - public string MASSG { get; set; } - public string MGTXT { get; set; } - public DateTime? logdate { get; set; } - public DateTime? updatelogdate { get; set; } - public string guestno { get; set; } - public string ZZ_KLX { get; set; } - public DateTime? DAT01 { get; set; } - } - - - public class UpdateColumnAttribute : Attribute - { - - } - - public class PkColumnAttribute : Attribute - { - - } - - - public class IgnoreColumnAttribute : Attribute - { - - } } diff --git a/Src/Dlhis.ScheduledTask/Job/SyncPersonJob.cs b/Src/Dlhis.ScheduledTask/Job/SyncPersonJob.cs index a5d68382..e5c0a746 100644 --- a/Src/Dlhis.ScheduledTask/Job/SyncPersonJob.cs +++ b/Src/Dlhis.ScheduledTask/Job/SyncPersonJob.cs @@ -141,7 +141,7 @@ namespace Dlhis.ScheduledTask.Job return failure; } - private async Task SavePerson(GainfoSap item) + private async Task SavePerson(GainfoSapEntity item) { var gainfo = await _dbContext.Queryable().Where(x => x.IdNo == item.idno).FirstAsync(); if (gainfo != null) @@ -191,7 +191,7 @@ namespace Dlhis.ScheduledTask.Job await _dbContext.InsertAsync(info); } } - private async Task UpdatePerson(GainfoSap item) + private async Task UpdatePerson(GainfoSapEntity item) { var gainfo = await _dbContext.Queryable().Where(x => x.IdNo == item.idno).FirstAsync(); if (gainfo != null) @@ -312,11 +312,11 @@ namespace Dlhis.ScheduledTask.Job var needRemove = sapList.Intersect(lastUpdatedPersonList, new ZHRS_PERSONComparer()); return sapList.Except(needRemove, new ZHRS_PERSONComparer()).ToList(); } - private List ToGainfoSap(List data) + private List ToGainfoSap(List data) { return data.Select(person => { - GainfoSap o = null; + GainfoSapEntity o = null; try { @@ -337,7 +337,7 @@ namespace Dlhis.ScheduledTask.Job var sex = person.GESCH == "2" ? "F" : "M"; person.ZZ_SFZH = person.ZZ_SFZH?.TrimStart(); - o = new GainfoSap + o = new GainfoSapEntity { gname = person.NAME, ename = person.ZWORKCODE, diff --git a/Src/Dlhis.ScheduledTask/Job/UseHangfire.cs b/Src/Dlhis.ScheduledTask/Job/UseHangfire.cs index 82021bdf..a295802f 100644 --- a/Src/Dlhis.ScheduledTask/Job/UseHangfire.cs +++ b/Src/Dlhis.ScheduledTask/Job/UseHangfire.cs @@ -1,12 +1,11 @@ using Hangfire; -namespace Dlhis.ScheduledTask.Job +namespace Dlhis.ScheduledTask.Job; + +public static class UseHangfire { - public static class UseHangfire + public static void UseHangfireto(this IServiceCollection services) { - public static void UseHangfireto(this IServiceCollection services) - { - GlobalConfiguration.Configuration.UseActivator(new HangfireActivator(services.BuildServiceProvider())); - } + GlobalConfiguration.Configuration.UseActivator(new HangfireActivator(services.BuildServiceProvider())); } } diff --git a/Src/Dlhis.ScheduledTask/Packs/SqlSugarPack.cs b/Src/Dlhis.ScheduledTask/Packs/SqlSugarPack.cs index ede7092f..24a3f080 100644 --- a/Src/Dlhis.ScheduledTask/Packs/SqlSugarPack.cs +++ b/Src/Dlhis.ScheduledTask/Packs/SqlSugarPack.cs @@ -9,7 +9,6 @@ public class SqlSugarPack : BaseAppPack public override void ConfigureServices(IServiceCollection services) { - services.AddHttpContextAccessor(); services.AddSqlSugar(); } }