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

Merge branch 'master' of http://git.tiobon.com/Simon/Tiobon.Web.Core

Browse Source
master
xiaochanghai 3 weeks ago
parent a018095882 826ecbc475
commit c964aec330
6 changed files with 353 additions and 11 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. 4
      Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformanceTemplate.Dto.Base.cs
  2. 4
      Tiobon.Core.Model/Models/Ghrp/Ghrp_PerformanceTemplate.cs
  3. 20
      Tiobon.Core.Services/CommonServices.cs
  4. 10
      Tiobon.Core.Services/Ghrp/Ghrp_PerformanceTemplateServices.cs
  5. 315
      Tiobon.Core/Tiobon.Core.Model.xml
  6. 5
      Tiobon.Core/Tiobon.Core.xml

4
Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformanceTemplate.Dto.Base.cs
Unescape View File

@ -41,7 +41,7 @@ namespace Tiobon.Core.Model.Models
/// <summary>
/// 考核周期类别ID
/// </summary>
public int? PerformancePeriodTypeID { get; set; }
public long? PerformancePeriodTypeID { get; set; }
/// <summary>
/// 考核周期类别编号
@ -58,7 +58,7 @@ namespace Tiobon.Core.Model.Models
/// <summary>
/// 考核对象
/// </summary>
public int? StaffGroupID { get; set; }
public long? StaffGroupID { get; set; }
/// <summary>
/// 总分

4
Tiobon.Core.Model/Models/Ghrp/Ghrp_PerformanceTemplate.cs
Unescape View File

@ -43,7 +43,7 @@ namespace Tiobon.Core.Model.Models
/// <summary>
/// 考核周期类别ID
/// </summary>
public int? PerformancePeriodTypeID { get; set; }
public long? PerformancePeriodTypeID { get; set; }
/// <summary>
/// 考核周期类别编号
@ -60,7 +60,7 @@ namespace Tiobon.Core.Model.Models
/// <summary>
/// 考核对象
/// </summary>
public int? StaffGroupID { get; set; }
public long? StaffGroupID { get; set; }
/// <summary>
/// 总分

20
Tiobon.Core.Services/CommonServices.cs
Unescape View File

@ -2504,6 +2504,26 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
position = "left"
});
break;
case "F_PerformanceTemplate":
result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{
display = true,
fnKey = "TBD1YN",
fnTitle = "模板设计",
fnType = "row",
icon = "ghr-icon-form-config",
position = "left"
});
result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{
display = true,
fnKey = "TBD2YN",
fnTitle = "流程设计",
fnType = "row",
icon = "ghr-icon-flow-design",
position = "left"
});
break;
}
#endregion

10
Tiobon.Core.Services/Ghrp/Ghrp_PerformanceTemplateServices.cs
Unescape View File

@ -29,11 +29,13 @@ namespace Tiobon.Core.Services
result.result.DT_TableDataT1.ForEach(async x =>
{
x.StageItem = await GetParaLabel("PerformanceStageItem", x.StageItem);
x.MGShowType = await GetParaLabelListString("Performance", "PerformanceMGShowType", x.MGShowType);
x.TemplateType = await GetParaLabelListString("Performance", "PerformanceTemplateType", x.TemplateType);
x.StaffGroupName = Db.Ado.GetString("select StaffGroupName from Ghra_StaffGroup where StaffGroupID=@StaffGroupID"
x.MGShowType = await GetParaLabel("PerformanceMGShowType", x.MGShowType);
x.TemplateType = await GetParaLabel("PerformanceTemplateType", x.TemplateType);
//x.MGShowType = await GetParaLabelListString("Performance", "PerformanceMGShowType", x.MGShowType);
//x.TemplateType = await GetParaLabelListString("Performance", "PerformanceTemplateType", x.TemplateType);
x.StaffGroupName = Db.Ado.GetString("select StaffGroupName from Ghra_StaffGroup where ID=@StaffGroupID"
, new { StaffGroupID = x.StaffGroupID });
x.PeriodTypeName = Db.Ado.GetString("select PeriodTypeName from Ghrp_PerformancePeriodType where PerformancePeriodTypeID=@PerformancePeriodTypeID"
x.PeriodTypeName = Db.Ado.GetString("select PeriodTypeName from Ghrp_PerformancePeriodType where ID=@PerformancePeriodTypeID"
, new { PerformancePeriodTypeID = x.PerformancePeriodTypeID });
});
return result;

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

@ -16630,6 +16630,151 @@
考核阶段名称
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase">
<summary>
考核模板 (Dto.Base)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.TemplateNo">
<summary>
考核模板编号
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.TemplateName">
<summary>
考核模板名称
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.PerformancePeriodTypeID">
<summary>
考核周期类别ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.PeriodTypeNo">
<summary>
考核周期类别编号
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.StageItem">
<summary>
考核阶段
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.StaffGroupID">
<summary>
考核对象
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.TotalScore">
<summary>
总分
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.IsOutScore">
<summary>
表单是否允许超过总分
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.Weight">
<summary>
考核模板权重
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.LevelNum">
<summary>
考核阶数（含本人）
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.MGShowType">
<summary>
考核主管显示方式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.TemplateType">
<summary>
模板类型
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.RemarkSz">
<summary>
备注
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.SortNo">
<summary>
排序
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.IsDefault">
<summary>
默认标志
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.Reverse1">
<summary>
预留字段1
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.Reverse2">
<summary>
预留字段2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.Reverse3">
<summary>
预留字段3
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.Reverse4">
<summary>
预留字段4
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.Reverse5">
<summary>
预留字段5
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.Reverse6">
<summary>
预留字段6
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.Reverse7">
<summary>
预留字段7
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.Reverse8">
<summary>
预留字段8
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.Reverse9">
<summary>
预留字段9
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.Reverse10">
<summary>
预留字段10
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.ReverseI1">
<summary>
预留字段11
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.ReverseI2">
<summary>
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateBase.BuiltIn">
<summary>
内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrs_AttachmentBase">
<summary>
Ghrs_Attachment (Dto.Base)
@ -18882,6 +19027,11 @@
考核周期类别 (Dto.EditInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.EditGhrp_PerformanceTemplateInput">
<summary>
考核模板 (Dto.EditInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.EditGhrs_AttachmentInput">
<summary>
Ghrs_Attachment (Dto.EditInput)
@ -19553,6 +19703,11 @@
考核周期类别 (Dto.InsertInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.InsertGhrp_PerformanceTemplateInput">
<summary>
考核模板 (Dto.InsertInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.InsertGhrs_AttachmentInput">
<summary>
Ghrs_Attachment (Dto.InsertInput)
@ -36412,6 +36567,151 @@
内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate">
<summary>
考核模板 (Model)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.TemplateNo">
<summary>
考核模板编号
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.TemplateName">
<summary>
考核模板名称
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.PerformancePeriodTypeID">
<summary>
考核周期类别ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.PeriodTypeNo">
<summary>
考核周期类别编号
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.StageItem">
<summary>
考核阶段
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.StaffGroupID">
<summary>
考核对象
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.TotalScore">
<summary>
总分
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.IsOutScore">
<summary>
表单是否允许超过总分
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.Weight">
<summary>
考核模板权重
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.LevelNum">
<summary>
考核阶数（含本人）
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.MGShowType">
<summary>
考核主管显示方式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.TemplateType">
<summary>
模板类型
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.RemarkSz">
<summary>
备注
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.SortNo">
<summary>
排序
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.IsDefault">
<summary>
默认标志
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.Reverse1">
<summary>
预留字段1
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.Reverse2">
<summary>
预留字段2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.Reverse3">
<summary>
预留字段3
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.Reverse4">
<summary>
预留字段4
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.Reverse5">
<summary>
预留字段5
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.Reverse6">
<summary>
预留字段6
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.Reverse7">
<summary>
预留字段7
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.Reverse8">
<summary>
预留字段8
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.Reverse9">
<summary>
预留字段9
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.Reverse10">
<summary>
预留字段10
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.ReverseI1">
<summary>
预留字段11
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.ReverseI2">
<summary>
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplate.BuiltIn">
<summary>
内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrs_Attachment">
<summary>
Ghrs_Attachment (Model)
@ -41538,6 +41838,21 @@
考核阶段名称
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateDto">
<summary>
考核模板(Dto.View1)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateDto.CreateDataInfo">
<summary>
创建信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceTemplateDto.UpdateDataInfo">
<summary>
修改信息
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrs_AttachmentDto">
<summary>
Ghrs_Attachment(Dto.View)

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

@ -2393,6 +2393,11 @@
<param name="Stage">阶段</param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghrp_PerformanceTemplateController">
<summary>
考核模板(Controller)
</summary>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghrs_AttachmentController">
<summary>
Ghrs_Attachment(Controller)

Write Preview
Loading…
Cancel
Save