diff --git a/Src/Dlhis.Basic/Organization/Controllers/WerksController.cs b/Src/Dlhis.Basic/Organization/Controllers/WerksController.cs index 8156ff56..bf6b57ca 100644 --- a/Src/Dlhis.Basic/Organization/Controllers/WerksController.cs +++ b/Src/Dlhis.Basic/Organization/Controllers/WerksController.cs @@ -31,4 +31,14 @@ public class WerksController : ControllerBase { return await _werkService.GetListAsync(); } + + /// + /// 获取当前组织信息 + /// + /// + [HttpGet("current")] + public async Task GetCurrentAsync() + { + return await _werkService.GetCurrentAsync(); + } } diff --git a/Src/Dlhis.Basic/Organization/Request/GainfoPageRequest.cs b/Src/Dlhis.Basic/Organization/Request/GainfoPageRequest.cs index a738acc4..0bfb339b 100644 --- a/Src/Dlhis.Basic/Organization/Request/GainfoPageRequest.cs +++ b/Src/Dlhis.Basic/Organization/Request/GainfoPageRequest.cs @@ -1,13 +1,19 @@ using Dlhis.Entity.Basic.Enums; -using Dlhis.Entity.Canteen.Enums; using Kurisu.Core.DataAccess.Dto; using System.ComponentModel.DataAnnotations; -namespace Dlhis.Basic.Organization.Request +namespace Dlhis.Basic.Organization.Request; + +public class GainfoPageRequest : PageDto { - public class GainfoPageRequest : PageDto - { - [EnumDataType(typeof(GainfoStatusEnumType))] - public GainfoStatusEnumType gainfoStatus { get; set; } - } + /// + /// 档案类型 + /// + [EnumDataType(typeof(GainfoStatusEnumType))] + public GainfoStatusEnumType Status { get; set; } = GainfoStatusEnumType.Working; + + /// + /// 部门号(部门树传入) + /// + public List DepartmentNos { get; set; } } diff --git a/Src/Dlhis.Basic/Organization/Response/GainfoPageResponse.cs b/Src/Dlhis.Basic/Organization/Response/GainfoPageResponse.cs index 6873bb3c..6c2a976b 100644 --- a/Src/Dlhis.Basic/Organization/Response/GainfoPageResponse.cs +++ b/Src/Dlhis.Basic/Organization/Response/GainfoPageResponse.cs @@ -2,45 +2,47 @@ public class GainfoPageResponse { - /// - /// 档案号 - /// - public string Guestno { get; set; } + public string No { get; set; } /// /// SAP内部编号 /// - public string Ano { get; set; } + public string SapNo { get; set; } /// /// 人员类型 /// - public string Class { get; set; } + public string GType { get; set; } /// /// 姓名 /// - public string Gname { get; set; } + public string Name { get; set; } + + /// + /// 外文名字 + /// + public string NameEn { get; set; } /// /// 工号 /// - public string Ename { get; set; } + public string Code { get; set; } /// /// 国家代码 /// - public string Country { get; set; } + public string CountryNo { get; set; } /// /// 证件类型代码 /// - public string Idcls { get; set; } + public string IdClass { get; set; } /// /// 身份证号 /// - public string IdNO { get; set; } + public string IdNo { get; set; } /// /// 身份证籍贯区域代码 @@ -50,7 +52,7 @@ public class GainfoPageResponse /// /// 性别 /// - public string Sex { get; set; } + public string Gender { get; set; } /// /// 生日 @@ -65,12 +67,12 @@ public class GainfoPageResponse /// /// 已婚/未婚 /// - public string Postcode { get; set; } + public string Marital { get; set; } /// /// 部门编码 /// - public string Appellation { get; set; } + public string DepartmentNo { get; set; } /// /// 民族代码 @@ -82,11 +84,6 @@ public class GainfoPageResponse /// public string Phone { get; set; } - /// - /// 联系电话 - /// - public string Mobile { get; set; } - /// /// 学历 /// @@ -95,7 +92,12 @@ public class GainfoPageResponse /// /// 岗位 /// - public string Web { get; set; } + public string Position { get; set; } + + /// + /// 卡号 + /// + public string CarNo { get; set; } /// /// 备注 @@ -103,42 +105,12 @@ public class GainfoPageResponse public string Remark { get; set; } /// - /// 操作账号 + /// 人事范围 /// - public string Log_id { get; set; } + public string Werks { get; set; } /// - /// 操作班次 + /// 在职状态 /// - public string Log_shift { get; set; } - - /// - /// 操作时间 - /// - public DateTime Log_date { get; set; } - - /// - /// 操作IP - /// - public string Log_ip { get; set; } - - /// - /// 是否在职 F 在职 T离职 - /// - public string Isowner { get; set; } - - /// - /// 创建时间 - /// - public DateTime Createdate { get; set; } - - /// - /// 外文名字 - /// - public string Gname_en { get; set; } - - /// - /// 卡号 - /// - public string CarNo { get; set; } + public string Employed { get; set; } } diff --git a/Src/Dlhis.Basic/Organization/Services/IWerkService.cs b/Src/Dlhis.Basic/Organization/Services/IWerkService.cs index d4207c78..0114d2e7 100644 --- a/Src/Dlhis.Basic/Organization/Services/IWerkService.cs +++ b/Src/Dlhis.Basic/Organization/Services/IWerkService.cs @@ -5,4 +5,6 @@ namespace Dlhis.Basic.Organization.Services; public interface IWerkService : IScopeDependency { Task> GetListAsync(); + + Task GetCurrentAsync(); } diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs index 8120647e..632a498b 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs @@ -27,7 +27,7 @@ public class GainfoService : IGainfoService /// public Task> GetPageAsync(GainfoPageRequest request) { - var page = _gainfoStore.Queryable(request.gainfoStatus) + var page = _gainfoStore.Queryable(request.Status) .Select() .ToPageListAsync(request); @@ -44,7 +44,7 @@ public class GainfoService : IGainfoService var gainfos = new List(); GainfoEntity aginfoEntity = request.Adapt(); - aginfoEntity.Guestno = "F" + Guid.NewGuid().ToString(); + aginfoEntity.No = "F" + Guid.NewGuid().ToString(); gainfos.Add(aginfoEntity); await _gainfoStore.InsertAsync(GainfoStatusEnumType.Working, gainfos); @@ -81,7 +81,7 @@ public class GainfoService : IGainfoService public async Task DimissionAsync(GainfoDImissionRequest request) { var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.Working) - .Where(x => x.Guestno == request.UserId) + .Where(x => x.No == request.UserId) .FirstAsync(); gainfo.ThrowIfNull($"该档案不存在"); @@ -106,7 +106,7 @@ public class GainfoService : IGainfoService public async Task OnboardingAsync(GainfoDImissionRequest request) { var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.External) - .Where(x => x.Guestno == request.UserId) + .Where(x => x.No == request.UserId) .FirstAsync(); gainfo.ThrowIfNull($"该档案不存在"); diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoStore.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoStore.cs index f3bcc871..6bfed005 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoStore.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoStore.cs @@ -28,7 +28,7 @@ public class GainfoStore : IGainfoStore if (gainfoStatus.HasValue && gainfoStatus != GainfoStatusEnumType.Working) { var tableName = typeof(GainfoEntity).GetCustomAttribute().TableName; - return _dbContext.Queryable().AS(tableName + "_" + gainfoStatus); + return _dbContext.Queryable().AS(tableName + gainfoStatus); } return _dbContext.Queryable(); diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/WerkService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/WerkService.cs index cf7ff67a..e9982a88 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/WerkService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/WerkService.cs @@ -1,5 +1,6 @@ using Dlhis.Basic.Organization.Response; using Dlhis.Entity.Basic.Entity; +using Kurisu.Core.User.Abstractions; using Kurisu.SqlSugar.Services; namespace Dlhis.Basic.Organization.Services.Implements; @@ -7,10 +8,12 @@ namespace Dlhis.Basic.Organization.Services.Implements; public class WerkService : IWerkService { private readonly IDbContext _dbContext; + private readonly ICurrentUser _currentUser; - public WerkService(IDbContext dbContext) + public WerkService(IDbContext dbContext, ICurrentUser currentUser) { _dbContext = dbContext; + _currentUser = currentUser; } public async Task> GetListAsync() @@ -19,4 +22,13 @@ public class WerkService : IWerkService .Select() .ToListAsync(); } + + public async Task GetCurrentAsync() + { + var tenant = _currentUser.GetStringTenantId(); + return await _dbContext.Queryable() + .Where(x => x.Code == tenant) + .Select() + .FirstAsync(); + } } diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs index 4cf8f473..9d8bd945 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs @@ -63,10 +63,10 @@ public class OrderService : IOrderService .FirstAsync(); var gafinfo = await _dbContext.Queryable() - .Where(x => x.Guestno == canteenUser.UserId) + .Where(x => x.No == canteenUser.UserId) .FirstAsync(); - var settings = await _canteenSettingService.GetUserSettingAsync(gafinfo.Guestno); + var settings = await _canteenSettingService.GetUserSettingAsync(gafinfo.No); var switchTime = GetSetting(settings, CanteenSettingItemEnumType.BusinessSwitchTime); //金额处理 request.Amount = request.Type == BalanceRecordTypeEnumType.In ? Math.Abs(request.Amount) : -Math.Abs(request.Amount); @@ -100,7 +100,7 @@ public class OrderService : IOrderService ThirdNo = request.ThirdNo, Type = request.Type.Value, OrderStatus = CanteenOrderStatusEnumType.Wait, - Name = gafinfo.Gname, + Name = gafinfo.Name, Source = request.Source, UserId = canteenUser.UserId, UserCode = canteenUser.UserCode, @@ -109,7 +109,7 @@ public class OrderService : IOrderService BusinessShiftCode = shift?.Code, CostDate = costDate.Date, CostId = canteenUser.CostId, - DepartmentNo = gafinfo.Appellation, + DepartmentNo = gafinfo.DepartmentNo, DeviceInfo = device.Code.ToString(), No = "O" + SnowFlakeHelper.Instance.NextId(), diff --git a/Src/Dlhis.Sys/appsettings.Development.json b/Src/Dlhis.Sys/appsettings.Development.json index b6aea76a..18251b98 100644 --- a/Src/Dlhis.Sys/appsettings.Development.json +++ b/Src/Dlhis.Sys/appsettings.Development.json @@ -8,5 +8,28 @@ "InternalRequest": { "CommonRequestUrl": "http://common", "UserRequestUrl": "http://localhost:5010" + }, + "SwaggerOptions": { + "Enable": true, + "Authority": "https://yikatong.isawesome.cn/oauth2", + "ClientId": "4fb184324eac4180", + "ClientSecret": "8ac8f235152f1524", + "Scopes": { + "openid": "openid", + "profile": "profile", + "yikatong": "yikatong" + } + }, + "IdentityServerOptions": { + "Authority": "https://yikatong.isawesome.cn/oauth2", + "RequireHttpsMetadata": true, + "Issuer": "identity.isawesome.cn", + "Audience": "", + "Pat": { + "Enable": false, + "Scheme": "token", + "ClientId": "reference", + "ClientSecret": "123456" + } } }