From f003e301699cfc3bb20061875e501a159f3fb088 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 19 Mar 2024 19:51:56 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=AE=A2=E9=A4=90null=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DishesMenusBookingSettingResponse.cs | 4 +- .../Services/Implements/DishesMenuService.cs | 2 +- .../Services/Implements/DishesService.cs | 14 ++-- Src/Dlhis.Basic/Dlhis.Basic.csproj | 1 + .../Controllers/MealUsersController.cs | 16 +--- .../MealUser/Request/MealUserAddRequest.cs | 20 ----- .../MealUser/Request/MealUserPageRequest.cs | 7 -- .../MealUser/Response/MealUserResponse.cs | 11 +-- .../MealUser/Services/IMealUserService.cs | 7 +- .../Services/Implements/MealUserService.cs | 37 +-------- .../Services/Implements/GainfoService.cs | 2 +- .../Order/Controllers/OrdersController.cs | 1 - .../Services/Implements/BalanceService.cs | 4 +- .../Order/Services/Implements/OrderService.cs | 75 ++++++++++++------- .../appsettings.Development.json | 7 ++ ...nteenUserEntity.cs => GainfoMealEntity.cs} | 14 ++-- .../Entity/MealSupplementRecordEntity.cs | 11 +++ .../Canteen/Enums/CanteenUserEnumType.cs | 30 -------- 18 files changed, 96 insertions(+), 167 deletions(-) delete mode 100644 Src/Dlhis.Basic/MealUser/Request/MealUserAddRequest.cs delete mode 100644 Src/Dlhis.Basic/MealUser/Request/MealUserPageRequest.cs rename Src/Dlhis.Entity/Basic/Entity/{CanteenUserEntity.cs => GainfoMealEntity.cs} (70%) delete mode 100644 Src/Dlhis.Entity/Canteen/Enums/CanteenUserEnumType.cs diff --git a/Src/Dlhis.Basic/Dishes/Response/DishesMenusBookingSettingResponse.cs b/Src/Dlhis.Basic/Dishes/Response/DishesMenusBookingSettingResponse.cs index 8e492bc5..f9b3a87c 100644 --- a/Src/Dlhis.Basic/Dishes/Response/DishesMenusBookingSettingResponse.cs +++ b/Src/Dlhis.Basic/Dishes/Response/DishesMenusBookingSettingResponse.cs @@ -8,9 +8,9 @@ public class DishesMenusBookingSettingResponse public DateTime ServerTime { get; set; } /// - /// 餐别-餐次信息 + /// 订餐期限 /// - public List ShiftInfos { get; set; } + public DateTime Deadline { get; set; } /// /// 支付方式 diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs index 7ff3aa7c..cec11e46 100644 --- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs +++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs @@ -178,7 +178,7 @@ public class DishesMenuService : IDishesMenuService foreach (var item in request.Items) { - var u = item.Date.ToString("yyyy-MM-dd") + "-" + item.CustomCode; + var u = item.Date.ToString("yyyy-MM-dd") + ". " + item.CustomCode; (item.ShiftTypes.DistinctBy(x => x.ShiftType).Count() != item.ShiftTypes.Count).ThrowIfTrue($"{u}的餐次不可重复添加"); diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs index dbd90b56..f8518ff8 100644 --- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs +++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs @@ -66,12 +66,13 @@ public class DishesService : IDishesService .Select(x => x.Value) .FirstAsync(); - DateTime dateTime; - DateTime.TryParseExact(strDatetime, "HH:mm:ss", null, System.Globalization.DateTimeStyles.None, out dateTime); + if (!TimeOnly.TryParse(strDatetime, out var deadline)) + deadline = new TimeOnly(8, 30); var res = new DishesMenusBookingSettingResponse { - ServerTime = dateTime, + ServerTime = DateTime.Now, + Deadline = DateTime.Today.Add(deadline.ToTimeSpan()) }; var shift = await _dbContext.Queryable() @@ -87,11 +88,7 @@ public class DishesService : IDishesService if (shift != null) { - var businessShiftMealRelationships = await _dbContext.Queryable() - .Where(x => x.ShiftCode == shift.ShiftCode) - .Select() - .ToListAsync(); - res.ShiftInfos = businessShiftMealRelationships; + if (shift.TenantId == request.Factory) { @@ -104,6 +101,7 @@ public class DishesService : IDishesService } res.PayTypes = payTypes; + return res; } diff --git a/Src/Dlhis.Basic/Dlhis.Basic.csproj b/Src/Dlhis.Basic/Dlhis.Basic.csproj index 61d37f79..5c48837c 100644 --- a/Src/Dlhis.Basic/Dlhis.Basic.csproj +++ b/Src/Dlhis.Basic/Dlhis.Basic.csproj @@ -27,6 +27,7 @@ + diff --git a/Src/Dlhis.Basic/MealUser/Controllers/MealUsersController.cs b/Src/Dlhis.Basic/MealUser/Controllers/MealUsersController.cs index 02fc4e33..04e365ac 100644 --- a/Src/Dlhis.Basic/MealUser/Controllers/MealUsersController.cs +++ b/Src/Dlhis.Basic/MealUser/Controllers/MealUsersController.cs @@ -1,5 +1,4 @@ -using Dlhis.Basic.MealUser.Request; -using Dlhis.Basic.MealUser.Response; +using Dlhis.Basic.MealUser.Response; using Dlhis.Basic.MealUser.Services; using Kurisu.Core.DataAccess.Dto; using Microsoft.AspNetCore.Authorization; @@ -28,19 +27,8 @@ public class MealUsersController : ControllerBase /// /// [HttpGet("page")] - public async Task> GetPageAsync([FromQuery] MealUserPageRequest request) + public async Task> GetPageAsync([FromQuery] PageDto request) { return await _mealUserService.GetPageAsync(request); } - - /// - /// 就餐人员保存 - /// - /// - /// - [HttpPost] - public async Task AddAsync(MealUserAddRequest request) - { - await _mealUserService.AddAsync(request); - } } diff --git a/Src/Dlhis.Basic/MealUser/Request/MealUserAddRequest.cs b/Src/Dlhis.Basic/MealUser/Request/MealUserAddRequest.cs deleted file mode 100644 index f4ee6ccc..00000000 --- a/Src/Dlhis.Basic/MealUser/Request/MealUserAddRequest.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using Dlhis.Entity.Canteen.Enums; - -namespace Dlhis.Basic.MealUser.Request; - -public class MealUserAddRequest -{ - /// - /// 档案号 - /// - [Required(ErrorMessage = "档案号不能为空")] - public string UserNo { get; set; } - - - /// - /// 用户类型 - /// - [EnumDataType(typeof(CanteenUserEnumType))] - public CanteenUserEnumType UserType { get; set; } -} diff --git a/Src/Dlhis.Basic/MealUser/Request/MealUserPageRequest.cs b/Src/Dlhis.Basic/MealUser/Request/MealUserPageRequest.cs deleted file mode 100644 index 667a21ed..00000000 --- a/Src/Dlhis.Basic/MealUser/Request/MealUserPageRequest.cs +++ /dev/null @@ -1,7 +0,0 @@ -using Kurisu.Core.DataAccess.Dto; - -namespace Dlhis.Basic.MealUser.Request; - -public class MealUserPageRequest : PageDto -{ -} \ No newline at end of file diff --git a/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs b/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs index a750372e..27731ec5 100644 --- a/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs +++ b/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs @@ -1,6 +1,4 @@ -using Dlhis.Entity.Canteen.Enums; - -namespace Dlhis.Basic.MealUser.Response; +namespace Dlhis.Basic.MealUser.Response; public class MealUserResponse { @@ -15,13 +13,6 @@ public class MealUserResponse /// public string UserCode { get; set; } - - /// - /// 消费人员类型 - /// - public CanteenUserEnumType UserType { get; set; } - - /// /// 卡号 /// diff --git a/Src/Dlhis.Basic/MealUser/Services/IMealUserService.cs b/Src/Dlhis.Basic/MealUser/Services/IMealUserService.cs index 990a8e98..33dfe9f8 100644 --- a/Src/Dlhis.Basic/MealUser/Services/IMealUserService.cs +++ b/Src/Dlhis.Basic/MealUser/Services/IMealUserService.cs @@ -1,12 +1,9 @@ -using Dlhis.Basic.MealUser.Request; -using Dlhis.Basic.MealUser.Response; +using Dlhis.Basic.MealUser.Response; using Kurisu.Core.DataAccess.Dto; namespace Dlhis.Basic.MealUser.Services; public interface IMealUserService : IScopeDependency { - Task> GetPageAsync(MealUserPageRequest request); - - Task AddAsync(MealUserAddRequest request); + Task> GetPageAsync(PageDto request); } diff --git a/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs b/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs index 0469fe53..26bde8e4 100644 --- a/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs +++ b/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs @@ -1,9 +1,5 @@ -using Dlhis.Basic.MealUser.Request; -using Dlhis.Basic.MealUser.Response; -using Dlhis.Basic.Organization.Services; +using Dlhis.Basic.MealUser.Response; using Dlhis.Entity.Basic.Entity; -using Dlhis.Entity.Basic.Enums; -using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.Core.DataAccess.Dto; using Kurisu.SqlSugar.Extensions; using Kurisu.SqlSugar.Services; @@ -13,17 +9,15 @@ namespace Dlhis.Basic.MealUser.Services.Implements; public class MealUserService : IMealUserService { private readonly IDbContext _dbContext; - private readonly IGainfoStore _gainfoStore; - public MealUserService(IDbContext dbContext, IGainfoStore gainfoStore) + public MealUserService(IDbContext dbContext) { _dbContext = dbContext; - _gainfoStore = gainfoStore; } - public async Task> GetPageAsync(MealUserPageRequest request) + public async Task> GetPageAsync(PageDto request) { - var page = await _dbContext.Queryable() + var page = await _dbContext.Queryable() .LeftJoin((x, ga) => x.UserNo == ga.No) .Select((x, ga) => new MealUserResponse { @@ -32,32 +26,9 @@ public class MealUserService : IMealUserService BalanceOfSubsidies = x.BalanceOfSubsidies, UserCode = ga.Code, UserNo = ga.No, - UserType = x.UserType }) .ToPageListAsync(request); return page; } - - public async Task AddAsync(MealUserAddRequest request) - { - //todo 获取档案信息 - - var gainfoEntity = await _gainfoStore.Queryable(GainfoStatusEnumType.Working) - .Where(x => x.No.ToString() == request.UserNo) - .FirstAsync(); - - gainfoEntity.ThrowIfNull($"档案[{request.UserNo}]不存在"); - - var entity = new CanteenUserEntity - { - UserNo = request.UserNo, - UserType = request.UserType, - Balance = 0, - BalanceOfRecharge = 0, - BalanceOfSubsidies = 0, - Version = 0, - }; - await _dbContext.InsertAsync(entity); - } } diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs index 9a4ff4c2..724575a5 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs @@ -169,7 +169,7 @@ public class GainfoService : IGainfoService var info = await _gainfoStore.Queryable(GainfoStatusEnumType.Working) .LeftJoin((ga, department) => ga.DepartmentNo == department.No) - .LeftJoin((ga, department, mealUser) => ga.No == mealUser.UserNo) + .LeftJoin((ga, department, mealUser) => ga.No == mealUser.UserNo) .Where((ga, department) => ga.Id == gainfo.Id) .Select((ga, department, mealUser) => new GainfoCurrentResponse { diff --git a/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs b/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs index 9d0f7b96..4aaee6f4 100644 --- a/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs +++ b/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs @@ -64,7 +64,6 @@ public class OrdersController : ControllerBase /// 订餐 /// /// - [IgnoreTenant] [HttpPost("booking")] public async Task Booking(BookingMealRequest request) { diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index f216236b..6c38604d 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -558,12 +558,12 @@ public class BalanceService : IBalanceService await ContinueUpdateAsync(async () => { //重算金额 - var canteenUser = await _dbContext.Queryable().Where(x => x.UserNo == balanceRecord.UserNo).SingleAsync(); + var canteenUser = await _dbContext.Queryable().Where(x => x.UserNo == balanceRecord.UserNo).SingleAsync(); //金额 + canteenUser.Balance += Math.Abs(balanceRecord.Amount); - var effect = await _dbContext.Updateable() + var effect = await _dbContext.Updateable() .SetColumns(x => x.Balance == canteenUser.Balance) .SetColumns(x => x.Version == x.Version + 1) .Where(x => x.UserNo == balanceRecord.UserNo && x.Version == canteenUser.Version) diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs index a7494d59..5b04f4fd 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs @@ -64,10 +64,7 @@ public class OrderService : IOrderService public async Task Booking(BookingMealRequest request) { - await CheckExistsMyBookingsAsync(request.BookingDate); - - var jinkoCode = _currentUser.GetUserClaim("jinko-code"); - var gainfo = await _dbContext.Queryable().Where(x => x.Code == jinkoCode).FirstAsync(); + var gainfo = await CheckExistsMyBookingsAsync(request.BookingDate, request.ShiftType); var businessPlace = await _dbContext.Queryable().Where(x => x.Code == request.BusinessPlaceCode).FirstAsync(); @@ -130,15 +127,29 @@ public class OrderService : IOrderService (menuDetail.Number < 0).ThrowIfTrue($"{menuDetail.DishesName}已售罄"); - var canteenUser = await _dbContext.Queryable().Where(x => x.UserNo == order.UserNo).FirstAsync(); - //金额+- - canteenUser.Balance += order.Amount; - (canteenUser.Balance < 0).ThrowIfTrue("余额不足,无法消费"); + var mealInfo = await _dbContext.Queryable().Where(x => x.UserNo == order.UserNo).FirstAsync(); + if (mealInfo == null) + { + await _dbContext.InsertAsync(new GainfoMealEntity + { + Balance = 0, + BalanceOfRecharge = 0, + BalanceOfSubsidies = 0, + UserCode = gainfo.Code, + UserNo = gainfo.No, + Version = 0, + }); - var effect = await _dbContext.Updateable() - .SetColumns(x => x.Balance == canteenUser.Balance) + (mealInfo == null).ThrowIfTrue("余额不足,无法消费"); + } + //金额+- + mealInfo.Balance += order.Amount; + (mealInfo.Balance < 0).ThrowIfTrue("余额不足,无法消费"); + + var effect = await _dbContext.Updateable() + .SetColumns(x => x.Balance == mealInfo.Balance) .SetColumns(x => x.Version == x.Version + 1) - .Where(x => x.UserNo == order.UserNo && x.Version == canteenUser.Version)//必须与查询时的version一致 + .Where(x => x.UserNo == order.UserNo && x.Version == mealInfo.Version)//必须与查询时的version一致 .ExecuteCommandAsync(); if (effect <= 0) throw new VersionExceptions("更新版本冲突"); @@ -147,7 +158,12 @@ public class OrderService : IOrderService .SetColumns(x => x.Number == menuDetail.Number) .SetColumns(x => x.Version == x.Version + 1) .SetColumns(x => x.ModifiedTime == now) - .Where(x => x.Date == menuDetail.Date && x.ShiftType == request.ShiftType && x.BusinessPlaceCode == request.BusinessPlaceCode && x.Version == menuDetail.Version) + .Where(x => x.Date == menuDetail.Date + && x.ShiftType == request.ShiftType + && x.BusinessPlaceCode == request.BusinessPlaceCode + && x.DishesCode == request.DishesCode + && x.Version == menuDetail.Version + ) .ExecuteCommandAsync(); if (effect <= 0) throw new VersionExceptions("更新版本冲突"); @@ -189,19 +205,18 @@ public class OrderService : IOrderService //消费权限控制 await CheckPAsync(gainfo.No, request.DeviceUniqueNo); - var canteenUserExists = await _dbContext.Queryable() + var canteenUserExists = await _dbContext.Queryable() .Where(x => x.UserNo == gainfo.No) .AnyAsync(); if (!canteenUserExists) { - await _dbContext.InsertAsync(new CanteenUserEntity + await _dbContext.InsertAsync(new GainfoMealEntity { UserNo = gainfo.No, Balance = 0, BalanceOfRecharge = 0, BalanceOfSubsidies = 0, - UserType = CanteenUserEnumType.LocalTenant, TenantId = gainfo.Factory, Version = 0, @@ -226,7 +241,7 @@ public class OrderService : IOrderService //获取人员余额 return await _dbContext.Queryable() .LeftJoin((ga, department) => ga.DepartmentNo == department.No) - .LeftJoin((ga, department, mealUser) => ga.No == mealUser.UserNo) + .LeftJoin((ga, department, mealUser) => ga.No == mealUser.UserNo) .Where(ga => ga.Id == gainfo.Id) .Select((ga, department, mealUser) => new OrderResultResponse { @@ -582,11 +597,11 @@ public class OrderService : IOrderService await ContinueUpdateAsync(async () => { - var canteenUser = await _dbContext.Queryable().Where(x => x.UserNo == order.UserNo).FirstAsync(); + var canteenUser = await _dbContext.Queryable().Where(x => x.UserNo == order.UserNo).FirstAsync(); //金额+- canteenUser.Balance += order.Amount; - var effect = await _dbContext.Updateable() + var effect = await _dbContext.Updateable() .SetColumns(x => x.Balance == canteenUser.Balance) .SetColumns(x => x.Version == x.Version + 1) .Where(x => x.UserNo == order.UserNo && x.Version == canteenUser.Version) @@ -623,7 +638,7 @@ public class OrderService : IOrderService { if (!allowNoBalance) { - var canteenUser = await _dbContext.Queryable().Where(x => x.UserNo == order.UserNo).FirstAsync(); + var canteenUser = await _dbContext.Queryable().Where(x => x.UserNo == order.UserNo).FirstAsync(); //金额+- canteenUser.Balance += order.Amount; if (canteenUser.Balance < 0) @@ -631,7 +646,7 @@ public class OrderService : IOrderService throw new UserFriendlyException("余额不足,无法消费"); } - var effect = await _dbContext.Updateable() + var effect = await _dbContext.Updateable() .SetColumns(x => x.Balance == canteenUser.Balance) .SetColumns(x => x.Version == x.Version + 1) .Where(x => x.UserNo == order.UserNo && x.Version == canteenUser.Version)//必须与查询时的version一致 @@ -651,20 +666,30 @@ public class OrderService : IOrderService /// 检查我的订餐是否存在,存在抛出异常 /// /// + /// /// - private async Task CheckExistsMyBookingsAsync(DateTime bookingDate) + private async Task CheckExistsMyBookingsAsync(DateTime bookingDate, ShiftEnumType shiftType) { - var jinkoCode = _currentUser.GetUserClaim("jinko-code"); - var gainfo = await _dbContext.Queryable().Where(x => x.Code == jinkoCode).FirstAsync(); + var subjectId = _currentUser.GetIntSubjectId(); + var gainfo = await _dbContext.Queryable().Where(x => x.IdentityUserId == subjectId).FirstAsync(); + var jinkoCode = _currentUser.GetUserClaim("jinko-code") ?? string.Empty; + if (jinkoCode.IsPresent()) + { + gainfo = await _dbContext.Queryable().Where(x => x.Code == jinkoCode).FirstAsync(); + } - var start = bookingDate.Date; + var start = bookingDate.Date.AddDays(-1); var end = start.AddDays(1).AddSeconds(-1); - var exists = await _dbContext.Queryable().Where(x => x.ApplicationType == CanteenApplicaitonTypeEnumType.Booking) + var exists = await _dbContext.Queryable() + .Where(x => x.ApplicationType == CanteenApplicaitonTypeEnumType.Booking) + .Where(x => x.ShiftType == shiftType) .Where(x => x.UserNo == gainfo.No) .Where(x => x.CreateTime >= start && x.CreateTime <= end) .AnyAsync(); exists.ThrowIfTrue("不可重复订餐"); + + return gainfo; } } diff --git a/Src/Dlhis.Canteen/appsettings.Development.json b/Src/Dlhis.Canteen/appsettings.Development.json index 49e0aa9e..74bdd380 100644 --- a/Src/Dlhis.Canteen/appsettings.Development.json +++ b/Src/Dlhis.Canteen/appsettings.Development.json @@ -10,6 +10,13 @@ "BasicRequestUrl": "http://localhost:5002", "SysRequestUrl": "http://localhost:5003" }, + "SqlSugarOptions": { + "DefaultConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=yikatong;charset=utf8mb4;", + "SlaveConnectionString": [], + "Timeout": 30, + "SlowSqlTime": 1, + "EnableSqlLog": false + }, "SwaggerOptions": { "Enable": true, "Authority": "https://yikatong.isawesome.cn/oauth2", diff --git a/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs b/Src/Dlhis.Entity/Basic/Entity/GainfoMealEntity.cs similarity index 70% rename from Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs rename to Src/Dlhis.Entity/Basic/Entity/GainfoMealEntity.cs index 7a18bed6..e7766a76 100644 --- a/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs +++ b/Src/Dlhis.Entity/Basic/Entity/GainfoMealEntity.cs @@ -1,16 +1,14 @@ -using Dlhis.Entity.Canteen.Enums; -using Kurisu.Core.DataAccess.Entity; +using Kurisu.Core.DataAccess.Entity; using Kurisu.SqlSugar; using SqlSugar; -using SqlSugar.DbConvert; namespace Dlhis.Entity.Basic.Entity; /// /// 就餐人员 /// -[SugarTable(TableName = "CanteenUser", TableDescription = "就餐人员")] -public class CanteenUserEntity : SugarBaseEntity, IVersion, ITenantId +[SugarTable(TableName = "GainfoMeal", TableDescription = "就餐人员")] +public class GainfoMealEntity : SugarBaseEntity, IVersion, ITenantId { /// /// 档案号 @@ -19,10 +17,10 @@ public class CanteenUserEntity : SugarBaseEntity, IVersion, ITenantId public string UserNo { get; set; } /// - /// 消费人员类型 + /// 工号 /// - [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "消费人员类型")] - public CanteenUserEnumType UserType { get; set; } + [SugarColumn(IsNullable = false, ColumnDescription = "工号", UniqueGroupNameList = new[] { "idx_CanteenUser_UserCode" })] + public string UserCode { get; set; } /// /// 余额 diff --git a/Src/Dlhis.Entity/Basic/Entity/MealSupplementRecordEntity.cs b/Src/Dlhis.Entity/Basic/Entity/MealSupplementRecordEntity.cs index 8a993992..ef31764d 100644 --- a/Src/Dlhis.Entity/Basic/Entity/MealSupplementRecordEntity.cs +++ b/Src/Dlhis.Entity/Basic/Entity/MealSupplementRecordEntity.cs @@ -28,6 +28,17 @@ public class MealSupplementRecordEntity : MealSupplementRequestRecordEntity /// [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))] public MealSupplementStatusEnumtype Status { get; set; } + + /// + /// 处理结果 + /// + [SugarColumn(ColumnDescription = "处理结果", ColumnDataType = "varchar(2000)")] + public string Result { get; set; } + + /// + /// 状态同步 + /// + public bool Sync { get; set; } } [SugarTable(TableName = "MealSupplementRequestRecord", TableDescription = "餐补请求记录")] diff --git a/Src/Dlhis.Entity/Canteen/Enums/CanteenUserEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/CanteenUserEnumType.cs deleted file mode 100644 index 9bc892fd..00000000 --- a/Src/Dlhis.Entity/Canteen/Enums/CanteenUserEnumType.cs +++ /dev/null @@ -1,30 +0,0 @@ - - -using System.ComponentModel; - -namespace Dlhis.Entity.Canteen.Enums; - -/// -/// 就餐人员类型 -/// -[Description("就餐人员类型")] -public enum CanteenUserEnumType -{ - /// - /// 本基地 - /// - [Description("本基地人员")] - LocalTenant = 1, - - /// - /// 其他基地 - /// - [Description("其他基地人员")] - OtherTenant, - - /// - /// 外部人员 - /// - [Description("外部人员")] - External -} \ No newline at end of file