diff --git a/Tiobon.Core.Model/Models/Ghrp/Ghrp_PerformanceItem.cs b/Tiobon.Core.Model/Models/Ghrp/Ghrp_PerformanceItem.cs index b14b23d6..a4dfb31f 100644 --- a/Tiobon.Core.Model/Models/Ghrp/Ghrp_PerformanceItem.cs +++ b/Tiobon.Core.Model/Models/Ghrp/Ghrp_PerformanceItem.cs @@ -206,5 +206,24 @@ namespace Tiobon.Core.Model.Models /// 内置 /// public int? BuiltIn { get; set; } + public string ItemStatus + { + get + { + DateTime now = DateTime.Now; + + if (now < BeginDate) + { + return "2"; // 未生效 + } + + if (EndDate.HasValue) + { + return now > EndDate.Value ? "0" : "1"; // 0已失效 1生效中 + } + + return "1"; //生效中 + } + } } } diff --git a/Tiobon.Core.Model/View/Ghrp/Ghrp_PerformanceItem.Dto.View.cs b/Tiobon.Core.Model/View/Ghrp/Ghrp_PerformanceItem.Dto.View.cs index b52e4094..01ca679d 100644 --- a/Tiobon.Core.Model/View/Ghrp/Ghrp_PerformanceItem.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrp/Ghrp_PerformanceItem.Dto.View.cs @@ -33,24 +33,5 @@ public class Ghrp_PerformanceItemDto : Ghrp_PerformanceItem public string UpdateDataInfo { get; set; } public string BeginDateStr => BeginDate?.ToString("yyyy-MM-dd") ?? string.Empty; public string EndDateStr => EndDate?.ToString("yyyy-MM-dd") ?? string.Empty; - - public string ItemStatus - { - get - { - DateTime now = DateTime.Now; - - if (now < BeginDate) - { - return "2"; // 未生效 - } - - if (EndDate.HasValue) - { - return now > EndDate.Value ? "0" : "1"; // 0已失效 1生效中 - } - - return "1"; //生效中 - } - } + } diff --git a/Tiobon.Core.Services/Ghrp/Ghrp_PerformanceItemServices.cs b/Tiobon.Core.Services/Ghrp/Ghrp_PerformanceItemServices.cs index 8766c6f3..ef5e3b33 100644 --- a/Tiobon.Core.Services/Ghrp/Ghrp_PerformanceItemServices.cs +++ b/Tiobon.Core.Services/Ghrp/Ghrp_PerformanceItemServices.cs @@ -22,6 +22,7 @@ namespace Tiobon.Core.Services public override async Task> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) { + var result = await base.QueryFilterPage(filter, condition, IsEnable); result.result.DT_TableDataT1.ForEach(async x =>