diff --git a/Src/Dlhis.Canteen/Setting/Response/CanteenSettingResponse.cs b/Src/Dlhis.Canteen/Setting/Response/CanteenSettingResponse.cs index b168d062..8050101b 100644 --- a/Src/Dlhis.Canteen/Setting/Response/CanteenSettingResponse.cs +++ b/Src/Dlhis.Canteen/Setting/Response/CanteenSettingResponse.cs @@ -5,6 +5,9 @@ namespace Dlhis.Canteen.Setting.Response; public class CanteenSettingResponse { + + public long Id { get; set; } + public CanteenSettingUnqiueEnumType UniqueType { get; set; } public string UniqueTypeDesc => UniqueType.GetDescription(); diff --git a/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs b/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs index 0d13d529..4f6a4446 100644 --- a/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs +++ b/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs @@ -33,12 +33,12 @@ public class CanteenSettingService : ICanteenSettingService .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)) + .WhereIF(request.Search.IsPresent(), setting => setting.Catalog.Contains(request.Search)) .Select((setting, user) => new CanteenSettingResponse { + Id = setting.Id, UniqueType = setting.UniqueType, UniqueValue = setting.UniqueValue, - //UniqueValueDesc = user.UserName, Catalog = setting.Catalog, Enable = setting.Enable, Item = setting.Item, @@ -90,7 +90,7 @@ public class CanteenSettingService : ICanteenSettingService //bool CanteenSettingItemEnumType.AllowSendAtMeal => IsValidFormat(value, request.Item), - CanteenSettingItemEnumType.AllowRepeatInOneShift => IsValidFormat(value,request.Item), + CanteenSettingItemEnumType.AllowRepeatInOneShift => IsValidFormat(value, request.Item), CanteenSettingItemEnumType.AllowCrossTenant => IsValidFormat(value, request.Item), _ => throw new NotImplementedException(), }; @@ -177,15 +177,15 @@ public class CanteenSettingService : ICanteenSettingService { return false; } - } - if(type == CanteenSettingItemEnumType.BusinessSwitchTime) + } + if (type == CanteenSettingItemEnumType.BusinessSwitchTime) { var timeOnly = value.Adapt(); return timeOnly.Minute == 0 && timeOnly.Second == 0; } //mapster - value.Adapt(); - + value.Adapt(); + } catch (Exception) { @@ -194,5 +194,5 @@ public class CanteenSettingService : ICanteenSettingService return true; } - + }