优化，简化引用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>
 {
 }
-}

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_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;
+namespace Tiobon.Core.IServices;
-using Tiobon.Core.Model.ViewModels.Extend;
-
-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;
+namespace Tiobon.Core.IServices;
-using Tiobon.Core.Model;
-
-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;
+namespace Tiobon.Core.IServices;
-using Tiobon.Core.Model.ViewModels.Extend;
-
-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;
+namespace Tiobon.Core.IServices;
-using Tiobon.Core.Model;
-
-namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 培训需求(自定义服务接口)

Tiobon.Core.IServices/Ghre/IGhre_StaffGroupServices.cs

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

Tiobon.Core.IServices/Ghre/IGhre_StudyRecordServices.cs

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

Tiobon.Core.IServices/Ghre/IGhre_TitleSkill_BoltoneServices.cs

@@ -1,8 +1,4 @@
-using Tiobon.Core.Common;
+namespace Tiobon.Core.IServices;
-using Tiobon.Core.Model.ViewModels.Extend;
-using Tiobon.Core.Model;
-
-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,8 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
+namespace Tiobon.Core.IServices;
-using Tiobon.Core.Common;
-using Tiobon.Core.Model.ViewModels.Extend;
-
-namespace Tiobon.Core.IServices;
 
 /// <summary>
 /// 个人简历(自定义服务接口)
@@ -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();
 

Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTemplateServices.cs

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

Tiobon.Core.IServices/Ghrp/IGhrp_PerformancePeriodServices.cs

@@ -1,5 +1,5 @@
-namespace Tiobon.Core.IServices
+namespace Tiobon.Core.IServices;
-{
+
 /// <summary>
 /// 考核期间(自定义服务接口)
 /// </summary>	
@@ -7,4 +7,3 @@
 {
     Task<ServiceResult> BatchCreatePeriod(JObject jsonParam);
 }
-}

Tiobon.Core.IServices/Ghrp/IGhrp_PerformancePeriodTypeServices.cs

@@ -1,5 +1,5 @@
-namespace Tiobon.Core.IServices
+namespace Tiobon.Core.IServices;
-{
+
 /// <summary>
 /// 考核周期类别(自定义服务接口)
 /// </summary>	
@@ -7,4 +7,3 @@
 {
     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>
 {
 }
-}

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/IOperateLogServices.cs

@@ -7,4 +7,3 @@ 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.Model/Base/Ghrp/Ghrp_PerformanceItem.Dto.Base.cs

@@ -14,11 +14,8 @@
 *│　作者：SimonHsiao                                                  │
 *└──────────────────────────────────┘
 */
-using System.ComponentModel;
+namespace Tiobon.Core.Model.Models;
-using System.ComponentModel.DataAnnotations;
 
-namespace Tiobon.Core.Model.Models
-{
 
 /// <summary>
 /// 考核指标 (Dto.Base)
@@ -205,4 +202,3 @@ namespace Tiobon.Core.Model.Models
     /// </summary>
     public int? BuiltIn { get; set; }
 }
-}

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

@@ -14,11 +14,8 @@
 *│　作者：SimonHsiao                                                  │
 *└──────────────────────────────────┘
 */
-using System.ComponentModel;
+namespace Tiobon.Core.Model.Models;
-using System.ComponentModel.DataAnnotations;
 
-namespace Tiobon.Core.Model.Models
-{
 
 /// <summary>
 /// 考核期间 (Dto.Base)
@@ -206,4 +203,3 @@ namespace Tiobon.Core.Model.Models
     /// </summary>
     public int? BuiltIn { get; set; }
 }
-}

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

@@ -14,11 +14,8 @@
 *│　作者：SimonHsiao                                                  │
 *└──────────────────────────────────┘
 */
-using System.ComponentModel;
+namespace Tiobon.Core.Model.Models;
-using System.ComponentModel.DataAnnotations;
 
-namespace Tiobon.Core.Model.Models
-{
 
 /// <summary>
 /// 考核周期类别 (Dto.Base)
@@ -157,4 +154,3 @@ namespace Tiobon.Core.Model.Models
     /// </summary>
     public List<string> StageItems_List { get; set; } = new List<string>();
 }
-}

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

@@ -14,11 +14,8 @@
 *│　作者：SimonHsiao                                                  │
 *└──────────────────────────────────┘
 */
-using System.ComponentModel;
+namespace Tiobon.Core.Model.Models;
-using System.ComponentModel.DataAnnotations;
 
-namespace Tiobon.Core.Model.Models
-{
 
 /// <summary>
 /// 考核模板 (Dto.Base)
@@ -185,4 +182,3 @@ namespace Tiobon.Core.Model.Models
     /// </summary>
     public int? BuiltIn { get; set; }
 }
-}

Tiobon.Core.Services/Ghra/Ghra_StaffGroupDetailServices.cs

@@ -1,12 +1,5 @@
-
+namespace Tiobon.Core.Services;
-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
-{
 /// <summary>
 /// 人员群组明细 (服务)
 /// </summary>
@@ -20,4 +13,3 @@ namespace Tiobon.Core.Services
         base._caching = caching;
     }
 }
-}

Tiobon.Core.Services/Ghrp/Ghrp_PerformanceItemServices.cs

@@ -1,14 +1,5 @@
-
+namespace Tiobon.Core.Services;
-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
-{
 /// <summary>
 /// 考核指标 (服务)
 /// </summary>
@@ -60,4 +51,3 @@ namespace Tiobon.Core.Services
         return result;
     }
 }
-}

Tiobon.Core.Services/Ghrp/Ghrp_PerformancePeriodServices.cs

@@ -1,14 +1,5 @@
-
+namespace Tiobon.Core.Services;
-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
-{
 /// <summary>
 /// 考核期间 (服务)
 /// </summary>
@@ -199,4 +190,3 @@ namespace Tiobon.Core.Services
     }
 
 }
-}

Tiobon.Core.Services/Ghrp/Ghrp_PerformancePeriodTypeServices.cs

@@ -1,13 +1,5 @@
-
+namespace Tiobon.Core.Services;
-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
-{
 /// <summary>
 /// 考核周期类别 (服务)
 /// </summary>
@@ -73,4 +65,3 @@ namespace Tiobon.Core.Services
         return ServiceResult<List<string>>.OprateSuccess("查询成功！", StageItmes);
     }
 }
-}

Tiobon.Core.Services/Ghrp/Ghrp_PerformanceTemplateServices.cs

@@ -1,13 +1,5 @@
-
+namespace Tiobon.Core.Services;
-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
-{
 /// <summary>
 /// 考核模板 (服务)
 /// </summary>
@@ -59,4 +51,3 @@ namespace Tiobon.Core.Services
         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>