Simon
/
Tiobon.Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
master
孤兰 2 months ago
parent 2985c5a070
commit 3ccfa6203f
5 changed files with 396 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      Tiobon.Core.Model/Models/Ghrp/Ghrp_PerformanceItem.cs
  2. 19
      Tiobon.Core.Model/View/Ghrp/Ghrp_PerformanceItem.Dto.View.cs
  3. 26
      Tiobon.Core.Services/Ghrp/Ghrp_PerformanceItemServices.cs
  4. 345
      Tiobon.Core/Tiobon.Core.Model.xml
  5. 5
      Tiobon.Core/Tiobon.Core.xml

20
Tiobon.Core.Model/Models/Ghrp/Ghrp_PerformanceItem.cs
Unescape View File

@ -206,24 +206,6 @@ namespace Tiobon.Core.Model.Models
/// 内置
/// </summary>
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"; //生效中
}
}
}
}

19
Tiobon.Core.Model/View/Ghrp/Ghrp_PerformanceItem.Dto.View.cs
Unescape View File

@ -34,4 +34,23 @@ public class Ghrp_PerformanceItemDto : Ghrp_PerformanceItem
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 "未生效";
}
if (EndDate.HasValue)
{
return now > EndDate.Value ? "已失效" : "生效中";
}
return "生效中";
}
}
}

26
Tiobon.Core.Services/Ghrp/Ghrp_PerformanceItemServices.cs
Unescape View File

@ -4,12 +4,14 @@ using Tiobon.Core.Model.Models;
using Tiobon.Core.Services.BASE;
using Tiobon.Core.IRepository.Base;
using Tiobon.Core.Common.Caches;
using NPOI.SS.Formula.Functions;
using NPOI.Util.Collections;
namespace Tiobon.Core.Services
{
/// <summary>
/// 考核指标 (服务)
/// </summary>
/// <summary>
/// 考核指标 (服务)
/// </summary>
public class Ghrp_PerformanceItemServices : BaseServices<Ghrp_PerformanceItem, Ghrp_PerformanceItemDto, InsertGhrp_PerformanceItemInput, EditGhrp_PerformanceItemInput>, IGhrp_PerformanceItemServices
{
private readonly IBaseRepository<Ghrp_PerformanceItem> _dal;
@ -23,6 +25,24 @@ namespace Tiobon.Core.Services
public override async Task<ServicePageResult<Ghrp_PerformanceItemDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
{
string? ItemStatus = null;
if (filter.jsonParam != null)
foreach (JProperty jProperty in filter.jsonParam.Properties())
{
var name = jProperty.Name;
var value = jProperty.Value.ToString();
if (name == "ItemStatus")
{
var jsonParam = JsonHelper.JsonToObj<JsonParam>(value);
ItemStatus = jsonParam.columnValue.ToString();
}
}
if (!string.IsNullOrEmpty(ItemStatus))
{
condition = $@" (case when BeginDate > convert(date,getdate()) then '2'
when convert(date,getdate()) between ISNULL(BeginDate,'1900-01-01') and ISNULL(EndDate,'2099-01-01') then '1'
else '0' end ) = '{ItemStatus}' ";
}
var result = await base.QueryFilterPage(filter, condition, IsEnable);
result.result.DT_TableDataT1.ForEach(async x =>

345
Tiobon.Core/Tiobon.Core.Model.xml
Unescape View File

@ -15000,6 +15000,166 @@
DeptDataType
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase">
<summary>
考核指标 (Dto.Base)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ItemNo">
<summary>
指标编号
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ItemName">
<summary>
指标内容
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ItemCaption">
<summary>
指标说明
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.TargetCaption">
<summary>
目标达成说明
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ItemType1">
<summary>
一级指标分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ItemType2">
<summary>
二级指标分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ItemType3">
<summary>
三级指标分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ItemWeight">
<summary>
默认权重(%)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ItemKind">
<summary>
指标性质
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.DeptType">
<summary>
评估部门分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Tag1">
<summary>
标签1
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Tag2">
<summary>
标签2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Tag3">
<summary>
标签3
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.BeginDate">
<summary>
有效开始日
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.EndDate">
<summary>
有效结束日
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.RemarkSz">
<summary>
备注
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.SortNo">
<summary>
排序
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.IsDefault">
<summary>
默认标志
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse1">
<summary>
预留字段1
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse2">
<summary>
预留字段2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse3">
<summary>
预留字段3
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse4">
<summary>
预留字段4
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse5">
<summary>
预留字段5
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse6">
<summary>
预留字段6
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse7">
<summary>
预留字段7
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse8">
<summary>
预留字段8
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse9">
<summary>
预留字段9
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse10">
<summary>
预留字段10
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ReverseI1">
<summary>
预留字段11
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ReverseI2">
<summary>
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.BuiltIn">
<summary>
内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrp_PerformancePeriodBase">
<summary>
考核期间 (Dto.Base)
@ -17397,6 +17557,11 @@
Ghro_Dept (Dto.EditInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.EditGhrp_PerformanceItemInput">
<summary>
考核指标 (Dto.EditInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.EditGhrp_PerformancePeriodInput">
<summary>
考核期间 (Dto.EditInput)
@ -18023,6 +18188,11 @@
Ghro_Dept (Dto.InsertInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.InsertGhrp_PerformanceItemInput">
<summary>
考核指标 (Dto.InsertInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.InsertGhrp_PerformancePeriodInput">
<summary>
考核期间 (Dto.InsertInput)
@ -33267,6 +33437,166 @@
DeptDataType
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrp_PerformanceItem">
<summary>
考核指标 (Model)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ItemNo">
<summary>
指标编号
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ItemName">
<summary>
指标内容
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ItemCaption">
<summary>
指标说明
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.TargetCaption">
<summary>
目标达成说明
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ItemType1">
<summary>
一级指标分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ItemType2">
<summary>
二级指标分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ItemType3">
<summary>
三级指标分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ItemWeight">
<summary>
默认权重(%)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ItemKind">
<summary>
指标性质
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.DeptType">
<summary>
评估部门分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Tag1">
<summary>
标签1
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Tag2">
<summary>
标签2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Tag3">
<summary>
标签3
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.BeginDate">
<summary>
有效开始日
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.EndDate">
<summary>
有效结束日
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.RemarkSz">
<summary>
备注
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.SortNo">
<summary>
排序
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.IsDefault">
<summary>
默认标志
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse1">
<summary>
预留字段1
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse2">
<summary>
预留字段2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse3">
<summary>
预留字段3
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse4">
<summary>
预留字段4
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse5">
<summary>
预留字段5
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse6">
<summary>
预留字段6
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse7">
<summary>
预留字段7
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse8">
<summary>
预留字段8
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse9">
<summary>
预留字段9
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse10">
<summary>
预留字段10
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ReverseI1">
<summary>
预留字段11
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ReverseI2">
<summary>
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.BuiltIn">
<summary>
内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrp_PerformancePeriod">
<summary>
考核期间 (Model)
@ -38413,6 +38743,21 @@
修改信息
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrp_PerformanceItemDto">
<summary>
考核指标(Dto.View1)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemDto.CreateDataInfo">
<summary>
创建信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemDto.UpdateDataInfo">
<summary>
修改信息
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrp_PerformancePeriodDto">
<summary>
考核期间(Dto.View1)

5
Tiobon.Core/Tiobon.Core.xml
Unescape View File

@ -2209,6 +2209,11 @@
Ghro_Dept(Controller)
</summary>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghrp_PerformanceItemController">
<summary>
考核指标(Controller)
</summary>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghrp_PerformancePeriodController">
<summary>
考核期间(Controller)

Write Preview
Loading…
Cancel
Save