优化，简化引用usinf

Lib/Tiobon.Core.Base.xml

@@ -216,6 +216,33 @@
             <typeparam name="TInsertDto"></typeparam>
             <typeparam name="TEditDto"></typeparam>
         </member>
+        <member name="F:Tiobon.Core.Services.BASE.BaseServices`4._caching">
+            <summary>
+            缓存
+            </summary>
+        </member>
+        <member name="M:Tiobon.Core.Services.BASE.BaseServices`4.#ctor(Tiobon.Core.IRepository.Base.IBaseRepository{`0},Tiobon.Core.Common.Caches.ICaching)">
+            <summary>
+            
+            </summary>
+            <param name="BaseDal"></param>
+            <param name="caching"></param>
+        </member>
+        <member name="P:Tiobon.Core.Services.BASE.BaseServices`4.BaseDal">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Services.BASE.BaseServices`4.Db">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Services.BASE.BaseServices`4.LangId">
+            <summary>
+            语言ID
+            </summary>
+        </member>
         <member name="M:Tiobon.Core.Services.BASE.BaseServices`4.AnyAsync(System.Object)">
             <summary>
             根据ID查询实体数据是否存在
@@ -223,6 +250,13 @@
             <param name="objId"></param>
             <returns></returns>
         </member>
+        <member name="M:Tiobon.Core.Services.BASE.BaseServices`4.AnyAsync(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}})">
+            <summary>
+            
+            </summary>
+            <param name="whereExpression"></param>
+            <returns></returns>
+        </member>
         <member name="M:Tiobon.Core.Services.BASE.BaseServices`4.QueryById(System.Object,System.Boolean)">
             <summary>
             根据ID查询一条数据

Lib/Tiobon.Core.Model.Entity.xml

@@ -4,6 +4,41 @@
         <name>Tiobon.Core.Model.Entity</name>
     </assembly>
     <members>
+        <member name="T:Tiobon.Core.Model.Entity.QueryBody">
+            <summary>
+            动态查询条件
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Entity.QueryBody.pageNum">
+            <summary>
+            起始位置(e.g. 0)
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Entity.QueryBody.pageSize">
+            <summary>
+            每页数量(e.g. 10)
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Entity.QueryBody.jsonParam">
+            <summary>
+            查询条件( 例如:id = 1 and name = 小明)
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Entity.QueryBody.orderBy">
+            <summary>
+            排序条件表达式(e.g. LoginName ASC,Name DESC)
+            </summary>
+        </member>
+        <member name="T:Tiobon.Core.Model.Entity.QueryForm">
+            <summary>
+            动态查询条件
+            </summary>
+        </member>
+        <member name="T:Tiobon.Core.Model.Entity.QueryExport">
+            <summary>
+            动态查询条件
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Entity.ServiceResult`1">
             <summary>
             服务层响应实体(泛型)

Tiobon.Core.Api/Controllers/Ghre/Ghre_PlanController.cs

@@ -1,6 +1,4 @@
-using Tiobon.Core.Model.ViewModels.Extend;
-
-namespace Tiobon.Core.Api.Controllers;
+namespace Tiobon.Core.Api.Controllers;
 
 /// <summary>
 /// 培训计划(Controller)

Tiobon.Core.Api/GlobalUsings.cs

@@ -18,3 +18,4 @@ global using Tiobon.Core.SwaggerHelper;
 global using static Tiobon.Core.Extensions.SwaggerSetup;
 global using Tiobon.Core.Base.Helper;
 global using Tiobon.Core.Model.Entity;
+global using Tiobon.Core.Model.ViewModels.Extend;

Tiobon.Core.Common/Attribute/QueryFilter.cs

@@ -1,165 +0,0 @@
-using Newtonsoft.Json.Linq;
-using System.ComponentModel.DataAnnotations;
-using Tiobon.Core.Model.Entity;
-
-namespace Tiobon.Core.Common;
-
-
-/// <summary>
-/// 动态查询条件
-/// </summary>
-public class QueryBody
-{
-    /// <summary>
-    /// 起始位置(e.g. 0)
-    /// </summary>
-    [Required]
-    public int pageNum { get; set; } = 1;
-    /// <summary>
-    /// 每页数量(e.g. 10)
-    /// </summary>
-    [Required]
-    public int pageSize { get; set; } = 100000;
-    private JObject _jsonParam;
-    /// <summary>
-    /// 查询条件( 例如:id = 1 and name = 小明)
-    /// </summary>
-    public JObject jsonParam
-    {
-        get { return _jsonParam; }
-        set
-        {
-            _jsonParam = value;
-        }
-    }
-
-    /// <summary>
-    /// 排序条件表达式(e.g. LoginName ASC,Name DESC)
-    /// </summary>
-    public string orderBy { get; set; }
-    public string menuName { get; set; }
-    public int langId { get; set; }
-
-
-}
-public class JsonParam
-{
-    public object columnValue { get; set; }
-    public string operationKey { get; set; }
-    public string token { get; set; }
-
-}
-public class JsonParam1
-{
-    public List<string> columnValue { get; set; }
-    public string operationKey { get; set; }
-    public string token { get; set; }
-
-}
-
-/// <summary>
-/// 动态查询条件
-/// </summary>
-public class QueryForm
-{
-    public string doType { get; set; }
-    public long? id { get; set; }
-    public int langId { get; set; }
-    public string menuName { get; set; }
-    public string token { get; set; }
-    public string procName { get; set; }
-    public string timestamp { get; set; }
-    public string userId { get; set; }
-    private JObject _jsonParam;
-    public JObject jsonParam
-    {
-        get { return _jsonParam; }
-        set
-        {
-            _jsonParam = value;
-        }
-    }
-
-}
-
-public class QueryForm1
-{
-    public string doType { get; set; }
-    public long? id { get; set; }
-    public int langId { get; set; }
-    public string menuName { get; set; }
-    public string token { get; set; }
-    public string procName { get; set; }
-    public string timestamp { get; set; }
-    public string userId { get; set; }
-    public object jsonParam { get; set; }
-
-
-}
-
-public class QueryExportField
-{
-    public List<string> ExFields { get; set; }
-    public string IsTitle { get; set; }
-    public string TitleName { get; set; }
-    public List<long> SelectRowKeys { get; set; }
-
-}
-
-/// <summary>
-/// 动态查询条件
-/// </summary>
-public class QueryExport
-{
-    public string commonType { get; set; }
-    public QueryExportField exportSet { get; set; }
-
-    public string getDataType { get; set; }
-    private JObject _jsonParam;
-    public int langId { get; set; }
-    public string menuName { get; set; }
-    public string orderBy { get; set; }
-    public int pageNum { get; set; }
-    public int pageSize { get; set; }
-    public string token { get; set; }
-    public string procName { get; set; }
-    public string timestamp { get; set; }
-    public string userId { get; set; }
-
-    public JObject jsonParam
-    {
-        get { return _jsonParam; }
-        set
-        {
-            _jsonParam = value;
-        }
-    }
-
-}
-public class QueryExportColumn
-{
-    public int sortNum { get; set; }
-    public string label { get; set; }
-    public string field { get; set; }
-    public string dataSource { get; set; }
-    public string required { get; set; }
-
-    public string dataType { get; set; }
-
-    public string elementType { get; set; }
-    public string commentText { get; set; }
-    public string dataSourceType { get; set; }
-
-    public int? dataSourceId { get; set; }
-
-    public string Comment { get; set; }
-}
-
-public class QueryExportReturn
-{
-    public JM_PageControlT1 JM_PageControlT1 { get; set; } = new JM_PageControlT1();
-    public JM_TableColumnT1 JM_TableColumnT1 { get; set; } = new JM_TableColumnT1();
-    public List<DT_PageMutiMsg> DT_PageMutiMsg { get; set; }
-
-    public DT_Procedure DT_Procedure { get; set; } = new DT_Procedure();
-}

Tiobon.Core.DataAccess/ReportHelper.cs

@@ -21,6 +21,7 @@ using System.Threading.Tasks;
 using Tiobon.Core.Common;
 using Tiobon.Core.Common.Extensions;
 using Tiobon.Core.Common.Helper;
+using Tiobon.Core.Model.Entity;
 using Tiobon.Core.Model.Models;
 
 namespace Tiobon.Core.DataAccess;

Tiobon.Core.DataAccess/Tiobon.Core.DataAccess.csproj

@@ -42,4 +42,10 @@
     <Folder Include="Migrations\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="Tiobon.Core.Model.Entity">
+      <HintPath>..\Lib\Tiobon.Core.Model.Entity.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
 </Project>

Tiobon.Core.IServices/Ghra/IGhra_GradeServices.cs

@@ -0,0 +1,8 @@
+namespace Tiobon.Core.IServices;
+
+/// <summary>
+/// 年级(自定义服务接口)
+/// </summary>	
+public interface IGhra_GradeServices : IBaseServices<Ghra_Grade, Ghra_GradeDto, InsertGhra_GradeInput, EditGhra_GradeInput>
+{
+}

Tiobon.Core.IServices/Ghra/IGhra_StaffGroupDetailServices.cs

@@ -1,9 +1,8 @@
-namespace Tiobon.Core.IServices
+namespace Tiobon.Core.IServices;
+
+/// <summary>
+/// 人员群组明细(自定义服务接口)
+/// </summary>	
+public interface IGhra_StaffGroupDetailServices : IBaseServices<Ghra_StaffGroupDetail, Ghra_StaffGroupDetailDto, InsertGhra_StaffGroupDetailInput, EditGhra_StaffGroupDetailInput>
 {
-    /// <summary>
-    /// 人员群组明细(自定义服务接口)
-    /// </summary>	
-    public interface IGhra_StaffGroupDetailServices :IBaseServices<Ghra_StaffGroupDetail, Ghra_StaffGroupDetailDto, InsertGhra_StaffGroupDetailInput, EditGhra_StaffGroupDetailInput>
-	{
-    }
 }

Tiobon.Core.IServices/Ghra/IGhra_TitleServices.cs

@@ -1,6 +1,4 @@
-using Tiobon.Core.Common;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 岗位(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_AttachmentServices.cs

@@ -1,6 +1,4 @@
-using Tiobon.Core.Model.ViewModels;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 附件(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_CertificateDesignItemServices.cs

@@ -3,6 +3,6 @@
 /// <summary>
 /// 培训证书设计项(自定义服务接口)
 /// </summary>	
-public interface IGhre_CertificateDesignItemServices :IBaseServices<Ghre_CertificateDesignItem, Ghre_CertificateDesignItemDto, InsertGhre_CertificateDesignItemInput, EditGhre_CertificateDesignItemInput>
+public interface IGhre_CertificateDesignItemServices : IBaseServices<Ghre_CertificateDesignItem, Ghre_CertificateDesignItemDto, InsertGhre_CertificateDesignItemInput, EditGhre_CertificateDesignItemInput>
 {
-    }
+}

Tiobon.Core.IServices/Ghre/IGhre_CertificateRuleServices.cs

@@ -1,6 +1,4 @@
-using Tiobon.Core.Model;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 培训证书规则(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_CertificateServices.cs

@@ -1,6 +1,4 @@
-using Tiobon.Core.Model;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 培训记录(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_CourseServices.cs

@@ -1,7 +1,4 @@
-using Tiobon.Core.Common;
-using Tiobon.Core.Model.ViewModels.Extend;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 课程(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_CreditPointServices.cs

@@ -1,6 +1,4 @@
-using Tiobon.Core.Common;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 学分记录(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_ExamPaperServices.cs

@@ -1,6 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
-using Tiobon.Core.Common;
-
+
 namespace Tiobon.Core.IServices;
 
 /// <summary>
@@ -11,7 +9,7 @@ public interface IGhre_ExamPaperServices : IBaseServices<Ghre_ExamPaper, Ghre_Ex
     Task<ServiceResult<DefaultGhre_ExamPaperInput>> QueryDefault(long Id);
 
     Task<ServiceResult<InsertExamPaperConfigInput>> InsertConfig(InsertGhre_ExamPaperConfigInput insert);
-    Task<ServiceResult<long>> Insert1([FromBody] DefaultGhre_ExamPaperPageData insert);
+    Task<ServiceResult<long>> Insert1(DefaultGhre_ExamPaperPageData insert);
     Task<ServiceResult> Update1(long id, DefaultGhre_ExamPaperPageData insertModel);
 
     Task<ServiceResult> UpdateStatus(long[] ids, string status);

Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs

@@ -1,7 +1,4 @@
-using Tiobon.Core.Common;
-using Tiobon.Core.Model;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 考试记录(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_ExamServices.cs

@@ -1,6 +1,4 @@
-using Tiobon.Core.Common;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 考试(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_OpenClassServices.cs

@@ -1,7 +1,4 @@
-using Tiobon.Core.Model;
-using Tiobon.Core.Model.ViewModels.Extend;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 开班管理(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_PlanServices.cs

@@ -1,6 +1,4 @@
-using Tiobon.Core.Common;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 培训计划(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_RequestServices.cs

@@ -1,7 +1,4 @@
-using Tiobon.Core.Common;
-using Tiobon.Core.Model;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 培训需求(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_StaffGroupServices.cs

@@ -1,7 +1,4 @@
-using Tiobon.Core.Common;
-using Tiobon.Core.Model;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 员工群组(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_StudyRecordServices.cs

@@ -1,8 +1,4 @@
-using Tiobon.Core.Common;
-using Tiobon.Core.Model;
-using Tiobon.Core.Model.ViewModels.Extend;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 培训记录(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_SurveyQuestionPoolServices.cs

@@ -1,6 +1,4 @@
-using Tiobon.Core.Model;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 问卷题库(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_SurveyServices.cs

@@ -1,7 +1,4 @@
-using Tiobon.Core.Model;
-using Tiobon.Core.Model.ViewModels.Extend;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 问卷调查(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_TitleSkill_BoltoneServices.cs

@@ -1,8 +1,4 @@
-using Tiobon.Core.Common;
-using Tiobon.Core.Model.ViewModels.Extend;
-using Tiobon.Core.Model;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 岗位技能_宝连通(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_UshioPlanServices.cs

@@ -1,6 +1,4 @@
-using Tiobon.Core.Model;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 【牛尾】培训计划(自定义服务接口)

Tiobon.Core.IServices/Ghrh/IGhrh_HumanRequestServices.cs

@@ -1,6 +1,4 @@
-using Tiobon.Core.Common;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 人力需求维护(自定义服务接口)

Tiobon.Core.IServices/Ghrh/IGhrh_ResumeServices.cs

@@ -1,15 +1,11 @@
-using Microsoft.AspNetCore.Mvc;
-using Tiobon.Core.Common;
-using Tiobon.Core.Model.ViewModels.Extend;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 个人简历(自定义服务接口)
 /// </summary>	
 public interface IGhrh_ResumeServices : IBaseServices<Ghrh_Resume, Ghrh_ResumeDto, InsertGhrh_ResumeInput, EditGhrh_ResumeInput>
 {
-    Task<ServiceResult<List<ResumeViewTab>>> QueryViewTab(int langId=1);
+    Task<ServiceResult<List<ResumeViewTab>>> QueryViewTab(int langId = 1);
 
     Task<ServiceResult<List<ResumeCondition>>> QueryConditions();
 
@@ -70,7 +66,7 @@ public interface IGhrh_ResumeServices : IBaseServices<Ghrh_Resume, Ghrh_ResumeDt
     Task<ServiceResult> OverTimeDeleteResume();
     Task<ServiceResult<string>> Download(List<long> ids);
 
-    Task<ServiceResult<dynamic>> QueryAssessForm(long id, long? orderId = null, [FromBody] ResumeAssessForm assessForm = null);
+    Task<ServiceResult<dynamic>> QueryAssessForm(long id, long? orderId = null, ResumeAssessForm assessForm = null);
 
     Task Shihua_OA_Sync();
 
@@ -81,7 +77,7 @@ public interface IGhrh_ResumeServices : IBaseServices<Ghrh_Resume, Ghrh_ResumeDt
 
     Task<bool> SyncToStaff(long id);
 
-    Task<ServiceResult<JArray>> QueryWorkstationInit(int langId  , string menuName);
+    Task<ServiceResult<JArray>> QueryWorkstationInit(int langId, string menuName);
 
     Task<ServiceResult<dynamic>> QueryWorkStationStatisticsChart(int langId = 1);
 

Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTemplateServices.cs

@@ -1,7 +1,4 @@
-using Tiobon.Core.Common;
-using Tiobon.Core.Model.ViewModels.Extend;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 简历模板(自定义服务接口)

Tiobon.Core.IServices/Ghrp/IGhrp_PerformanceItemServices.cs

@@ -3,6 +3,6 @@
 /// <summary>
 /// 考核指标(自定义服务接口)
 /// </summary>	
-public interface IGhrp_PerformanceItemServices :IBaseServices<Ghrp_PerformanceItem, Ghrp_PerformanceItemDto, InsertGhrp_PerformanceItemInput, EditGhrp_PerformanceItemInput>
-	{
+public interface IGhrp_PerformanceItemServices : IBaseServices<Ghrp_PerformanceItem, Ghrp_PerformanceItemDto, InsertGhrp_PerformanceItemInput, EditGhrp_PerformanceItemInput>
+{
 }

Tiobon.Core.IServices/Ghrp/IGhrp_PerformancePeriodServices.cs

@@ -1,10 +1,9 @@
-namespace Tiobon.Core.IServices
+namespace Tiobon.Core.IServices;
+
+/// <summary>
+/// 考核期间(自定义服务接口)
+/// </summary>	
+public interface IGhrp_PerformancePeriodServices : IBaseServices<Ghrp_PerformancePeriod, Ghrp_PerformancePeriodDto, InsertGhrp_PerformancePeriodInput, EditGhrp_PerformancePeriodInput>
 {
-    /// <summary>
-    /// 考核期间(自定义服务接口)
-    /// </summary>	
-    public interface IGhrp_PerformancePeriodServices :IBaseServices<Ghrp_PerformancePeriod, Ghrp_PerformancePeriodDto, InsertGhrp_PerformancePeriodInput, EditGhrp_PerformancePeriodInput>
-	{
-        Task<ServiceResult> BatchCreatePeriod(JObject jsonParam);
-    }
+    Task<ServiceResult> BatchCreatePeriod(JObject jsonParam);
 }

Tiobon.Core.IServices/Ghrp/IGhrp_PerformancePeriodTypeServices.cs

@@ -1,10 +1,9 @@
-namespace Tiobon.Core.IServices
+namespace Tiobon.Core.IServices;
+
+/// <summary>
+/// 考核周期类别(自定义服务接口)
+/// </summary>	
+public interface IGhrp_PerformancePeriodTypeServices : IBaseServices<Ghrp_PerformancePeriodType, Ghrp_PerformancePeriodTypeDto, InsertGhrp_PerformancePeriodTypeInput, EditGhrp_PerformancePeriodTypeInput>
 {
-    /// <summary>
-    /// 考核周期类别(自定义服务接口)
-    /// </summary>	
-    public interface IGhrp_PerformancePeriodTypeServices :IBaseServices<Ghrp_PerformancePeriodType, Ghrp_PerformancePeriodTypeDto, InsertGhrp_PerformancePeriodTypeInput, EditGhrp_PerformancePeriodTypeInput>
-	{
-        Task<ServiceResult<List<string>>> GetStageItems(string Stage);
-    }
+    Task<ServiceResult<List<string>>> GetStageItems(string Stage);
 }

Tiobon.Core.IServices/Ghrp/IGhrp_PerformanceTemplateServices.cs

@@ -1,9 +1,8 @@
-namespace Tiobon.Core.IServices
+namespace Tiobon.Core.IServices;
+
+/// <summary>
+/// 考核模板(自定义服务接口)
+/// </summary>	
+public interface IGhrp_PerformanceTemplateServices : IBaseServices<Ghrp_PerformanceTemplate, Ghrp_PerformanceTemplateDto, InsertGhrp_PerformanceTemplateInput, EditGhrp_PerformanceTemplateInput>
 {
-    /// <summary>
-    /// 考核模板(自定义服务接口)
-    /// </summary>	
-    public interface IGhrp_PerformanceTemplateServices :IBaseServices<Ghrp_PerformanceTemplate, Ghrp_PerformanceTemplateDto, InsertGhrp_PerformanceTemplateInput, EditGhrp_PerformanceTemplateInput>
-	{
-    }
 }

Tiobon.Core.IServices/Ghrs/IGhrs_DataBelongServices.cs

@@ -3,6 +3,6 @@
 /// <summary>
 /// 资料归属(自定义服务接口)
 /// </summary>	
-public interface IGhrs_DataBelongServices :IBaseServices<Ghrs_DataBelong, Ghrs_DataBelongDto, InsertGhrs_DataBelongInput, EditGhrs_DataBelongInput>
+public interface IGhrs_DataBelongServices : IBaseServices<Ghrs_DataBelong, Ghrs_DataBelongDto, InsertGhrs_DataBelongInput, EditGhrs_DataBelongInput>
 {
-    }
+}

Tiobon.Core.IServices/GlobalUsings.cs

@@ -3,5 +3,6 @@ global using Tiobon.Core.Base.IServices;
 global using Tiobon.Core.Model;
 global using Tiobon.Core.Model.Entity;
 global using Tiobon.Core.Model.Models;
+global using Tiobon.Core.Model.ViewModels;
 global using Tiobon.Core.Model.ViewModels.Extend;
 

Tiobon.Core.IServices/ICommonServices.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Http;
-using Tiobon.Core.Common;
 
 namespace Tiobon.Core.IServices;
 

Tiobon.Core.IServices/IGhra_GradeServices.cs

@@ -1,8 +0,0 @@
-namespace Tiobon.Core.IServices;
-
-/// <summary>
-/// 年级(自定义服务接口)
-/// </summary>	
-public interface IGhra_GradeServices :IBaseServices<Ghra_Grade, Ghra_GradeDto, InsertGhra_GradeInput, EditGhra_GradeInput>
-{
-    }

Tiobon.Core.IServices/IModuleServices.cs

@@ -3,8 +3,8 @@ namespace Tiobon.Core.IServices;
 /// <summary>
 /// ModuleServices
 /// </summary>	
-public interface IModuleServices :IBaseServices<Modules>
+public interface IModuleServices : IBaseServices<Modules>
 {
 
-       
-    }
+
+}

Tiobon.Core.IServices/IOperateLogServices.cs

@@ -4,7 +4,6 @@
 /// IOperateLogServices
 /// </summary>	
 public interface IOperateLogServices : IBaseServices<OperateLog>
-	{
-   
+{
+
 }
-                

Tiobon.Core.IServices/IReportServices.cs

@@ -1,6 +1,4 @@
-using Tiobon.Core.Common;
-
-namespace Tiobon.Core.IServices;
+namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// IReportServices

Tiobon.Core.IServices/IRoleModulePermissionServices.cs

@@ -3,8 +3,8 @@ namespace Tiobon.Core.IServices;
 /// <summary>
 /// RoleModulePermissionServices
 /// </summary>	
-public interface IRoleModulePermissionServices :IBaseServices<RoleModulePermission>
-	{
+public interface IRoleModulePermissionServices : IBaseServices<RoleModulePermission>
+{
 
     Task<List<RoleModulePermission>> GetRoleModule();
     Task<List<TestMuchTableResult>> QueryMuchTable();

Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformanceItem.Dto.Base.cs

@@ -13,196 +13,192 @@
 *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
 *│　作者：SimonHsiao                                                  │
 *└──────────────────────────────────┘
-*/ 
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
+*/
+namespace Tiobon.Core.Model.Models;
 
-namespace Tiobon.Core.Model.Models
+
+/// <summary>
+/// 考核指标 (Dto.Base)
+/// </summary>
+public class Ghrp_PerformanceItemBase
 {
 
     /// <summary>
-    /// 考核指标 (Dto.Base)
-    /// </summary>
-    public class Ghrp_PerformanceItemBase
-    {
-
-        /// <summary>
-        /// 指标编号
-        /// </summary>
-        [Display(Name = "ItemNo"), Description("指标编号"), MaxLength(500, ErrorMessage = "指标编号 不能超过 500 个字符")]
-        public string ItemNo { get; set; }
-
-        /// <summary>
-        /// 指标内容
-        /// </summary>
-        [Display(Name = "ItemName"), Description("指标内容"), MaxLength(-1, ErrorMessage = "指标内容 不能超过 -1 个字符")]
-        public string ItemName { get; set; }
-
-        /// <summary>
-        /// 指标说明
-        /// </summary>
-        [Display(Name = "ItemCaption"), Description("指标说明"), MaxLength(-1, ErrorMessage = "指标说明 不能超过 -1 个字符")]
-        public string ItemCaption { get; set; }
-
-        /// <summary>
-        /// 目标达成说明
-        /// </summary>
-        [Display(Name = "TargetCaption"), Description("目标达成说明"), MaxLength(-1, ErrorMessage = "目标达成说明 不能超过 -1 个字符")]
-        public string TargetCaption { get; set; }
-
-        /// <summary>
-        /// 一级指标分类
-        /// </summary>
-        [Display(Name = "ItemType1"), Description("一级指标分类"), MaxLength(255, ErrorMessage = "一级指标分类 不能超过 255 个字符")]
-        public string ItemType1 { get; set; }
-
-        /// <summary>
-        /// 二级指标分类
-        /// </summary>
-        [Display(Name = "ItemType2"), Description("二级指标分类"), MaxLength(255, ErrorMessage = "二级指标分类 不能超过 255 个字符")]
-        public string ItemType2 { get; set; }
-
-        /// <summary>
-        /// 三级指标分类
-        /// </summary>
-        [Display(Name = "ItemType3"), Description("三级指标分类"), MaxLength(255, ErrorMessage = "三级指标分类 不能超过 255 个字符")]
-        public string ItemType3 { get; set; }
-
-        /// <summary>
-        /// 默认权重(%)
-        /// </summary>
-        [Display(Name = "ItemWeight"), Description("默认权重(%)"), Column(TypeName = "decimal(18,2)")]
-        public decimal? ItemWeight { get; set; }
-
-        /// <summary>
-        /// 指标性质
-        /// </summary>
-        [Display(Name = "ItemKind"), Description("指标性质"), MaxLength(255, ErrorMessage = "指标性质 不能超过 255 个字符")]
-        public string ItemKind { get; set; }
-
-        /// <summary>
-        /// 评估部门分类
-        /// </summary>
-        [Display(Name = "DeptType"), Description("评估部门分类"), MaxLength(255, ErrorMessage = "评估部门分类 不能超过 255 个字符")]
-        public string DeptType { get; set; }
-
-        /// <summary>
-        /// 标签1
-        /// </summary>
-        [Display(Name = "Tag1"), Description("标签1"), MaxLength(255, ErrorMessage = "标签1 不能超过 255 个字符")]
-        public string Tag1 { get; set; }
-
-        /// <summary>
-        /// 标签2
-        /// </summary>
-        [Display(Name = "Tag2"), Description("标签2"), MaxLength(255, ErrorMessage = "标签2 不能超过 255 个字符")]
-        public string Tag2 { get; set; }
-
-        /// <summary>
-        /// 标签3
-        /// </summary>
-        [Display(Name = "Tag3"), Description("标签3"), MaxLength(255, ErrorMessage = "标签3 不能超过 255 个字符")]
-        public string Tag3 { get; set; }
-
-        /// <summary>
-        /// 有效开始日
-        /// </summary>
-        public DateTime? BeginDate { get; set; }
-
-        /// <summary>
-        /// 有效结束日
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")]
-        public string RemarkSz { get; set; }
-
-        /// <summary>
-        /// 排序
-        /// </summary>
-        public int? SortNo { get; set; }
-
-        /// <summary>
-        /// 默认标志
-        /// </summary>
-        public int? IsDefault { get; set; }
-
-        /// <summary>
-        /// 预留字段1
-        /// </summary>
-        [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")]
-        public string Reverse1 { get; set; }
-
-        /// <summary>
-        /// 预留字段2
-        /// </summary>
-        [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")]
-        public string Reverse2 { get; set; }
-
-        /// <summary>
-        /// 预留字段3
-        /// </summary>
-        [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")]
-        public string Reverse3 { get; set; }
-
-        /// <summary>
-        /// 预留字段4
-        /// </summary>
-        [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")]
-        public string Reverse4 { get; set; }
-
-        /// <summary>
-        /// 预留字段5
-        /// </summary>
-        [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")]
-        public string Reverse5 { get; set; }
-
-        /// <summary>
-        /// 预留字段6
-        /// </summary>
-        [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")]
-        public string Reverse6 { get; set; }
-
-        /// <summary>
-        /// 预留字段7
-        /// </summary>
-        [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")]
-        public string Reverse7 { get; set; }
-
-        /// <summary>
-        /// 预留字段8
-        /// </summary>
-        [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")]
-        public string Reverse8 { get; set; }
-
-        /// <summary>
-        /// 预留字段9
-        /// </summary>
-        [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")]
-        public string Reverse9 { get; set; }
-
-        /// <summary>
-        /// 预留字段10
-        /// </summary>
-        [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")]
-        public string Reverse10 { get; set; }
-
-        /// <summary>
-        /// 预留字段11
-        /// </summary>
-        public int? ReverseI1 { get; set; }
-
-        /// <summary>
-        /// 预留字段12
-        /// </summary>
-        public int? ReverseI2 { get; set; }
-
-        /// <summary>
-        /// 内置
-        /// </summary>
-        public int? BuiltIn { get; set; }
-    }
+    /// 指标编号
+    /// </summary>
+    [Display(Name = "ItemNo"), Description("指标编号"), MaxLength(500, ErrorMessage = "指标编号 不能超过 500 个字符")]
+    public string ItemNo { get; set; }
+
+    /// <summary>
+    /// 指标内容
+    /// </summary>
+    [Display(Name = "ItemName"), Description("指标内容"), MaxLength(-1, ErrorMessage = "指标内容 不能超过 -1 个字符")]
+    public string ItemName { get; set; }
+
+    /// <summary>
+    /// 指标说明
+    /// </summary>
+    [Display(Name = "ItemCaption"), Description("指标说明"), MaxLength(-1, ErrorMessage = "指标说明 不能超过 -1 个字符")]
+    public string ItemCaption { get; set; }
+
+    /// <summary>
+    /// 目标达成说明
+    /// </summary>
+    [Display(Name = "TargetCaption"), Description("目标达成说明"), MaxLength(-1, ErrorMessage = "目标达成说明 不能超过 -1 个字符")]
+    public string TargetCaption { get; set; }
+
+    /// <summary>
+    /// 一级指标分类
+    /// </summary>
+    [Display(Name = "ItemType1"), Description("一级指标分类"), MaxLength(255, ErrorMessage = "一级指标分类 不能超过 255 个字符")]
+    public string ItemType1 { get; set; }
+
+    /// <summary>
+    /// 二级指标分类
+    /// </summary>
+    [Display(Name = "ItemType2"), Description("二级指标分类"), MaxLength(255, ErrorMessage = "二级指标分类 不能超过 255 个字符")]
+    public string ItemType2 { get; set; }
+
+    /// <summary>
+    /// 三级指标分类
+    /// </summary>
+    [Display(Name = "ItemType3"), Description("三级指标分类"), MaxLength(255, ErrorMessage = "三级指标分类 不能超过 255 个字符")]
+    public string ItemType3 { get; set; }
+
+    /// <summary>
+    /// 默认权重(%)
+    /// </summary>
+    [Display(Name = "ItemWeight"), Description("默认权重(%)"), Column(TypeName = "decimal(18,2)")]
+    public decimal? ItemWeight { get; set; }
+
+    /// <summary>
+    /// 指标性质
+    /// </summary>
+    [Display(Name = "ItemKind"), Description("指标性质"), MaxLength(255, ErrorMessage = "指标性质 不能超过 255 个字符")]
+    public string ItemKind { get; set; }
+
+    /// <summary>
+    /// 评估部门分类
+    /// </summary>
+    [Display(Name = "DeptType"), Description("评估部门分类"), MaxLength(255, ErrorMessage = "评估部门分类 不能超过 255 个字符")]
+    public string DeptType { get; set; }
+
+    /// <summary>
+    /// 标签1
+    /// </summary>
+    [Display(Name = "Tag1"), Description("标签1"), MaxLength(255, ErrorMessage = "标签1 不能超过 255 个字符")]
+    public string Tag1 { get; set; }
+
+    /// <summary>
+    /// 标签2
+    /// </summary>
+    [Display(Name = "Tag2"), Description("标签2"), MaxLength(255, ErrorMessage = "标签2 不能超过 255 个字符")]
+    public string Tag2 { get; set; }
+
+    /// <summary>
+    /// 标签3
+    /// </summary>
+    [Display(Name = "Tag3"), Description("标签3"), MaxLength(255, ErrorMessage = "标签3 不能超过 255 个字符")]
+    public string Tag3 { get; set; }
+
+    /// <summary>
+    /// 有效开始日
+    /// </summary>
+    public DateTime? BeginDate { get; set; }
+
+    /// <summary>
+    /// 有效结束日
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")]
+    public string RemarkSz { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int? SortNo { get; set; }
+
+    /// <summary>
+    /// 默认标志
+    /// </summary>
+    public int? IsDefault { get; set; }
+
+    /// <summary>
+    /// 预留字段1
+    /// </summary>
+    [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")]
+    public string Reverse1 { get; set; }
+
+    /// <summary>
+    /// 预留字段2
+    /// </summary>
+    [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")]
+    public string Reverse2 { get; set; }
+
+    /// <summary>
+    /// 预留字段3
+    /// </summary>
+    [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")]
+    public string Reverse3 { get; set; }
+
+    /// <summary>
+    /// 预留字段4
+    /// </summary>
+    [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")]
+    public string Reverse4 { get; set; }
+
+    /// <summary>
+    /// 预留字段5
+    /// </summary>
+    [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")]
+    public string Reverse5 { get; set; }
+
+    /// <summary>
+    /// 预留字段6
+    /// </summary>
+    [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")]
+    public string Reverse6 { get; set; }
+
+    /// <summary>
+    /// 预留字段7
+    /// </summary>
+    [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")]
+    public string Reverse7 { get; set; }
+
+    /// <summary>
+    /// 预留字段8
+    /// </summary>
+    [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")]
+    public string Reverse8 { get; set; }
+
+    /// <summary>
+    /// 预留字段9
+    /// </summary>
+    [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")]
+    public string Reverse9 { get; set; }
+
+    /// <summary>
+    /// 预留字段10
+    /// </summary>
+    [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")]
+    public string Reverse10 { get; set; }
+
+    /// <summary>
+    /// 预留字段11
+    /// </summary>
+    public int? ReverseI1 { get; set; }
+
+    /// <summary>
+    /// 预留字段12
+    /// </summary>
+    public int? ReverseI2 { get; set; }
+
+    /// <summary>
+    /// 内置
+    /// </summary>
+    public int? BuiltIn { get; set; }
 }

Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformancePeriod.Dto.Base.cs

@@ -13,197 +13,193 @@
 *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
 *│　作者：SimonHsiao                                                  │
 *└──────────────────────────────────┘
-*/ 
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
+*/
+namespace Tiobon.Core.Model.Models;
 
-namespace Tiobon.Core.Model.Models
+
+/// <summary>
+/// 考核期间 (Dto.Base)
+/// </summary>
+public class Ghrp_PerformancePeriodBase
 {
+    /// <summary>
+    /// 年度
+    /// </summary>
+    [Display(Name = "YYYY"), Description("年度"), MaxLength(50, ErrorMessage = "年度 不能超过 50 个字符")]
+    public string YYYY { get; set; }
+    /// <summary>
+    /// 期间编号
+    /// </summary>
+    [Display(Name = "PeriodNo"), Description("期间编号"), MaxLength(50, ErrorMessage = "期间编号 不能超过 50 个字符")]
+    public string PeriodNo { get; set; }
+
+    /// <summary>
+    /// 期间名称
+    /// </summary>
+    [Display(Name = "PeriodName"), Description("期间名称"), MaxLength(50, ErrorMessage = "期间名称 不能超过 50 个字符")]
+    public string PeriodName { get; set; }
+
+    /// <summary>
+    /// 考核周期类别ID
+    /// </summary>
+    public long? PerformancePeriodTypeID { get; set; }
+
+    /// <summary>
+    /// 考核周期类别
+    /// </summary>
+    [Display(Name = "PeriodType"), Description("考核周期类别"), MaxLength(255, ErrorMessage = "考核周期类别 不能超过 255 个字符")]
+    public string PeriodType { get; set; }
+
+    /// <summary>
+    /// 考核阶段数
+    /// </summary>
+    [Display(Name = "Stage"), Description("考核阶段数"), MaxLength(255, ErrorMessage = "考核阶段数 不能超过 255 个字符")]
+    public string Stage { get; set; }
+
+    /// <summary>
+    /// 阶段名称
+    /// </summary>
+    [Display(Name = "StageItem"), Description("阶段名称"), MaxLength(255, ErrorMessage = "阶段名称 不能超过 255 个字符")]
+    public string StageItem { get; set; }
+
+    /// <summary>
+    /// 当期类别
+    /// </summary>
+    public int? PeriodNum { get; set; }
+
+    /// <summary>
+    /// 当期是否启用
+    /// </summary>
+    public int? IsUsing { get; set; }
+
+    /// <summary>
+    /// 期间开始日
+    /// </summary>
+    public string? BeginDate { get; set; }
+
+    /// <summary>
+    /// 期间结束日
+    /// </summary>
+    public string? EndDate { get; set; }
+
+    /// <summary>
+    /// 员工填写开始日
+    /// </summary>
+    public string? StaffBeginDate { get; set; }
+
+    /// <summary>
+    /// 员工填写结束日
+    /// </summary>
+    public string? StaffEndDate { get; set; }
+
+    /// <summary>
+    /// 主管填写开始日
+    /// </summary>
+    public string? MGBeginDate { get; set; }
+
+    /// <summary>
+    /// 主管填写结束日
+    /// </summary>
+    public string? MGEndDate { get; set; }
+
+    /// <summary>
+    /// 人员状态基准日
+    /// </summary>
+    public string? OnJobBaseDate { get; set; }
+
+    /// <summary>
+    /// 前置期间
+    /// </summary>
+    public long? PrePerformancePeriodID { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")]
+    public string RemarkSz { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int? SortNo { get; set; }
+
+    /// <summary>
+    /// 默认标志
+    /// </summary>
+    public int? IsDefault { get; set; }
+
+    /// <summary>
+    /// 预留字段1
+    /// </summary>
+    [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")]
+    public string Reverse1 { get; set; }
+
+    /// <summary>
+    /// 预留字段2
+    /// </summary>
+    [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")]
+    public string Reverse2 { get; set; }
+
+    /// <summary>
+    /// 预留字段3
+    /// </summary>
+    [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")]
+    public string Reverse3 { get; set; }
+
+    /// <summary>
+    /// 预留字段4
+    /// </summary>
+    [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")]
+    public string Reverse4 { get; set; }
+
+    /// <summary>
+    /// 预留字段5
+    /// </summary>
+    [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")]
+    public string Reverse5 { get; set; }
+
+    /// <summary>
+    /// 预留字段6
+    /// </summary>
+    [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")]
+    public string Reverse6 { get; set; }
+
+    /// <summary>
+    /// 预留字段7
+    /// </summary>
+    [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")]
+    public string Reverse7 { get; set; }
+
+    /// <summary>
+    /// 预留字段8
+    /// </summary>
+    [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")]
+    public string Reverse8 { get; set; }
+
+    /// <summary>
+    /// 预留字段9
+    /// </summary>
+    [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")]
+    public string Reverse9 { get; set; }
+
+    /// <summary>
+    /// 预留字段10
+    /// </summary>
+    [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")]
+    public string Reverse10 { get; set; }
+
+    /// <summary>
+    /// 预留字段11
+    /// </summary>
+    public int? ReverseI1 { get; set; }
+
+    /// <summary>
+    /// 预留字段12
+    /// </summary>
+    public int? ReverseI2 { get; set; }
 
     /// <summary>
-    /// 考核期间 (Dto.Base)
-    /// </summary>
-    public class Ghrp_PerformancePeriodBase
-    {
-        /// <summary>
-        /// 年度
-        /// </summary>
-        [Display(Name = "YYYY"), Description("年度"), MaxLength(50, ErrorMessage = "年度 不能超过 50 个字符")]
-        public string YYYY { get; set; }
-        /// <summary>
-        /// 期间编号
-        /// </summary>
-        [Display(Name = "PeriodNo"), Description("期间编号"), MaxLength(50, ErrorMessage = "期间编号 不能超过 50 个字符")]
-        public string PeriodNo { get; set; }
-
-        /// <summary>
-        /// 期间名称
-        /// </summary>
-        [Display(Name = "PeriodName"), Description("期间名称"), MaxLength(50, ErrorMessage = "期间名称 不能超过 50 个字符")]
-        public string PeriodName { get; set; }
-
-        /// <summary>
-        /// 考核周期类别ID
-        /// </summary>
-        public long? PerformancePeriodTypeID { get; set; }
-
-        /// <summary>
-        /// 考核周期类别
-        /// </summary>
-        [Display(Name = "PeriodType"), Description("考核周期类别"), MaxLength(255, ErrorMessage = "考核周期类别 不能超过 255 个字符")]
-        public string PeriodType { get; set; }
-
-        /// <summary>
-        /// 考核阶段数
-        /// </summary>
-        [Display(Name = "Stage"), Description("考核阶段数"), MaxLength(255, ErrorMessage = "考核阶段数 不能超过 255 个字符")]
-        public string Stage { get; set; }
-
-        /// <summary>
-        /// 阶段名称
-        /// </summary>
-        [Display(Name = "StageItem"), Description("阶段名称"), MaxLength(255, ErrorMessage = "阶段名称 不能超过 255 个字符")]
-        public string StageItem { get; set; }
-
-        /// <summary>
-        /// 当期类别
-        /// </summary>
-        public int? PeriodNum { get; set; }
-
-        /// <summary>
-        /// 当期是否启用
-        /// </summary>
-        public int? IsUsing { get; set; }
-
-        /// <summary>
-        /// 期间开始日
-        /// </summary>
-        public string? BeginDate { get; set; }
-
-        /// <summary>
-        /// 期间结束日
-        /// </summary>
-        public string? EndDate { get; set; }
-
-        /// <summary>
-        /// 员工填写开始日
-        /// </summary>
-        public string? StaffBeginDate { get; set; }
-
-        /// <summary>
-        /// 员工填写结束日
-        /// </summary>
-        public string? StaffEndDate { get; set; }
-
-        /// <summary>
-        /// 主管填写开始日
-        /// </summary>
-        public string? MGBeginDate { get; set; }
-
-        /// <summary>
-        /// 主管填写结束日
-        /// </summary>
-        public string? MGEndDate { get; set; }
-
-        /// <summary>
-        /// 人员状态基准日
-        /// </summary>
-        public string? OnJobBaseDate { get; set; }
-
-        /// <summary>
-        /// 前置期间
-        /// </summary>
-        public long? PrePerformancePeriodID { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")]
-        public string RemarkSz { get; set; }
-
-        /// <summary>
-        /// 排序
-        /// </summary>
-        public int? SortNo { get; set; }
-
-        /// <summary>
-        /// 默认标志
-        /// </summary>
-        public int? IsDefault { get; set; }
-
-        /// <summary>
-        /// 预留字段1
-        /// </summary>
-        [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")]
-        public string Reverse1 { get; set; }
-
-        /// <summary>
-        /// 预留字段2
-        /// </summary>
-        [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")]
-        public string Reverse2 { get; set; }
-
-        /// <summary>
-        /// 预留字段3
-        /// </summary>
-        [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")]
-        public string Reverse3 { get; set; }
-
-        /// <summary>
-        /// 预留字段4
-        /// </summary>
-        [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")]
-        public string Reverse4 { get; set; }
-
-        /// <summary>
-        /// 预留字段5
-        /// </summary>
-        [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")]
-        public string Reverse5 { get; set; }
-
-        /// <summary>
-        /// 预留字段6
-        /// </summary>
-        [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")]
-        public string Reverse6 { get; set; }
-
-        /// <summary>
-        /// 预留字段7
-        /// </summary>
-        [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")]
-        public string Reverse7 { get; set; }
-
-        /// <summary>
-        /// 预留字段8
-        /// </summary>
-        [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")]
-        public string Reverse8 { get; set; }
-
-        /// <summary>
-        /// 预留字段9
-        /// </summary>
-        [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")]
-        public string Reverse9 { get; set; }
-
-        /// <summary>
-        /// 预留字段10
-        /// </summary>
-        [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")]
-        public string Reverse10 { get; set; }
-
-        /// <summary>
-        /// 预留字段11
-        /// </summary>
-        public int? ReverseI1 { get; set; }
-
-        /// <summary>
-        /// 预留字段12
-        /// </summary>
-        public int? ReverseI2 { get; set; }
-
-        /// <summary>
-        /// 内置
-        /// </summary>
-        public int? BuiltIn { get; set; }
-    }
+    /// 内置
+    /// </summary>
+    public int? BuiltIn { get; set; }
 }

Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformancePeriodType.Dto.Base.cs

@@ -14,147 +14,143 @@
 *│　作者：SimonHsiao                                                  │
 *└──────────────────────────────────┘
 */
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
+namespace Tiobon.Core.Model.Models;
 
-namespace Tiobon.Core.Model.Models
+
+/// <summary>
+/// 考核周期类别 (Dto.Base)
+/// </summary>
+public class Ghrp_PerformancePeriodTypeBase
 {
 
     /// <summary>
-    /// 考核周期类别 (Dto.Base)
-    /// </summary>
-    public class Ghrp_PerformancePeriodTypeBase
-    {
-
-        /// <summary>
-        /// 类别编号
-        /// </summary>
-        [Display(Name = "PeriodTypeNo"), Description("类别编号"), MaxLength(32, ErrorMessage = "类别编号 不能超过 32 个字符")]
-        public string PeriodTypeNo { get; set; }
-
-        /// <summary>
-        /// 类别名称
-        /// </summary>
-        [Display(Name = "PeriodTypeName"), Description("类别名称"), MaxLength(32, ErrorMessage = "类别名称 不能超过 32 个字符")]
-        public string PeriodTypeName { get; set; }
-
-        /// <summary>
-        /// 多语编号
-        /// </summary>
-        [Display(Name = "MKey"), Description("多语编号"), MaxLength(255, ErrorMessage = "多语编号 不能超过 255 个字符")]
-        public string MKey { get; set; }
-
-        /// <summary>
-        /// 考核阶段数
-        /// </summary>
-        [Display(Name = "Stage"), Description("考核阶段数"), MaxLength(255, ErrorMessage = "考核阶段数 不能超过 255 个字符")]
-        public string Stage { get; set; }
-
-        /// <summary>
-        /// 考核阶段名称
-        /// </summary>
-        [Display(Name = "StageItems"), Description("考核阶段名称"), MaxLength(255, ErrorMessage = "考核阶段名称 不能超过 255 个字符")]
-        public string StageItems { get; set; }
-
-        /// <summary>
-        /// 集团数据归属ID
-        /// </summary>
-        public int? DataBelongID { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")]
-        public string RemarkSz { get; set; }
-
-        /// <summary>
-        /// 排序
-        /// </summary>
-        public int? SortNo { get; set; }
-
-        /// <summary>
-        /// 默认标志
-        /// </summary>
-        public int? IsDefault { get; set; }
-
-        /// <summary>
-        /// 预留字段1
-        /// </summary>
-        [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")]
-        public string Reverse1 { get; set; }
-
-        /// <summary>
-        /// 预留字段2
-        /// </summary>
-        [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")]
-        public string Reverse2 { get; set; }
-
-        /// <summary>
-        /// 预留字段3
-        /// </summary>
-        [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")]
-        public string Reverse3 { get; set; }
-
-        /// <summary>
-        /// 预留字段4
-        /// </summary>
-        [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")]
-        public string Reverse4 { get; set; }
-
-        /// <summary>
-        /// 预留字段5
-        /// </summary>
-        [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")]
-        public string Reverse5 { get; set; }
-
-        /// <summary>
-        /// 预留字段6
-        /// </summary>
-        [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")]
-        public string Reverse6 { get; set; }
-
-        /// <summary>
-        /// 预留字段7
-        /// </summary>
-        [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")]
-        public string Reverse7 { get; set; }
-
-        /// <summary>
-        /// 预留字段8
-        /// </summary>
-        [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")]
-        public string Reverse8 { get; set; }
-
-        /// <summary>
-        /// 预留字段9
-        /// </summary>
-        [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")]
-        public string Reverse9 { get; set; }
-
-        /// <summary>
-        /// 预留字段10
-        /// </summary>
-        [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")]
-        public string Reverse10 { get; set; }
-
-        /// <summary>
-        /// 预留字段11
-        /// </summary>
-        public int? ReverseI1 { get; set; }
-
-        /// <summary>
-        /// 预留字段12
-        /// </summary>
-        public int? ReverseI2 { get; set; }
-
-        /// <summary>
-        /// 内置
-        /// </summary>
-        public int? BuiltIn { get; set; }
-         
-        /// <summary>
-        /// 考核阶段名称
-        /// </summary>
-        public List<string> StageItems_List { get; set; } = new List<string>();
-    }
+    /// 类别编号
+    /// </summary>
+    [Display(Name = "PeriodTypeNo"), Description("类别编号"), MaxLength(32, ErrorMessage = "类别编号 不能超过 32 个字符")]
+    public string PeriodTypeNo { get; set; }
+
+    /// <summary>
+    /// 类别名称
+    /// </summary>
+    [Display(Name = "PeriodTypeName"), Description("类别名称"), MaxLength(32, ErrorMessage = "类别名称 不能超过 32 个字符")]
+    public string PeriodTypeName { get; set; }
+
+    /// <summary>
+    /// 多语编号
+    /// </summary>
+    [Display(Name = "MKey"), Description("多语编号"), MaxLength(255, ErrorMessage = "多语编号 不能超过 255 个字符")]
+    public string MKey { get; set; }
+
+    /// <summary>
+    /// 考核阶段数
+    /// </summary>
+    [Display(Name = "Stage"), Description("考核阶段数"), MaxLength(255, ErrorMessage = "考核阶段数 不能超过 255 个字符")]
+    public string Stage { get; set; }
+
+    /// <summary>
+    /// 考核阶段名称
+    /// </summary>
+    [Display(Name = "StageItems"), Description("考核阶段名称"), MaxLength(255, ErrorMessage = "考核阶段名称 不能超过 255 个字符")]
+    public string StageItems { get; set; }
+
+    /// <summary>
+    /// 集团数据归属ID
+    /// </summary>
+    public int? DataBelongID { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")]
+    public string RemarkSz { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int? SortNo { get; set; }
+
+    /// <summary>
+    /// 默认标志
+    /// </summary>
+    public int? IsDefault { get; set; }
+
+    /// <summary>
+    /// 预留字段1
+    /// </summary>
+    [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")]
+    public string Reverse1 { get; set; }
+
+    /// <summary>
+    /// 预留字段2
+    /// </summary>
+    [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")]
+    public string Reverse2 { get; set; }
+
+    /// <summary>
+    /// 预留字段3
+    /// </summary>
+    [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")]
+    public string Reverse3 { get; set; }
+
+    /// <summary>
+    /// 预留字段4
+    /// </summary>
+    [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")]
+    public string Reverse4 { get; set; }
+
+    /// <summary>
+    /// 预留字段5
+    /// </summary>
+    [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")]
+    public string Reverse5 { get; set; }
+
+    /// <summary>
+    /// 预留字段6
+    /// </summary>
+    [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")]
+    public string Reverse6 { get; set; }
+
+    /// <summary>
+    /// 预留字段7
+    /// </summary>
+    [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")]
+    public string Reverse7 { get; set; }
+
+    /// <summary>
+    /// 预留字段8
+    /// </summary>
+    [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")]
+    public string Reverse8 { get; set; }
+
+    /// <summary>
+    /// 预留字段9
+    /// </summary>
+    [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")]
+    public string Reverse9 { get; set; }
+
+    /// <summary>
+    /// 预留字段10
+    /// </summary>
+    [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")]
+    public string Reverse10 { get; set; }
+
+    /// <summary>
+    /// 预留字段11
+    /// </summary>
+    public int? ReverseI1 { get; set; }
+
+    /// <summary>
+    /// 预留字段12
+    /// </summary>
+    public int? ReverseI2 { get; set; }
+
+    /// <summary>
+    /// 内置
+    /// </summary>
+    public int? BuiltIn { get; set; }
+
+    /// <summary>
+    /// 考核阶段名称
+    /// </summary>
+    public List<string> StageItems_List { get; set; } = new List<string>();
 }

Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformanceTemplate.Dto.Base.cs

@@ -13,176 +13,172 @@
 *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
 *│　作者：SimonHsiao                                                  │
 *└──────────────────────────────────┘
-*/ 
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
+*/
+namespace Tiobon.Core.Model.Models;
 
-namespace Tiobon.Core.Model.Models
+
+/// <summary>
+/// 考核模板 (Dto.Base)
+/// </summary>
+public class Ghrp_PerformanceTemplateBase
 {
 
     /// <summary>
-    /// 考核模板 (Dto.Base)
-    /// </summary>
-    public class Ghrp_PerformanceTemplateBase
-    {
-
-        /// <summary>
-        /// 考核模板编号
-        /// </summary>
-        [Display(Name = "TemplateNo"), Description("考核模板编号"), MaxLength(100, ErrorMessage = "考核模板编号 不能超过 100 个字符")]
-        public string TemplateNo { get; set; }
-
-        /// <summary>
-        /// 考核模板名称
-        /// </summary>
-        [Display(Name = "TemplateName"), Description("考核模板名称"), MaxLength(100, ErrorMessage = "考核模板名称 不能超过 100 个字符")]
-        public string TemplateName { get; set; }
-
-        /// <summary>
-        /// 考核周期类别ID
-        /// </summary>
-        public long? PerformancePeriodTypeID { get; set; }
-
-        /// <summary>
-        /// 考核周期类别编号
-        /// </summary>
-        [Display(Name = "PeriodTypeNo"), Description("考核周期类别编号"), MaxLength(200, ErrorMessage = "考核周期类别编号 不能超过 200 个字符")]
-        public string PeriodTypeNo { get; set; }
-
-        /// <summary>
-        /// 考核阶段
-        /// </summary>
-        [Display(Name = "StageItem"), Description("考核阶段"), MaxLength(100, ErrorMessage = "考核阶段 不能超过 100 个字符")]
-        public string StageItem { get; set; }
-
-        /// <summary>
-        /// 考核对象
-        /// </summary>
-        public long? StaffGroupID { get; set; }
-
-        /// <summary>
-        /// 总分
-        /// </summary>
-        [Display(Name = "TotalScore"), Description("总分"), Column(TypeName = "decimal(18,2)")]
-        public decimal? TotalScore { get; set; }
-
-        /// <summary>
-        /// 表单是否允许超过总分
-        /// </summary>
-        public int? IsOutScore { get; set; }
-
-        /// <summary>
-        /// 考核模板权重
-        /// </summary>
-        [Display(Name = "Weight"), Description("考核模板权重"), Column(TypeName = "decimal(18,2)")]
-        public decimal? Weight { get; set; }
-
-        /// <summary>
-        /// 考核阶数（含本人）
-        /// </summary>
-        public int? LevelNum { get; set; }
-
-        /// <summary>
-        /// 考核主管显示方式
-        /// </summary>
-        [Display(Name = "MGShowType"), Description("考核主管显示方式"), MaxLength(255, ErrorMessage = "考核主管显示方式 不能超过 255 个字符")]
-        public string MGShowType { get; set; }
-
-        /// <summary>
-        /// 模板类型
-        /// </summary>
-        [Display(Name = "TemplateType"), Description("模板类型"), MaxLength(255, ErrorMessage = "模板类型 不能超过 255 个字符")]
-        public string TemplateType { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")]
-        public string RemarkSz { get; set; }
-
-        /// <summary>
-        /// 排序
-        /// </summary>
-        public int? SortNo { get; set; }
-
-        /// <summary>
-        /// 默认标志
-        /// </summary>
-        public int? IsDefault { get; set; }
-
-        /// <summary>
-        /// 预留字段1
-        /// </summary>
-        [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")]
-        public string Reverse1 { get; set; }
-
-        /// <summary>
-        /// 预留字段2
-        /// </summary>
-        [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")]
-        public string Reverse2 { get; set; }
-
-        /// <summary>
-        /// 预留字段3
-        /// </summary>
-        [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")]
-        public string Reverse3 { get; set; }
-
-        /// <summary>
-        /// 预留字段4
-        /// </summary>
-        [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")]
-        public string Reverse4 { get; set; }
-
-        /// <summary>
-        /// 预留字段5
-        /// </summary>
-        [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")]
-        public string Reverse5 { get; set; }
-
-        /// <summary>
-        /// 预留字段6
-        /// </summary>
-        [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")]
-        public string Reverse6 { get; set; }
-
-        /// <summary>
-        /// 预留字段7
-        /// </summary>
-        [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")]
-        public string Reverse7 { get; set; }
-
-        /// <summary>
-        /// 预留字段8
-        /// </summary>
-        [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")]
-        public string Reverse8 { get; set; }
-
-        /// <summary>
-        /// 预留字段9
-        /// </summary>
-        [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")]
-        public string Reverse9 { get; set; }
-
-        /// <summary>
-        /// 预留字段10
-        /// </summary>
-        [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")]
-        public string Reverse10 { get; set; }
-
-        /// <summary>
-        /// 预留字段11
-        /// </summary>
-        public int? ReverseI1 { get; set; }
-
-        /// <summary>
-        /// 预留字段12
-        /// </summary>
-        public int? ReverseI2 { get; set; }
-
-        /// <summary>
-        /// 内置
-        /// </summary>
-        public int? BuiltIn { get; set; }
-    }
+    /// 考核模板编号
+    /// </summary>
+    [Display(Name = "TemplateNo"), Description("考核模板编号"), MaxLength(100, ErrorMessage = "考核模板编号 不能超过 100 个字符")]
+    public string TemplateNo { get; set; }
+
+    /// <summary>
+    /// 考核模板名称
+    /// </summary>
+    [Display(Name = "TemplateName"), Description("考核模板名称"), MaxLength(100, ErrorMessage = "考核模板名称 不能超过 100 个字符")]
+    public string TemplateName { get; set; }
+
+    /// <summary>
+    /// 考核周期类别ID
+    /// </summary>
+    public long? PerformancePeriodTypeID { get; set; }
+
+    /// <summary>
+    /// 考核周期类别编号
+    /// </summary>
+    [Display(Name = "PeriodTypeNo"), Description("考核周期类别编号"), MaxLength(200, ErrorMessage = "考核周期类别编号 不能超过 200 个字符")]
+    public string PeriodTypeNo { get; set; }
+
+    /// <summary>
+    /// 考核阶段
+    /// </summary>
+    [Display(Name = "StageItem"), Description("考核阶段"), MaxLength(100, ErrorMessage = "考核阶段 不能超过 100 个字符")]
+    public string StageItem { get; set; }
+
+    /// <summary>
+    /// 考核对象
+    /// </summary>
+    public long? StaffGroupID { get; set; }
+
+    /// <summary>
+    /// 总分
+    /// </summary>
+    [Display(Name = "TotalScore"), Description("总分"), Column(TypeName = "decimal(18,2)")]
+    public decimal? TotalScore { get; set; }
+
+    /// <summary>
+    /// 表单是否允许超过总分
+    /// </summary>
+    public int? IsOutScore { get; set; }
+
+    /// <summary>
+    /// 考核模板权重
+    /// </summary>
+    [Display(Name = "Weight"), Description("考核模板权重"), Column(TypeName = "decimal(18,2)")]
+    public decimal? Weight { get; set; }
+
+    /// <summary>
+    /// 考核阶数（含本人）
+    /// </summary>
+    public int? LevelNum { get; set; }
+
+    /// <summary>
+    /// 考核主管显示方式
+    /// </summary>
+    [Display(Name = "MGShowType"), Description("考核主管显示方式"), MaxLength(255, ErrorMessage = "考核主管显示方式 不能超过 255 个字符")]
+    public string MGShowType { get; set; }
+
+    /// <summary>
+    /// 模板类型
+    /// </summary>
+    [Display(Name = "TemplateType"), Description("模板类型"), MaxLength(255, ErrorMessage = "模板类型 不能超过 255 个字符")]
+    public string TemplateType { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")]
+    public string RemarkSz { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int? SortNo { get; set; }
+
+    /// <summary>
+    /// 默认标志
+    /// </summary>
+    public int? IsDefault { get; set; }
+
+    /// <summary>
+    /// 预留字段1
+    /// </summary>
+    [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")]
+    public string Reverse1 { get; set; }
+
+    /// <summary>
+    /// 预留字段2
+    /// </summary>
+    [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")]
+    public string Reverse2 { get; set; }
+
+    /// <summary>
+    /// 预留字段3
+    /// </summary>
+    [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")]
+    public string Reverse3 { get; set; }
+
+    /// <summary>
+    /// 预留字段4
+    /// </summary>
+    [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")]
+    public string Reverse4 { get; set; }
+
+    /// <summary>
+    /// 预留字段5
+    /// </summary>
+    [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")]
+    public string Reverse5 { get; set; }
+
+    /// <summary>
+    /// 预留字段6
+    /// </summary>
+    [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")]
+    public string Reverse6 { get; set; }
+
+    /// <summary>
+    /// 预留字段7
+    /// </summary>
+    [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")]
+    public string Reverse7 { get; set; }
+
+    /// <summary>
+    /// 预留字段8
+    /// </summary>
+    [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")]
+    public string Reverse8 { get; set; }
+
+    /// <summary>
+    /// 预留字段9
+    /// </summary>
+    [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")]
+    public string Reverse9 { get; set; }
+
+    /// <summary>
+    /// 预留字段10
+    /// </summary>
+    [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")]
+    public string Reverse10 { get; set; }
+
+    /// <summary>
+    /// 预留字段11
+    /// </summary>
+    public int? ReverseI1 { get; set; }
+
+    /// <summary>
+    /// 预留字段12
+    /// </summary>
+    public int? ReverseI2 { get; set; }
+
+    /// <summary>
+    /// 内置
+    /// </summary>
+    public int? BuiltIn { get; set; }
 }

Tiobon.Core.Services/Ghra/Ghra_StaffGroupDetailServices.cs

@@ -1,23 +1,15 @@
-
-using Tiobon.Core.IServices;
-using Tiobon.Core.Model.Models;
-using Tiobon.Core.Services.BASE;
-using Tiobon.Core.IRepository.Base;
-using Tiobon.Core.Common.Caches;
+namespace Tiobon.Core.Services;
 
-namespace Tiobon.Core.Services
+/// <summary>
+/// 人员群组明细 (服务)
+/// </summary>
+public class Ghra_StaffGroupDetailServices : BaseServices<Ghra_StaffGroupDetail, Ghra_StaffGroupDetailDto, InsertGhra_StaffGroupDetailInput, EditGhra_StaffGroupDetailInput>, IGhra_StaffGroupDetailServices
 {
-	/// <summary>
-	/// 人员群组明细 (服务)
-	/// </summary>
-    public class Ghra_StaffGroupDetailServices : BaseServices<Ghra_StaffGroupDetail, Ghra_StaffGroupDetailDto, InsertGhra_StaffGroupDetailInput, EditGhra_StaffGroupDetailInput>, IGhra_StaffGroupDetailServices
+    private readonly IBaseRepository<Ghra_StaffGroupDetail> _dal;
+    public Ghra_StaffGroupDetailServices(ICaching caching, IBaseRepository<Ghra_StaffGroupDetail> dal)
     {
-        private readonly IBaseRepository<Ghra_StaffGroupDetail> _dal;
-        public Ghra_StaffGroupDetailServices(ICaching caching, IBaseRepository<Ghra_StaffGroupDetail> dal)
-        {
-            this._dal = dal;
-            base.BaseDal = dal;
-            base._caching = caching;
-        }
+        this._dal = dal;
+        base.BaseDal = dal;
+        base._caching = caching;
     }
 }

Tiobon.Core.Services/Ghrp/Ghrp_PerformanceItemServices.cs

@@ -1,63 +1,53 @@
-
-using Tiobon.Core.IServices;
-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;
 
-namespace Tiobon.Core.Services
+/// <summary>
+/// 考核指标 (服务)
+/// </summary>
+public class Ghrp_PerformanceItemServices : BaseServices<Ghrp_PerformanceItem, Ghrp_PerformanceItemDto, InsertGhrp_PerformanceItemInput, EditGhrp_PerformanceItemInput>, IGhrp_PerformanceItemServices
 {
-    /// <summary>
-    /// 考核指标 (服务)
-    /// </summary>
-    public class Ghrp_PerformanceItemServices : BaseServices<Ghrp_PerformanceItem, Ghrp_PerformanceItemDto, InsertGhrp_PerformanceItemInput, EditGhrp_PerformanceItemInput>, IGhrp_PerformanceItemServices
+    private readonly IBaseRepository<Ghrp_PerformanceItem> _dal;
+    public Ghrp_PerformanceItemServices(ICaching caching, IBaseRepository<Ghrp_PerformanceItem> dal)
     {
-        private readonly IBaseRepository<Ghrp_PerformanceItem> _dal;
-        public Ghrp_PerformanceItemServices(ICaching caching, IBaseRepository<Ghrp_PerformanceItem> dal)
-        {
-            this._dal = dal;
-            base.BaseDal = dal;
-            base._caching = caching;
-        }
+        this._dal = dal;
+        base.BaseDal = dal;
+        base._caching = caching;
+    }
 
-        public override async Task<ServicePageResult<Ghrp_PerformanceItemDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
-        {
+    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))
+        string? ItemStatus = null;
+        if (filter.jsonParam != null)
+            foreach (JProperty jProperty in filter.jsonParam.Properties())
             {
-                condition = $@" (case when BeginDate > convert(date,getdate()) then '2' 
+                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);
+        }
+        var result = await base.QueryFilterPage(filter, condition, IsEnable);
 
-            result.result.DT_TableDataT1.ForEach(async x =>
-            {
-                x.ItemType1 = await GetParaLabel("PerformanceItemType1", x.ItemType1);
-                x.ItemType2 = await GetParaLabel("PerformanceItemType2", x.ItemType2);
-                x.ItemType3 = await GetParaLabel("PerformanceItemType3", x.ItemType3);
-                x.ItemKind = await GetParaLabel("PerformanceItemKind", x.ItemKind);
-                x.DeptType = await GetParaLabel("PerformanceDeptType", x.DeptType);
-                x.Tag1 = await GetParaLabel("PerformanceTag1", x.Tag1);
-                x.Tag2 = await GetParaLabel("PerformanceTag2", x.Tag2);
-                x.Tag3 = await GetParaLabel("PerformanceTag3", x.Tag3);
-            });
+        result.result.DT_TableDataT1.ForEach(async x =>
+        {
+            x.ItemType1 = await GetParaLabel("PerformanceItemType1", x.ItemType1);
+            x.ItemType2 = await GetParaLabel("PerformanceItemType2", x.ItemType2);
+            x.ItemType3 = await GetParaLabel("PerformanceItemType3", x.ItemType3);
+            x.ItemKind = await GetParaLabel("PerformanceItemKind", x.ItemKind);
+            x.DeptType = await GetParaLabel("PerformanceDeptType", x.DeptType);
+            x.Tag1 = await GetParaLabel("PerformanceTag1", x.Tag1);
+            x.Tag2 = await GetParaLabel("PerformanceTag2", x.Tag2);
+            x.Tag3 = await GetParaLabel("PerformanceTag3", x.Tag3);
+        });
 
-            return result;
-        }
+        return result;
     }
 }

Tiobon.Core.Services/Ghrp/Ghrp_PerformancePeriodServices.cs

@@ -1,95 +1,86 @@
-
-using Tiobon.Core.IServices;
-using Tiobon.Core.Model.Models;
-using Tiobon.Core.Services.BASE;
-using Tiobon.Core.IRepository.Base;
-using Tiobon.Core.Common.Caches;
-using Tiobon.Core.Common.DB.Dapper.Extensions;
-using Microsoft.EntityFrameworkCore.SqlServer.Query.Internal;
+namespace Tiobon.Core.Services;
 
-namespace Tiobon.Core.Services
+/// <summary>
+/// 考核期间 (服务)
+/// </summary>
+public class Ghrp_PerformancePeriodServices : BaseServices<Ghrp_PerformancePeriod, Ghrp_PerformancePeriodDto, InsertGhrp_PerformancePeriodInput, EditGhrp_PerformancePeriodInput>, IGhrp_PerformancePeriodServices
 {
-	/// <summary>
-	/// 考核期间 (服务)
-	/// </summary>
-    public class Ghrp_PerformancePeriodServices : BaseServices<Ghrp_PerformancePeriod, Ghrp_PerformancePeriodDto, InsertGhrp_PerformancePeriodInput, EditGhrp_PerformancePeriodInput>, IGhrp_PerformancePeriodServices
+    private readonly IBaseRepository<Ghrp_PerformancePeriod> _dal;
+    public Ghrp_PerformancePeriodServices(ICaching caching, IBaseRepository<Ghrp_PerformancePeriod> dal)
+    {
+        this._dal = dal;
+        base.BaseDal = dal;
+        base._caching = caching;
+    }
+    /// <summary>
+    /// 查询
+    /// </summary>
+    /// <param name="filter"></param>
+    /// <param name="condition"></param>
+    /// <param name="IsEnable"></param>
+    /// <returns></returns>
+    public override async Task<ServicePageResult<Ghrp_PerformancePeriodDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
     {
-        private readonly IBaseRepository<Ghrp_PerformancePeriod> _dal;
-        public Ghrp_PerformancePeriodServices(ICaching caching, IBaseRepository<Ghrp_PerformancePeriod> dal)
-        {
-            this._dal = dal;
-            base.BaseDal = dal;
-            base._caching = caching;
-        }
-        /// <summary>
-        /// 查询
-        /// </summary>
-        /// <param name="filter"></param>
-        /// <param name="condition"></param>
-        /// <param name="IsEnable"></param>
-        /// <returns></returns>
-        public override async Task<ServicePageResult<Ghrp_PerformancePeriodDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
-        {
 
-            var result = await base.QueryFilterPage(filter, condition, IsEnable);
+        var result = await base.QueryFilterPage(filter, condition, IsEnable);
 
-            result.result.DT_TableDataT1.ForEach(async x =>
-            {
-                x.BeginDate = string.IsNullOrEmpty(x.BeginDate)?"":Convert.ToDateTime(x.BeginDate).ToString("yyyy-MM-dd");
-                x.EndDate = string.IsNullOrEmpty(x.EndDate) ? "" : Convert.ToDateTime(x.EndDate).ToString("yyyy-MM-dd");
-                x.StaffBeginDate = string.IsNullOrEmpty(x.StaffBeginDate) ? "" : Convert.ToDateTime(x.StaffBeginDate).ToString("yyyy-MM-dd");
-                x.StaffEndDate = string.IsNullOrEmpty(x.StaffEndDate) ? "" : Convert.ToDateTime(x.StaffEndDate).ToString("yyyy-MM-dd");
-                x.MGBeginDate = string.IsNullOrEmpty(x.MGBeginDate) ? "" : Convert.ToDateTime(x.MGBeginDate).ToString("yyyy-MM-dd");
-                x.MGEndDate = string.IsNullOrEmpty(x.MGEndDate) ? "" : Convert.ToDateTime(x.MGEndDate).ToString("yyyy-MM-dd");
-                x.OnJobBaseDate = string.IsNullOrEmpty(x.OnJobBaseDate) ? "" : Convert.ToDateTime(x.OnJobBaseDate).ToString("yyyy-MM-dd");
+        result.result.DT_TableDataT1.ForEach(async x =>
+        {
+            x.BeginDate = string.IsNullOrEmpty(x.BeginDate)?"":Convert.ToDateTime(x.BeginDate).ToString("yyyy-MM-dd");
+            x.EndDate = string.IsNullOrEmpty(x.EndDate) ? "" : Convert.ToDateTime(x.EndDate).ToString("yyyy-MM-dd");
+            x.StaffBeginDate = string.IsNullOrEmpty(x.StaffBeginDate) ? "" : Convert.ToDateTime(x.StaffBeginDate).ToString("yyyy-MM-dd");
+            x.StaffEndDate = string.IsNullOrEmpty(x.StaffEndDate) ? "" : Convert.ToDateTime(x.StaffEndDate).ToString("yyyy-MM-dd");
+            x.MGBeginDate = string.IsNullOrEmpty(x.MGBeginDate) ? "" : Convert.ToDateTime(x.MGBeginDate).ToString("yyyy-MM-dd");
+            x.MGEndDate = string.IsNullOrEmpty(x.MGEndDate) ? "" : Convert.ToDateTime(x.MGEndDate).ToString("yyyy-MM-dd");
+            x.OnJobBaseDate = string.IsNullOrEmpty(x.OnJobBaseDate) ? "" : Convert.ToDateTime(x.OnJobBaseDate).ToString("yyyy-MM-dd");
 
-                x.Stage = await GetParaLabel("PerformanceStage", x.Stage);
-                x.StageItem = await GetParaLabel("PerformanceStageItem", x.StageItem);
-                x.PerformancePeriodTypeName = await Db.Queryable<Ghrp_PerformancePeriodType>().Where(a => a.Id==x.PerformancePeriodTypeID).Select(x=> x.PeriodTypeName).FirstAsync();
-                x.PrePerformancePeriodName = await Db.Queryable<Ghrp_PerformancePeriod>().Where(a => a.Id == x.PrePerformancePeriodID).Select(x => x.PeriodName).FirstAsync();
-            });
+            x.Stage = await GetParaLabel("PerformanceStage", x.Stage);
+            x.StageItem = await GetParaLabel("PerformanceStageItem", x.StageItem);
+            x.PerformancePeriodTypeName = await Db.Queryable<Ghrp_PerformancePeriodType>().Where(a => a.Id==x.PerformancePeriodTypeID).Select(x=> x.PeriodTypeName).FirstAsync();
+            x.PrePerformancePeriodName = await Db.Queryable<Ghrp_PerformancePeriod>().Where(a => a.Id == x.PrePerformancePeriodID).Select(x => x.PeriodName).FirstAsync();
+        });
 
-            return result;
-        }
+        return result;
+    }
 
-        public override async Task<long> Add(InsertGhrp_PerformancePeriodInput entity)
-        {
-            if (entity.PerformancePeriodTypeID != null)
-                entity.PeriodType = await Db.Queryable<Ghrp_PerformancePeriodType>().Where(a => a.Id == entity.PerformancePeriodTypeID).Select(x => x.PeriodTypeNo).FirstAsync(); 
-            var result = await base.Add(entity);
+    public override async Task<long> Add(InsertGhrp_PerformancePeriodInput entity)
+    {
+        if (entity.PerformancePeriodTypeID != null)
+            entity.PeriodType = await Db.Queryable<Ghrp_PerformancePeriodType>().Where(a => a.Id == entity.PerformancePeriodTypeID).Select(x => x.PeriodTypeNo).FirstAsync(); 
+        var result = await base.Add(entity);
 
-            return result;
-        }
+        return result;
+    }
 
-        public override async Task<bool> Update(long Id, EditGhrp_PerformancePeriodInput editModel)
-        {
-            if (editModel.PerformancePeriodTypeID != null)
-                editModel.PeriodType = await Db.Queryable<Ghrp_PerformancePeriodType>().Where(a => a.Id == editModel.PerformancePeriodTypeID).Select(x => x.PeriodTypeNo).FirstAsync();
+    public override async Task<bool> Update(long Id, EditGhrp_PerformancePeriodInput editModel)
+    {
+        if (editModel.PerformancePeriodTypeID != null)
+            editModel.PeriodType = await Db.Queryable<Ghrp_PerformancePeriodType>().Where(a => a.Id == editModel.PerformancePeriodTypeID).Select(x => x.PeriodTypeNo).FirstAsync();
 
-            var result = await base.Update(Id, editModel, null, ["Status"]);
-            return result;
-        }
+        var result = await base.Update(Id, editModel, null, ["Status"]);
+        return result;
+    }
 
-        /// <summary>
-        /// 批量生成期间
-        /// </summary>
-        /// <param name="Stage"></param>
-        /// <returns></returns>
-        public async Task<ServiceResult> BatchCreatePeriod(JObject jsonParam)
-        { 
-            string PerformancePeriodTypeID = jsonParam["PerformancePeriodTypeID"]?.Value<string>() ?? ""; // 考核周期类别
-            if (string.IsNullOrEmpty(PerformancePeriodTypeID)) return ServiceResult.OprateSuccess("考核周期类别不能为空！");
-            string YYYY = jsonParam["YYYY"]?.Value<string>() ?? "";                    // 展开年度
-            if (string.IsNullOrEmpty(YYYY)) return ServiceResult.OprateSuccess("展开年度不能为空！"); 
-            string BeginDate = jsonParam["BeginDate"]?.Value<string>() ?? "";          // 期间开始日
-            if (string.IsNullOrEmpty(BeginDate)) return ServiceResult.OprateSuccess("期间开始日不能为空！");
-            string StaffBeginDate = jsonParam["StaffBeginDate"]?.Value<string>() ?? "";// 员工填写开始日
-            string StaffDays = jsonParam["StaffDays"]?.Value<string>() ?? "";          // 填写天数 
-            string MGBeginDate = jsonParam["MGBeginDate"]?.Value<string>() ?? "";      // 主管填写开始日
-            string MGDays = jsonParam["MGDays"]?.Value<string>() ?? "";                // 主管填写天数
-            string OnJobBaseType = jsonParam["OnJobBaseType"]?.Value<string>() ?? "";  // 人员状态基准日
-            if (string.IsNullOrEmpty(OnJobBaseType)) return ServiceResult.OprateSuccess("人员状态基准日不能为空！");
-            string sql = @$" 
+    /// <summary>
+    /// 批量生成期间
+    /// </summary>
+    /// <param name="Stage"></param>
+    /// <returns></returns>
+    public async Task<ServiceResult> BatchCreatePeriod(JObject jsonParam)
+    { 
+        string PerformancePeriodTypeID = jsonParam["PerformancePeriodTypeID"]?.Value<string>() ?? ""; // 考核周期类别
+        if (string.IsNullOrEmpty(PerformancePeriodTypeID)) return ServiceResult.OprateSuccess("考核周期类别不能为空！");
+        string YYYY = jsonParam["YYYY"]?.Value<string>() ?? "";                    // 展开年度
+        if (string.IsNullOrEmpty(YYYY)) return ServiceResult.OprateSuccess("展开年度不能为空！"); 
+        string BeginDate = jsonParam["BeginDate"]?.Value<string>() ?? "";          // 期间开始日
+        if (string.IsNullOrEmpty(BeginDate)) return ServiceResult.OprateSuccess("期间开始日不能为空！");
+        string StaffBeginDate = jsonParam["StaffBeginDate"]?.Value<string>() ?? "";// 员工填写开始日
+        string StaffDays = jsonParam["StaffDays"]?.Value<string>() ?? "";          // 填写天数 
+        string MGBeginDate = jsonParam["MGBeginDate"]?.Value<string>() ?? "";      // 主管填写开始日
+        string MGDays = jsonParam["MGDays"]?.Value<string>() ?? "";                // 主管填写天数
+        string OnJobBaseType = jsonParam["OnJobBaseType"]?.Value<string>() ?? "";  // 人员状态基准日
+        if (string.IsNullOrEmpty(OnJobBaseType)) return ServiceResult.OprateSuccess("人员状态基准日不能为空！");
+        string sql = @$" 
                             Declare @PerformancePeriodTypeID nvarchar(100) = '{PerformancePeriodTypeID}';
                             Declare @YYYY nvarchar(100) = '{YYYY}'
                             Declare @BeginDate nvarchar(100) = '{BeginDate}'
@@ -194,9 +185,8 @@ namespace Tiobon.Core.Services
                              from Ghrp_PerformancePeriod a
                              where Reverse1=@GUID
             ";
-            await Db.Ado.ExecuteCommandAsync(sql);
-            return ServiceResult.OprateSuccess("批量展开成功！");
-        }
-
+        await Db.Ado.ExecuteCommandAsync(sql);
+        return ServiceResult.OprateSuccess("批量展开成功！");
     }
+
 }

Tiobon.Core.Services/Ghrp/Ghrp_PerformancePeriodTypeServices.cs

@@ -1,76 +1,67 @@
-
-using Tiobon.Core.IServices;
-using Tiobon.Core.Model.Models;
-using Tiobon.Core.Services.BASE;
-using Tiobon.Core.IRepository.Base;
-using Tiobon.Core.Common.Caches;
-using Tiobon.Core.Common.DB.Dapper.Extensions;
+namespace Tiobon.Core.Services;
 
-namespace Tiobon.Core.Services
+/// <summary>
+/// 考核周期类别 (服务)
+/// </summary>
+public class Ghrp_PerformancePeriodTypeServices : BaseServices<Ghrp_PerformancePeriodType, Ghrp_PerformancePeriodTypeDto, InsertGhrp_PerformancePeriodTypeInput, EditGhrp_PerformancePeriodTypeInput>, IGhrp_PerformancePeriodTypeServices
 {
-    /// <summary>
-    /// 考核周期类别 (服务)
-    /// </summary>
-    public class Ghrp_PerformancePeriodTypeServices : BaseServices<Ghrp_PerformancePeriodType, Ghrp_PerformancePeriodTypeDto, InsertGhrp_PerformancePeriodTypeInput, EditGhrp_PerformancePeriodTypeInput>, IGhrp_PerformancePeriodTypeServices
+    private readonly IBaseRepository<Ghrp_PerformancePeriodType> _dal;
+    public Ghrp_PerformancePeriodTypeServices(ICaching caching, IBaseRepository<Ghrp_PerformancePeriodType> dal)
+    {
+        this._dal = dal;
+        base.BaseDal = dal;
+        base._caching = caching;
+    }
+    public override async Task<ServicePageResult<Ghrp_PerformancePeriodTypeDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
     {
-        private readonly IBaseRepository<Ghrp_PerformancePeriodType> _dal;
-        public Ghrp_PerformancePeriodTypeServices(ICaching caching, IBaseRepository<Ghrp_PerformancePeriodType> dal)
-        {
-            this._dal = dal;
-            base.BaseDal = dal;
-            base._caching = caching;
-        }
-        public override async Task<ServicePageResult<Ghrp_PerformancePeriodTypeDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
-        {
-
-            var result = await base.QueryFilterPage(filter, condition, IsEnable);
 
-            result.result.DT_TableDataT1.ForEach(async x =>
-            {
-                x.Stage = await GetParaLabel("PerformanceStage", x.Stage);
-                x.StageItems = await GetParaLabelListString("Performance", "PerformanceStageItem", x.StageItems);
-                x.DataBelongName =  Db.Ado.GetString("select DataBelongName from Ghrs_DataBelong where DataBelongID=@DataBelongID"
-                    , new { DataBelongID=x.DataBelongID });
-            }); 
-            return result;
-        }
+        var result = await base.QueryFilterPage(filter, condition, IsEnable);
 
-        public override async Task<long> Add(InsertGhrp_PerformancePeriodTypeInput entity)
+        result.result.DT_TableDataT1.ForEach(async x =>
         {
-            if (entity.StageItems_List != null)
-                entity.StageItems = JsonHelper.ObjToJson(entity.StageItems_List);
-            var result = await base.Add(entity);
+            x.Stage = await GetParaLabel("PerformanceStage", x.Stage);
+            x.StageItems = await GetParaLabelListString("Performance", "PerformanceStageItem", x.StageItems);
+            x.DataBelongName =  Db.Ado.GetString("select DataBelongName from Ghrs_DataBelong where DataBelongID=@DataBelongID"
+                , new { DataBelongID=x.DataBelongID });
+        }); 
+        return result;
+    }
 
-            return result;
-        }
+    public override async Task<long> Add(InsertGhrp_PerformancePeriodTypeInput entity)
+    {
+        if (entity.StageItems_List != null)
+            entity.StageItems = JsonHelper.ObjToJson(entity.StageItems_List);
+        var result = await base.Add(entity);
 
-        public override async Task<bool> Update(long Id, EditGhrp_PerformancePeriodTypeInput editModel)
-        {
-            if (editModel.StageItems_List != null)
-                editModel.StageItems = JsonHelper.ObjToJson(editModel.StageItems_List);
-            var result = await base.Update(Id, editModel, null, ["Status"]);
-            return result;
-        }
+        return result;
+    }
 
-        public override async Task<ServiceFormResult<Ghrp_PerformancePeriodTypeDto>> QueryForm(QueryForm body)
-        {
-            var result = await base.QueryForm(body);
+    public override async Task<bool> Update(long Id, EditGhrp_PerformancePeriodTypeInput editModel)
+    {
+        if (editModel.StageItems_List != null)
+            editModel.StageItems = JsonHelper.ObjToJson(editModel.StageItems_List);
+        var result = await base.Update(Id, editModel, null, ["Status"]);
+        return result;
+    }
+
+    public override async Task<ServiceFormResult<Ghrp_PerformancePeriodTypeDto>> QueryForm(QueryForm body)
+    {
+        var result = await base.QueryForm(body);
 
-            var StageItems = result.result.DT_TableDataT1[0].StageItems;
-            if (!string.IsNullOrWhiteSpace(StageItems))
-                result.result.DT_TableDataT1[0].StageItems_List = JsonConvert.DeserializeObject<List<string>>(StageItems);
+        var StageItems = result.result.DT_TableDataT1[0].StageItems;
+        if (!string.IsNullOrWhiteSpace(StageItems))
+            result.result.DT_TableDataT1[0].StageItems_List = JsonConvert.DeserializeObject<List<string>>(StageItems);
 
-            return result;
-        }
+        return result;
+    }
 
-        public async Task<ServiceResult<List<string>>> GetStageItems(string Stage)
-        {
-            List<string> StageItmes = [];
-            if (Stage == "1Q1C") StageItmes = new List<string> { "C" };
-            if (Stage == "1Q2C") StageItmes = new List<string> { "A", "C" };
-            if (Stage == "1Q3C") StageItmes = new List<string> { "A", "B", "C" };
+    public async Task<ServiceResult<List<string>>> GetStageItems(string Stage)
+    {
+        List<string> StageItmes = [];
+        if (Stage == "1Q1C") StageItmes = new List<string> { "C" };
+        if (Stage == "1Q2C") StageItmes = new List<string> { "A", "C" };
+        if (Stage == "1Q3C") StageItmes = new List<string> { "A", "B", "C" };
 
-            return ServiceResult<List<string>>.OprateSuccess("查询成功！", StageItmes);
-        }
+        return ServiceResult<List<string>>.OprateSuccess("查询成功！", StageItmes);
     }
 }

Tiobon.Core.Services/Ghrp/Ghrp_PerformanceTemplateServices.cs

@@ -1,62 +1,53 @@
-
-using Tiobon.Core.IServices;
-using Tiobon.Core.Model.Models;
-using Tiobon.Core.Services.BASE;
-using Tiobon.Core.IRepository.Base;
-using Tiobon.Core.Common.Caches;
-using Tiobon.Core.Common.DB.Dapper.Extensions;
-
-namespace Tiobon.Core.Services
+namespace Tiobon.Core.Services;
+
+/// <summary>
+/// 考核模板 (服务)
+/// </summary>
+public class Ghrp_PerformanceTemplateServices : BaseServices<Ghrp_PerformanceTemplate, Ghrp_PerformanceTemplateDto, InsertGhrp_PerformanceTemplateInput, EditGhrp_PerformanceTemplateInput>, IGhrp_PerformanceTemplateServices
 {
-	/// <summary>
-	/// 考核模板 (服务)
-	/// </summary>
-    public class Ghrp_PerformanceTemplateServices : BaseServices<Ghrp_PerformanceTemplate, Ghrp_PerformanceTemplateDto, InsertGhrp_PerformanceTemplateInput, EditGhrp_PerformanceTemplateInput>, IGhrp_PerformanceTemplateServices
+    private readonly IBaseRepository<Ghrp_PerformanceTemplate> _dal;
+    public Ghrp_PerformanceTemplateServices(ICaching caching, IBaseRepository<Ghrp_PerformanceTemplate> dal)
     {
-        private readonly IBaseRepository<Ghrp_PerformanceTemplate> _dal;
-        public Ghrp_PerformanceTemplateServices(ICaching caching, IBaseRepository<Ghrp_PerformanceTemplate> dal)
-        {
-            this._dal = dal;
-            base.BaseDal = dal;
-            base._caching = caching;
-        }
+        this._dal = dal;
+        base.BaseDal = dal;
+        base._caching = caching;
+    }
 
-        public override async Task<ServicePageResult<Ghrp_PerformanceTemplateDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
-        {
+    public override async Task<ServicePageResult<Ghrp_PerformanceTemplateDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
+    {
+
+        var result = await base.QueryFilterPage(filter, condition, IsEnable);
 
-            var result = await base.QueryFilterPage(filter, condition, IsEnable);
-
-            result.result.DT_TableDataT1.ForEach(async x =>
-            {
-                x.StageItem = await GetParaLabel("PerformanceStageItem", x.StageItem);
-                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 ID=@PerformancePeriodTypeID"
-                    , new { PerformancePeriodTypeID = x.PerformancePeriodTypeID });
-            });
-            return result;
-        }
-
-        public override async Task<long> Add(InsertGhrp_PerformanceTemplateInput entity)
+        result.result.DT_TableDataT1.ForEach(async x =>
         {
-            if (entity.PerformancePeriodTypeID != null)
-                entity.PeriodTypeNo = await Db.Queryable<Ghrp_PerformancePeriodType>().Where(a => a.Id == entity.PerformancePeriodTypeID).Select(x => x.PeriodTypeNo).FirstAsync();
-            var result = await base.Add(entity);
+            x.StageItem = await GetParaLabel("PerformanceStageItem", x.StageItem);
+            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 ID=@PerformancePeriodTypeID"
+                , new { PerformancePeriodTypeID = x.PerformancePeriodTypeID });
+        });
+        return result;
+    }
 
-            return result;
-        }
+    public override async Task<long> Add(InsertGhrp_PerformanceTemplateInput entity)
+    {
+        if (entity.PerformancePeriodTypeID != null)
+            entity.PeriodTypeNo = await Db.Queryable<Ghrp_PerformancePeriodType>().Where(a => a.Id == entity.PerformancePeriodTypeID).Select(x => x.PeriodTypeNo).FirstAsync();
+        var result = await base.Add(entity);
 
-        public override async Task<bool> Update(long Id, EditGhrp_PerformanceTemplateInput editModel)
-        {
-            if (editModel.PerformancePeriodTypeID != null)
-                editModel.PeriodTypeNo = await Db.Queryable<Ghrp_PerformancePeriodType>().Where(a => a.Id == editModel.PerformancePeriodTypeID).Select(x => x.PeriodTypeNo).FirstAsync();
+        return result;
+    }
+
+    public override async Task<bool> Update(long Id, EditGhrp_PerformanceTemplateInput editModel)
+    {
+        if (editModel.PerformancePeriodTypeID != null)
+            editModel.PeriodTypeNo = await Db.Queryable<Ghrp_PerformancePeriodType>().Where(a => a.Id == editModel.PerformancePeriodTypeID).Select(x => x.PeriodTypeNo).FirstAsync();
 
-            var result = await base.Update(Id, editModel, null, ["Status"]);
-            return result;
-        }
+        var result = await base.Update(Id, editModel, null, ["Status"]);
+        return result;
     }
 }

Tiobon.Core/Tiobon.Core.xml

@@ -79,14 +79,14 @@
             初始化 (注入)
             </summary>
         </member>
-        <member name="M:Tiobon.Core.Controllers.BaseController`5.QueryByFilter(Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Controllers.BaseController`5.QueryByFilter(Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             根据条件查询数据
             </summary>
             <param name="body">条件</param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Controllers.BaseController`5.QueryDel(Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Controllers.BaseController`5.QueryDel(Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             查询作废
             </summary>
@@ -100,7 +100,7 @@
             <param name="Id">主键ID</param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Controllers.BaseController`5.QueryForm(Tiobon.Core.Common.QueryForm)">
+        <member name="M:Tiobon.Core.Controllers.BaseController`5.QueryForm(Tiobon.Core.Model.Entity.QueryForm)">
             <summary>
              查询菜单表单信息
             </summary>
@@ -148,7 +148,7 @@
             <param name="Ids">主键IDs</param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Controllers.BaseController`5.ExportExcel(Tiobon.Core.Common.QueryExport)">
+        <member name="M:Tiobon.Core.Controllers.BaseController`5.ExportExcel(Tiobon.Core.Model.Entity.QueryExport)">
             <summary>
             Excel导出
             </summary>
@@ -205,7 +205,7 @@
             <param name="Keywords"></param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Controllers.CommonController.ExportExcelAsync(Tiobon.Core.Common.QueryExport)">
+        <member name="M:Tiobon.Core.Controllers.CommonController.ExportExcelAsync(Tiobon.Core.Model.Entity.QueryExport)">
             <summary>
             导出Excel
             </summary>
@@ -512,7 +512,7 @@
             </summary>
             <param name="service"></param>
         </member>
-        <member name="M:Tiobon.Core.Controllers.ReportController.QueryNewStaffAsync(Tiobon.Core.Common.QueryBody,System.String)">
+        <member name="M:Tiobon.Core.Controllers.ReportController.QueryNewStaffAsync(Tiobon.Core.Model.Entity.QueryBody,System.String)">
             <summary>
             获取新入职人员列表
             </summary>
@@ -749,7 +749,7 @@
             培训记录(Controller)
             </summary>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_CertificateController.Query(System.Int64,Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_CertificateController.Query(System.Int64,Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             根据条件查询数据
             </summary>
@@ -804,7 +804,7 @@
             课程(Controller)
             </summary>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_CourseController.QueryList(System.String,Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_CourseController.QueryList(System.String,Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             根据条件查询数据
             </summary>
@@ -827,7 +827,7 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_CourseController.QueryCourseAndScene(Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_CourseController.QueryCourseAndScene(Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             统计
             </summary>
@@ -873,14 +873,14 @@
             学分记录(Controller)
             </summary>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_CreditPointController.QueryTotal(Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_CreditPointController.QueryTotal(Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             查询明细数据
             </summary>
             <param name="body">body</param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_CreditPointController.QueryDetail(Tiobon.Core.Common.QueryBody,System.String)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_CreditPointController.QueryDetail(Tiobon.Core.Model.Entity.QueryBody,System.String)">
             <summary>
             根据工号查询学分明细
             </summary>
@@ -916,7 +916,7 @@
             </summary> 
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_ExamController.QueryList(System.String,Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_ExamController.QueryList(System.String,Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             根据条件查询数据
             </summary>
@@ -1019,7 +1019,7 @@
             <param name="Id"></param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_ExamPaperController.QueryList(System.String,Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_ExamPaperController.QueryList(System.String,Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             根据条件查询数据
             </summary>
@@ -1072,7 +1072,7 @@
             考试记录(Controller)
             </summary>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_ExamRecordController.Query(System.String,Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_ExamRecordController.Query(System.String,Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             根据条件查询数据
             </summary>
@@ -1194,7 +1194,7 @@
             开班管理(Controller)
             </summary>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_OpenClassController.QueryByStatus(Tiobon.Core.Common.QueryBody,System.String)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_OpenClassController.QueryByStatus(Tiobon.Core.Model.Entity.QueryBody,System.String)">
             <summary>
             根据条件查询数据
             </summary>
@@ -1355,7 +1355,7 @@
             培训计划(Controller)
             </summary>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_PlanController.QueryByStatus(Tiobon.Core.Common.QueryBody,System.String)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_PlanController.QueryByStatus(Tiobon.Core.Model.Entity.QueryBody,System.String)">
             <summary>
             根据条件查询数据
             </summary>
@@ -1363,21 +1363,21 @@
             <param name="status">status</param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_PlanController.QueryUshioPlan(Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_PlanController.QueryUshioPlan(Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             根据条件查询数据
             </summary>
             <param name="body">条件</param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_PlanController.ExportUshioPlan(Tiobon.Core.Common.QueryExport)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_PlanController.ExportUshioPlan(Tiobon.Core.Model.Entity.QueryExport)">
             <summary>
             根据条件查询数据
             </summary>
             <param name="body">条件</param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_PlanController.QueryCompletionRateBLT(Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_PlanController.QueryCompletionRateBLT(Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             培训计划达成率——宝连通
             </summary>
@@ -1421,7 +1421,7 @@
             培训需求(Controller)
             </summary>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_RequestController.QueryByStatus(Tiobon.Core.Common.QueryBody,System.String)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_RequestController.QueryByStatus(Tiobon.Core.Model.Entity.QueryBody,System.String)">
             <summary>
             根据条件查询数据
             </summary>
@@ -1429,7 +1429,7 @@
             <param name="status">status</param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_RequestController.QueryFormByStatus(Tiobon.Core.Common.QueryForm)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_RequestController.QueryFormByStatus(Tiobon.Core.Model.Entity.QueryForm)">
             <summary>
              查询菜单表单信息
             </summary>
@@ -1441,7 +1441,7 @@
             必选修查询(Controller)
             </summary>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_RequiredCourseController.QueryByStatus(Tiobon.Core.Common.QueryBody,System.String)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_RequiredCourseController.QueryByStatus(Tiobon.Core.Model.Entity.QueryBody,System.String)">
             <summary>
             根据条件查询数据
             </summary>
@@ -1469,28 +1469,28 @@
             培训记录(Controller)
             </summary>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_StudyRecordController.QueryESSSearchFields(Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_StudyRecordController.QueryESSSearchFields(Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             获取ESS查询条件
             </summary>
             <param name="body"></param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_StudyRecordController.QueryESS(Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_StudyRecordController.QueryESS(Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             获取ESS查询条件
             </summary>
             <param name="body"></param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_StudyRecordController.QueryStaff(Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_StudyRecordController.QueryStaff(Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             获取学习记录
             </summary>
             <param name="body"></param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_StudyRecordController.QueryCourse(Tiobon.Core.Common.QueryBody,System.Int64)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_StudyRecordController.QueryCourse(Tiobon.Core.Model.Entity.QueryBody,System.Int64)">
             <summary>
             获取课程
             </summary>
@@ -1514,7 +1514,7 @@
             <param name="attachmentId"></param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_StudyRecordController.QueryTeacherClassAnalysis(Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_StudyRecordController.QueryTeacherClassAnalysis(Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             讲师上课分析
             </summary>
@@ -1543,7 +1543,7 @@
             必选修规则结果(Controller)
             </summary>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_StudyRuleResultController.Query(System.Int64,Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_StudyRuleResultController.Query(System.Int64,Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             根据条件查询数据
             </summary>
@@ -1561,7 +1561,7 @@
             问卷调查(Controller)
             </summary>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_SurveyController.QueryByStatus(Tiobon.Core.Common.QueryBody,System.String)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_SurveyController.QueryByStatus(Tiobon.Core.Model.Entity.QueryBody,System.String)">
             <summary>
             根据条件查询数据
             </summary>
@@ -1715,7 +1715,7 @@
             培训讲师异动(Controller)
             </summary>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_TeacherChangeController.QueryByStatus(Tiobon.Core.Common.QueryBody,System.String)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_TeacherChangeController.QueryByStatus(Tiobon.Core.Model.Entity.QueryBody,System.String)">
             <summary>
             根据条件查询数据
             </summary>
@@ -1728,7 +1728,7 @@
             Ghre_Teacher(Controller)
             </summary>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_TeacherController.QueryByStatus(Tiobon.Core.Common.QueryBody,System.String)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_TeacherController.QueryByStatus(Tiobon.Core.Model.Entity.QueryBody,System.String)">
             <summary>
             根据条件查询数据
             </summary>
@@ -1756,7 +1756,7 @@
             【牛尾】培训计划(Controller)
             </summary>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghre_UshioPlanController.QueryByStatus(Tiobon.Core.Common.QueryBody,System.String)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_UshioPlanController.QueryByStatus(Tiobon.Core.Model.Entity.QueryBody,System.String)">
             <summary>
             根据条件查询数据
             </summary>
@@ -1796,7 +1796,7 @@
             人力需求维护(Controller)
             </summary>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_HumanRequestController.QueryByStatus(Tiobon.Core.Common.QueryBody,System.String)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_HumanRequestController.QueryByStatus(Tiobon.Core.Model.Entity.QueryBody,System.String)">
             <summary>
             根据条件查询数据
             </summary>
@@ -1804,7 +1804,7 @@
             <param name="status">status</param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_HumanRequestController.ExportSummaryExcel(Tiobon.Core.Common.QueryExport)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_HumanRequestController.ExportSummaryExcel(Tiobon.Core.Model.Entity.QueryExport)">
             <summary>
             Excel导出
             </summary>
@@ -1883,7 +1883,7 @@
             </summary> 
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeController.QueryByStatus(Tiobon.Core.Common.QueryBody,System.String)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeController.QueryByStatus(Tiobon.Core.Model.Entity.QueryBody,System.String)">
             <summary>
             根据条件查询数据
             </summary>
@@ -1960,7 +1960,7 @@
             </summary> 
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeController.ExportByStatus(Tiobon.Core.Common.QueryBody,System.String)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeController.ExportByStatus(Tiobon.Core.Model.Entity.QueryBody,System.String)">
             <summary>
             根据条件查询数据
             </summary>
@@ -2087,7 +2087,7 @@
             <param name="input">简历Ids</param> 
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeController.QueryESS(Tiobon.Core.Common.QueryBody)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeController.QueryESS(Tiobon.Core.Model.Entity.QueryBody)">
             <summary>
             ESS端查询面试记录
             </summary> 
@@ -2171,7 +2171,7 @@
             <param name="langId">语言别</param>  
             <returns></returns> 
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeController.ExportHireExcel(Tiobon.Core.Common.QueryExport)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeController.ExportHireExcel(Tiobon.Core.Model.Entity.QueryExport)">
             <summary>
             Excel导出录用名单
             </summary>
@@ -2226,7 +2226,7 @@
             <param name="isPublish"></param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeTemplateController.QueryGroup(Tiobon.Core.Common.QueryForm)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeTemplateController.QueryGroup(Tiobon.Core.Model.Entity.QueryForm)">
             <summary>
             获取分组数据
             </summary>
@@ -2249,28 +2249,28 @@
             <param name="columns"></param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeTemplateController.QueryTemplateColumn(Tiobon.Core.Common.QueryForm)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeTemplateController.QueryTemplateColumn(Tiobon.Core.Model.Entity.QueryForm)">
             <summary>
             获取分组数据
             </summary>
             <param name="filter"></param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeTemplateController.ExceteTemplateColumnChange(Tiobon.Core.Common.QueryForm)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeTemplateController.ExceteTemplateColumnChange(Tiobon.Core.Model.Entity.QueryForm)">
             <summary>
             执行分组列栏位操作
             </summary>
             <param name="filter"></param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeTemplateController.QueryTemplateColumnSingle(Tiobon.Core.Common.QueryForm)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeTemplateController.QueryTemplateColumnSingle(Tiobon.Core.Model.Entity.QueryForm)">
             <summary>
             查询模板栏位
             </summary>
             <param name="filter"></param>
             <returns></returns>
         </member>
-        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeTemplateController.PT_GHR30_StaffTemplate_IUD(Tiobon.Core.Common.QueryForm1)">
+        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeTemplateController.PT_GHR30_StaffTemplate_IUD(Tiobon.Core.Model.Entity.QueryForm1)">
             <summary>
             查询模板栏位
             </summary>