diff --git a/Lib/Tiobon.Core.Base.dll b/Lib/Tiobon.Core.Base.dll index f6cbd118..8d7b349c 100644 Binary files a/Lib/Tiobon.Core.Base.dll and b/Lib/Tiobon.Core.Base.dll differ diff --git a/Lib/Tiobon.Core.Base.xml b/Lib/Tiobon.Core.Base.xml index 517447ce..402d171c 100644 --- a/Lib/Tiobon.Core.Base.xml +++ b/Lib/Tiobon.Core.Base.xml @@ -216,6 +216,33 @@ + + + 缓存 + + + + + + + + + + + + + + + + + + + + + + 语言ID + + 根据ID查询实体数据是否存在 @@ -223,6 +250,13 @@ + + + + + + + 根据ID查询一条数据 diff --git a/Lib/Tiobon.Core.Model.Entity.dll b/Lib/Tiobon.Core.Model.Entity.dll index b907818c..01594ff1 100644 Binary files a/Lib/Tiobon.Core.Model.Entity.dll and b/Lib/Tiobon.Core.Model.Entity.dll differ diff --git a/Lib/Tiobon.Core.Model.Entity.xml b/Lib/Tiobon.Core.Model.Entity.xml index e4db7ae3..80c63e95 100644 --- a/Lib/Tiobon.Core.Model.Entity.xml +++ b/Lib/Tiobon.Core.Model.Entity.xml @@ -4,6 +4,41 @@ Tiobon.Core.Model.Entity + + + 动态查询条件 + + + + + 起始位置(e.g. 0) + + + + + 每页数量(e.g. 10) + + + + + 查询条件( 例如:id = 1 and name = 小明) + + + + + 排序条件表达式(e.g. LoginName ASC,Name DESC) + + + + + 动态查询条件 + + + + + 动态查询条件 + + 服务层响应实体(泛型) diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_PlanController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_PlanController.cs index 3b58544e..93d9d9b4 100644 --- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_PlanController.cs +++ b/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; /// /// 培训计划(Controller) diff --git a/Tiobon.Core.Api/GlobalUsings.cs b/Tiobon.Core.Api/GlobalUsings.cs index eeef7b05..45949ba0 100644 --- a/Tiobon.Core.Api/GlobalUsings.cs +++ b/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; diff --git a/Tiobon.Core.Common/Attribute/QueryFilter.cs b/Tiobon.Core.Common/Attribute/QueryFilter.cs deleted file mode 100644 index a756bf45..00000000 --- a/Tiobon.Core.Common/Attribute/QueryFilter.cs +++ /dev/null @@ -1,165 +0,0 @@ -using Newtonsoft.Json.Linq; -using System.ComponentModel.DataAnnotations; -using Tiobon.Core.Model.Entity; - -namespace Tiobon.Core.Common; - - -/// -/// 动态查询条件 -/// -public class QueryBody -{ - /// - /// 起始位置(e.g. 0) - /// - [Required] - public int pageNum { get; set; } = 1; - /// - /// 每页数量(e.g. 10) - /// - [Required] - public int pageSize { get; set; } = 100000; - private JObject _jsonParam; - /// - /// 查询条件( 例如:id = 1 and name = 小明) - /// - public JObject jsonParam - { - get { return _jsonParam; } - set - { - _jsonParam = value; - } - } - - /// - /// 排序条件表达式(e.g. LoginName ASC,Name DESC) - /// - 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 columnValue { get; set; } - public string operationKey { get; set; } - public string token { get; set; } - -} - -/// -/// 动态查询条件 -/// -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 ExFields { get; set; } - public string IsTitle { get; set; } - public string TitleName { get; set; } - public List SelectRowKeys { get; set; } - -} - -/// -/// 动态查询条件 -/// -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 { get; set; } - - public DT_Procedure DT_Procedure { get; set; } = new DT_Procedure(); -} \ No newline at end of file diff --git a/Tiobon.Core.DataAccess/ReportHelper.cs b/Tiobon.Core.DataAccess/ReportHelper.cs index ec573fcf..93be04a3 100644 --- a/Tiobon.Core.DataAccess/ReportHelper.cs +++ b/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; diff --git a/Tiobon.Core.DataAccess/Tiobon.Core.DataAccess.csproj b/Tiobon.Core.DataAccess/Tiobon.Core.DataAccess.csproj index cf8153de..3e251a7d 100644 --- a/Tiobon.Core.DataAccess/Tiobon.Core.DataAccess.csproj +++ b/Tiobon.Core.DataAccess/Tiobon.Core.DataAccess.csproj @@ -42,4 +42,10 @@ + + + ..\Lib\Tiobon.Core.Model.Entity.dll + + + diff --git a/Tiobon.Core.IServices/Ghra/IGhra_GradeServices.cs b/Tiobon.Core.IServices/Ghra/IGhra_GradeServices.cs new file mode 100644 index 00000000..6bf65605 --- /dev/null +++ b/Tiobon.Core.IServices/Ghra/IGhra_GradeServices.cs @@ -0,0 +1,8 @@ +namespace Tiobon.Core.IServices; + +/// +/// 年级(自定义服务接口) +/// +public interface IGhra_GradeServices : IBaseServices +{ +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghra/IGhra_StaffGroupDetailServices.cs b/Tiobon.Core.IServices/Ghra/IGhra_StaffGroupDetailServices.cs index 89452bbc..ad81de0e 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_StaffGroupDetailServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_StaffGroupDetailServices.cs @@ -1,9 +1,8 @@ -namespace Tiobon.Core.IServices +namespace Tiobon.Core.IServices; + +/// +/// 人员群组明细(自定义服务接口) +/// +public interface IGhra_StaffGroupDetailServices : IBaseServices { - /// - /// 人员群组明细(自定义服务接口) - /// - public interface IGhra_StaffGroupDetailServices :IBaseServices - { - } } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghra/IGhra_TitleServices.cs b/Tiobon.Core.IServices/Ghra/IGhra_TitleServices.cs index d3dd2d00..21be078b 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_TitleServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_TitleServices.cs @@ -1,6 +1,4 @@ -using Tiobon.Core.Common; - -namespace Tiobon.Core.IServices; +namespace Tiobon.Core.IServices; /// /// 岗位(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_AttachmentServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_AttachmentServices.cs index f88832e6..755f84e3 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_AttachmentServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_AttachmentServices.cs @@ -1,6 +1,4 @@ -using Tiobon.Core.Model.ViewModels; - -namespace Tiobon.Core.IServices; +namespace Tiobon.Core.IServices; /// /// 附件(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_CertificateDesignItemServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_CertificateDesignItemServices.cs index 78b9b033..8e04835e 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CertificateDesignItemServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CertificateDesignItemServices.cs @@ -3,6 +3,6 @@ /// /// 培训证书设计项(自定义服务接口) /// -public interface IGhre_CertificateDesignItemServices :IBaseServices +public interface IGhre_CertificateDesignItemServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_CertificateRuleServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_CertificateRuleServices.cs index 1b47036c..35f38ccb 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CertificateRuleServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CertificateRuleServices.cs @@ -1,6 +1,4 @@ -using Tiobon.Core.Model; - -namespace Tiobon.Core.IServices; +namespace Tiobon.Core.IServices; /// /// 培训证书规则(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_CertificateServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_CertificateServices.cs index f36a038c..cc72bdae 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CertificateServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CertificateServices.cs @@ -1,6 +1,4 @@ -using Tiobon.Core.Model; - -namespace Tiobon.Core.IServices; +namespace Tiobon.Core.IServices; /// /// 培训记录(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_CourseServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_CourseServices.cs index a272ac59..fbe3d3a9 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CourseServices.cs +++ b/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; /// /// 课程(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_CreditPointServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_CreditPointServices.cs index 97dbcfa5..b95a0882 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CreditPointServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CreditPointServices.cs @@ -1,6 +1,4 @@ -using Tiobon.Core.Common; - -namespace Tiobon.Core.IServices; +namespace Tiobon.Core.IServices; /// /// 学分记录(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperServices.cs index 70b99ffb..3385e545 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperServices.cs @@ -1,6 +1,4 @@ -using Microsoft.AspNetCore.Mvc; -using Tiobon.Core.Common; - + namespace Tiobon.Core.IServices; /// @@ -11,7 +9,7 @@ public interface IGhre_ExamPaperServices : IBaseServices> QueryDefault(long Id); Task> InsertConfig(InsertGhre_ExamPaperConfigInput insert); - Task> Insert1([FromBody] DefaultGhre_ExamPaperPageData insert); + Task> Insert1(DefaultGhre_ExamPaperPageData insert); Task Update1(long id, DefaultGhre_ExamPaperPageData insertModel); Task UpdateStatus(long[] ids, string status); diff --git a/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs index 77f94b7d..d3bcf4f9 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs +++ b/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; /// /// 考试记录(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_ExamServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ExamServices.cs index ceda8442..735e0219 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamServices.cs @@ -1,6 +1,4 @@ -using Tiobon.Core.Common; - -namespace Tiobon.Core.IServices; +namespace Tiobon.Core.IServices; /// /// 考试(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_OpenClassServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_OpenClassServices.cs index 11512961..ad7d1a12 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_OpenClassServices.cs +++ b/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; /// /// 开班管理(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_PlanServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_PlanServices.cs index 1320344e..0db24efc 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_PlanServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_PlanServices.cs @@ -1,6 +1,4 @@ -using Tiobon.Core.Common; - -namespace Tiobon.Core.IServices; +namespace Tiobon.Core.IServices; /// /// 培训计划(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_RequestServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_RequestServices.cs index 5a767fcc..496e22a8 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_RequestServices.cs +++ b/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; /// /// 培训需求(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_StaffGroupServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_StaffGroupServices.cs index 9296d55f..668e8df6 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_StaffGroupServices.cs +++ b/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; /// /// 员工群组(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_StudyRecordServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_StudyRecordServices.cs index f50cad2e..3e8544bb 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_StudyRecordServices.cs +++ b/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; /// /// 培训记录(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_SurveyQuestionPoolServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_SurveyQuestionPoolServices.cs index 508454ac..dda93feb 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_SurveyQuestionPoolServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_SurveyQuestionPoolServices.cs @@ -1,6 +1,4 @@ -using Tiobon.Core.Model; - -namespace Tiobon.Core.IServices; +namespace Tiobon.Core.IServices; /// /// 问卷题库(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_SurveyServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_SurveyServices.cs index 2cefe8ed..6b8e1312 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_SurveyServices.cs +++ b/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; /// /// 问卷调查(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_TitleSkill_BoltoneServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_TitleSkill_BoltoneServices.cs index 5d1b5f8e..df56189f 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_TitleSkill_BoltoneServices.cs +++ b/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; /// /// 岗位技能_宝连通(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_UshioPlanServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_UshioPlanServices.cs index 697671f5..1f44d287 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_UshioPlanServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_UshioPlanServices.cs @@ -1,6 +1,4 @@ -using Tiobon.Core.Model; - -namespace Tiobon.Core.IServices; +namespace Tiobon.Core.IServices; /// /// 【牛尾】培训计划(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_HumanRequestServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_HumanRequestServices.cs index 322e184d..89b7abc4 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_HumanRequestServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_HumanRequestServices.cs @@ -1,6 +1,4 @@ -using Tiobon.Core.Common; - -namespace Tiobon.Core.IServices; +namespace Tiobon.Core.IServices; /// /// 人力需求维护(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeServices.cs index 437e6c77..662e05ed 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeServices.cs +++ b/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; /// /// 个人简历(自定义服务接口) /// public interface IGhrh_ResumeServices : IBaseServices { - Task>> QueryViewTab(int langId=1); + Task>> QueryViewTab(int langId = 1); Task>> QueryConditions(); @@ -70,7 +66,7 @@ public interface IGhrh_ResumeServices : IBaseServices OverTimeDeleteResume(); Task> Download(List ids); - Task> QueryAssessForm(long id, long? orderId = null, [FromBody] ResumeAssessForm assessForm = null); + Task> QueryAssessForm(long id, long? orderId = null, ResumeAssessForm assessForm = null); Task Shihua_OA_Sync(); @@ -81,7 +77,7 @@ public interface IGhrh_ResumeServices : IBaseServices SyncToStaff(long id); - Task> QueryWorkstationInit(int langId , string menuName); + Task> QueryWorkstationInit(int langId, string menuName); Task> QueryWorkStationStatisticsChart(int langId = 1); diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTemplateServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTemplateServices.cs index b38a82d9..cdd78147 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTemplateServices.cs +++ b/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; /// /// 简历模板(自定义服务接口) diff --git a/Tiobon.Core.IServices/Ghrp/IGhrp_PerformanceItemServices.cs b/Tiobon.Core.IServices/Ghrp/IGhrp_PerformanceItemServices.cs index 6797ec5c..8551ddd0 100644 --- a/Tiobon.Core.IServices/Ghrp/IGhrp_PerformanceItemServices.cs +++ b/Tiobon.Core.IServices/Ghrp/IGhrp_PerformanceItemServices.cs @@ -3,6 +3,6 @@ /// /// 考核指标(自定义服务接口) /// -public interface IGhrp_PerformanceItemServices :IBaseServices - { +public interface IGhrp_PerformanceItemServices : IBaseServices +{ } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrp/IGhrp_PerformancePeriodServices.cs b/Tiobon.Core.IServices/Ghrp/IGhrp_PerformancePeriodServices.cs index 4a76f3b2..36c606b7 100644 --- a/Tiobon.Core.IServices/Ghrp/IGhrp_PerformancePeriodServices.cs +++ b/Tiobon.Core.IServices/Ghrp/IGhrp_PerformancePeriodServices.cs @@ -1,10 +1,9 @@ -namespace Tiobon.Core.IServices +namespace Tiobon.Core.IServices; + +/// +/// 考核期间(自定义服务接口) +/// +public interface IGhrp_PerformancePeriodServices : IBaseServices { - /// - /// 考核期间(自定义服务接口) - /// - public interface IGhrp_PerformancePeriodServices :IBaseServices - { - Task BatchCreatePeriod(JObject jsonParam); - } + Task BatchCreatePeriod(JObject jsonParam); } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrp/IGhrp_PerformancePeriodTypeServices.cs b/Tiobon.Core.IServices/Ghrp/IGhrp_PerformancePeriodTypeServices.cs index ef1073db..64b6bfcf 100644 --- a/Tiobon.Core.IServices/Ghrp/IGhrp_PerformancePeriodTypeServices.cs +++ b/Tiobon.Core.IServices/Ghrp/IGhrp_PerformancePeriodTypeServices.cs @@ -1,10 +1,9 @@ -namespace Tiobon.Core.IServices +namespace Tiobon.Core.IServices; + +/// +/// 考核周期类别(自定义服务接口) +/// +public interface IGhrp_PerformancePeriodTypeServices : IBaseServices { - /// - /// 考核周期类别(自定义服务接口) - /// - public interface IGhrp_PerformancePeriodTypeServices :IBaseServices - { - Task>> GetStageItems(string Stage); - } + Task>> GetStageItems(string Stage); } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrp/IGhrp_PerformanceTemplateServices.cs b/Tiobon.Core.IServices/Ghrp/IGhrp_PerformanceTemplateServices.cs index 768f98eb..ad9a27a4 100644 --- a/Tiobon.Core.IServices/Ghrp/IGhrp_PerformanceTemplateServices.cs +++ b/Tiobon.Core.IServices/Ghrp/IGhrp_PerformanceTemplateServices.cs @@ -1,9 +1,8 @@ -namespace Tiobon.Core.IServices +namespace Tiobon.Core.IServices; + +/// +/// 考核模板(自定义服务接口) +/// +public interface IGhrp_PerformanceTemplateServices : IBaseServices { - /// - /// 考核模板(自定义服务接口) - /// - public interface IGhrp_PerformanceTemplateServices :IBaseServices - { - } } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrs/IGhrs_DataBelongServices.cs b/Tiobon.Core.IServices/Ghrs/IGhrs_DataBelongServices.cs index 856f00e9..9a54bfe0 100644 --- a/Tiobon.Core.IServices/Ghrs/IGhrs_DataBelongServices.cs +++ b/Tiobon.Core.IServices/Ghrs/IGhrs_DataBelongServices.cs @@ -3,6 +3,6 @@ /// /// 资料归属(自定义服务接口) /// -public interface IGhrs_DataBelongServices :IBaseServices +public interface IGhrs_DataBelongServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/GlobalUsings.cs b/Tiobon.Core.IServices/GlobalUsings.cs index 46738193..e5a07a03 100644 --- a/Tiobon.Core.IServices/GlobalUsings.cs +++ b/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; diff --git a/Tiobon.Core.IServices/ICommonServices.cs b/Tiobon.Core.IServices/ICommonServices.cs index 0bf5ddcb..ded2a91c 100644 --- a/Tiobon.Core.IServices/ICommonServices.cs +++ b/Tiobon.Core.IServices/ICommonServices.cs @@ -1,5 +1,4 @@ using Microsoft.AspNetCore.Http; -using Tiobon.Core.Common; namespace Tiobon.Core.IServices; diff --git a/Tiobon.Core.IServices/IGhra_GradeServices.cs b/Tiobon.Core.IServices/IGhra_GradeServices.cs deleted file mode 100644 index 88105912..00000000 --- a/Tiobon.Core.IServices/IGhra_GradeServices.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Tiobon.Core.IServices; - -/// -/// 年级(自定义服务接口) -/// -public interface IGhra_GradeServices :IBaseServices -{ - } \ No newline at end of file diff --git a/Tiobon.Core.IServices/IModuleServices.cs b/Tiobon.Core.IServices/IModuleServices.cs index ae0192a4..1338871a 100644 --- a/Tiobon.Core.IServices/IModuleServices.cs +++ b/Tiobon.Core.IServices/IModuleServices.cs @@ -3,8 +3,8 @@ namespace Tiobon.Core.IServices; /// /// ModuleServices /// -public interface IModuleServices :IBaseServices +public interface IModuleServices : IBaseServices { - - } + +} diff --git a/Tiobon.Core.IServices/IOperateLogServices.cs b/Tiobon.Core.IServices/IOperateLogServices.cs index 647f75b1..951450af 100644 --- a/Tiobon.Core.IServices/IOperateLogServices.cs +++ b/Tiobon.Core.IServices/IOperateLogServices.cs @@ -4,7 +4,6 @@ /// IOperateLogServices /// public interface IOperateLogServices : IBaseServices - { - +{ + } - \ No newline at end of file diff --git a/Tiobon.Core.IServices/IReportServices.cs b/Tiobon.Core.IServices/IReportServices.cs index 85f0e78d..4d18ecab 100644 --- a/Tiobon.Core.IServices/IReportServices.cs +++ b/Tiobon.Core.IServices/IReportServices.cs @@ -1,6 +1,4 @@ -using Tiobon.Core.Common; - -namespace Tiobon.Core.IServices; +namespace Tiobon.Core.IServices; /// /// IReportServices diff --git a/Tiobon.Core.IServices/IRoleModulePermissionServices.cs b/Tiobon.Core.IServices/IRoleModulePermissionServices.cs index 34c3f53a..3f87a560 100644 --- a/Tiobon.Core.IServices/IRoleModulePermissionServices.cs +++ b/Tiobon.Core.IServices/IRoleModulePermissionServices.cs @@ -3,8 +3,8 @@ namespace Tiobon.Core.IServices; /// /// RoleModulePermissionServices /// -public interface IRoleModulePermissionServices :IBaseServices - { +public interface IRoleModulePermissionServices : IBaseServices +{ Task> GetRoleModule(); Task> QueryMuchTable(); diff --git a/Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformanceItem.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformanceItem.Dto.Base.cs index edb945ee..c372c994 100644 --- a/Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformanceItem.Dto.Base.cs +++ b/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 + +/// +/// 考核指标 (Dto.Base) +/// +public class Ghrp_PerformanceItemBase { /// - /// 考核指标 (Dto.Base) - /// - public class Ghrp_PerformanceItemBase - { - - /// - /// 指标编号 - /// - [Display(Name = "ItemNo"), Description("指标编号"), MaxLength(500, ErrorMessage = "指标编号 不能超过 500 个字符")] - public string ItemNo { get; set; } - - /// - /// 指标内容 - /// - [Display(Name = "ItemName"), Description("指标内容"), MaxLength(-1, ErrorMessage = "指标内容 不能超过 -1 个字符")] - public string ItemName { get; set; } - - /// - /// 指标说明 - /// - [Display(Name = "ItemCaption"), Description("指标说明"), MaxLength(-1, ErrorMessage = "指标说明 不能超过 -1 个字符")] - public string ItemCaption { get; set; } - - /// - /// 目标达成说明 - /// - [Display(Name = "TargetCaption"), Description("目标达成说明"), MaxLength(-1, ErrorMessage = "目标达成说明 不能超过 -1 个字符")] - public string TargetCaption { get; set; } - - /// - /// 一级指标分类 - /// - [Display(Name = "ItemType1"), Description("一级指标分类"), MaxLength(255, ErrorMessage = "一级指标分类 不能超过 255 个字符")] - public string ItemType1 { get; set; } - - /// - /// 二级指标分类 - /// - [Display(Name = "ItemType2"), Description("二级指标分类"), MaxLength(255, ErrorMessage = "二级指标分类 不能超过 255 个字符")] - public string ItemType2 { get; set; } - - /// - /// 三级指标分类 - /// - [Display(Name = "ItemType3"), Description("三级指标分类"), MaxLength(255, ErrorMessage = "三级指标分类 不能超过 255 个字符")] - public string ItemType3 { get; set; } - - /// - /// 默认权重(%) - /// - [Display(Name = "ItemWeight"), Description("默认权重(%)"), Column(TypeName = "decimal(18,2)")] - public decimal? ItemWeight { get; set; } - - /// - /// 指标性质 - /// - [Display(Name = "ItemKind"), Description("指标性质"), MaxLength(255, ErrorMessage = "指标性质 不能超过 255 个字符")] - public string ItemKind { get; set; } - - /// - /// 评估部门分类 - /// - [Display(Name = "DeptType"), Description("评估部门分类"), MaxLength(255, ErrorMessage = "评估部门分类 不能超过 255 个字符")] - public string DeptType { get; set; } - - /// - /// 标签1 - /// - [Display(Name = "Tag1"), Description("标签1"), MaxLength(255, ErrorMessage = "标签1 不能超过 255 个字符")] - public string Tag1 { get; set; } - - /// - /// 标签2 - /// - [Display(Name = "Tag2"), Description("标签2"), MaxLength(255, ErrorMessage = "标签2 不能超过 255 个字符")] - public string Tag2 { get; set; } - - /// - /// 标签3 - /// - [Display(Name = "Tag3"), Description("标签3"), MaxLength(255, ErrorMessage = "标签3 不能超过 255 个字符")] - public string Tag3 { get; set; } - - /// - /// 有效开始日 - /// - public DateTime? BeginDate { get; set; } - - /// - /// 有效结束日 - /// - public DateTime? EndDate { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// 排序 - /// - public int? SortNo { get; set; } - - /// - /// 默认标志 - /// - public int? IsDefault { get; set; } - - /// - /// 预留字段1 - /// - [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// 预留字段2 - /// - [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// 预留字段3 - /// - [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// 预留字段4 - /// - [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// 预留字段5 - /// - [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - - /// - /// 预留字段6 - /// - [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")] - public string Reverse6 { get; set; } - - /// - /// 预留字段7 - /// - [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")] - public string Reverse7 { get; set; } - - /// - /// 预留字段8 - /// - [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")] - public string Reverse8 { get; set; } - - /// - /// 预留字段9 - /// - [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")] - public string Reverse9 { get; set; } - - /// - /// 预留字段10 - /// - [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")] - public string Reverse10 { get; set; } - - /// - /// 预留字段11 - /// - public int? ReverseI1 { get; set; } - - /// - /// 预留字段12 - /// - public int? ReverseI2 { get; set; } - - /// - /// 内置 - /// - public int? BuiltIn { get; set; } - } + /// 指标编号 + /// + [Display(Name = "ItemNo"), Description("指标编号"), MaxLength(500, ErrorMessage = "指标编号 不能超过 500 个字符")] + public string ItemNo { get; set; } + + /// + /// 指标内容 + /// + [Display(Name = "ItemName"), Description("指标内容"), MaxLength(-1, ErrorMessage = "指标内容 不能超过 -1 个字符")] + public string ItemName { get; set; } + + /// + /// 指标说明 + /// + [Display(Name = "ItemCaption"), Description("指标说明"), MaxLength(-1, ErrorMessage = "指标说明 不能超过 -1 个字符")] + public string ItemCaption { get; set; } + + /// + /// 目标达成说明 + /// + [Display(Name = "TargetCaption"), Description("目标达成说明"), MaxLength(-1, ErrorMessage = "目标达成说明 不能超过 -1 个字符")] + public string TargetCaption { get; set; } + + /// + /// 一级指标分类 + /// + [Display(Name = "ItemType1"), Description("一级指标分类"), MaxLength(255, ErrorMessage = "一级指标分类 不能超过 255 个字符")] + public string ItemType1 { get; set; } + + /// + /// 二级指标分类 + /// + [Display(Name = "ItemType2"), Description("二级指标分类"), MaxLength(255, ErrorMessage = "二级指标分类 不能超过 255 个字符")] + public string ItemType2 { get; set; } + + /// + /// 三级指标分类 + /// + [Display(Name = "ItemType3"), Description("三级指标分类"), MaxLength(255, ErrorMessage = "三级指标分类 不能超过 255 个字符")] + public string ItemType3 { get; set; } + + /// + /// 默认权重(%) + /// + [Display(Name = "ItemWeight"), Description("默认权重(%)"), Column(TypeName = "decimal(18,2)")] + public decimal? ItemWeight { get; set; } + + /// + /// 指标性质 + /// + [Display(Name = "ItemKind"), Description("指标性质"), MaxLength(255, ErrorMessage = "指标性质 不能超过 255 个字符")] + public string ItemKind { get; set; } + + /// + /// 评估部门分类 + /// + [Display(Name = "DeptType"), Description("评估部门分类"), MaxLength(255, ErrorMessage = "评估部门分类 不能超过 255 个字符")] + public string DeptType { get; set; } + + /// + /// 标签1 + /// + [Display(Name = "Tag1"), Description("标签1"), MaxLength(255, ErrorMessage = "标签1 不能超过 255 个字符")] + public string Tag1 { get; set; } + + /// + /// 标签2 + /// + [Display(Name = "Tag2"), Description("标签2"), MaxLength(255, ErrorMessage = "标签2 不能超过 255 个字符")] + public string Tag2 { get; set; } + + /// + /// 标签3 + /// + [Display(Name = "Tag3"), Description("标签3"), MaxLength(255, ErrorMessage = "标签3 不能超过 255 个字符")] + public string Tag3 { get; set; } + + /// + /// 有效开始日 + /// + public DateTime? BeginDate { get; set; } + + /// + /// 有效结束日 + /// + public DateTime? EndDate { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// 排序 + /// + public int? SortNo { get; set; } + + /// + /// 默认标志 + /// + public int? IsDefault { get; set; } + + /// + /// 预留字段1 + /// + [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// 预留字段2 + /// + [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// 预留字段3 + /// + [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// 预留字段4 + /// + [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// 预留字段5 + /// + [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// 预留字段6 + /// + [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// 预留字段7 + /// + [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// 预留字段8 + /// + [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// 预留字段9 + /// + [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } + + /// + /// 预留字段10 + /// + [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")] + public string Reverse10 { get; set; } + + /// + /// 预留字段11 + /// + public int? ReverseI1 { get; set; } + + /// + /// 预留字段12 + /// + public int? ReverseI2 { get; set; } + + /// + /// 内置 + /// + public int? BuiltIn { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformancePeriod.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformancePeriod.Dto.Base.cs index f441ce53..9dcd6463 100644 --- a/Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformancePeriod.Dto.Base.cs +++ b/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 + +/// +/// 考核期间 (Dto.Base) +/// +public class Ghrp_PerformancePeriodBase { + /// + /// 年度 + /// + [Display(Name = "YYYY"), Description("年度"), MaxLength(50, ErrorMessage = "年度 不能超过 50 个字符")] + public string YYYY { get; set; } + /// + /// 期间编号 + /// + [Display(Name = "PeriodNo"), Description("期间编号"), MaxLength(50, ErrorMessage = "期间编号 不能超过 50 个字符")] + public string PeriodNo { get; set; } + + /// + /// 期间名称 + /// + [Display(Name = "PeriodName"), Description("期间名称"), MaxLength(50, ErrorMessage = "期间名称 不能超过 50 个字符")] + public string PeriodName { get; set; } + + /// + /// 考核周期类别ID + /// + public long? PerformancePeriodTypeID { get; set; } + + /// + /// 考核周期类别 + /// + [Display(Name = "PeriodType"), Description("考核周期类别"), MaxLength(255, ErrorMessage = "考核周期类别 不能超过 255 个字符")] + public string PeriodType { get; set; } + + /// + /// 考核阶段数 + /// + [Display(Name = "Stage"), Description("考核阶段数"), MaxLength(255, ErrorMessage = "考核阶段数 不能超过 255 个字符")] + public string Stage { get; set; } + + /// + /// 阶段名称 + /// + [Display(Name = "StageItem"), Description("阶段名称"), MaxLength(255, ErrorMessage = "阶段名称 不能超过 255 个字符")] + public string StageItem { get; set; } + + /// + /// 当期类别 + /// + public int? PeriodNum { get; set; } + + /// + /// 当期是否启用 + /// + public int? IsUsing { get; set; } + + /// + /// 期间开始日 + /// + public string? BeginDate { get; set; } + + /// + /// 期间结束日 + /// + public string? EndDate { get; set; } + + /// + /// 员工填写开始日 + /// + public string? StaffBeginDate { get; set; } + + /// + /// 员工填写结束日 + /// + public string? StaffEndDate { get; set; } + + /// + /// 主管填写开始日 + /// + public string? MGBeginDate { get; set; } + + /// + /// 主管填写结束日 + /// + public string? MGEndDate { get; set; } + + /// + /// 人员状态基准日 + /// + public string? OnJobBaseDate { get; set; } + + /// + /// 前置期间 + /// + public long? PrePerformancePeriodID { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// 排序 + /// + public int? SortNo { get; set; } + + /// + /// 默认标志 + /// + public int? IsDefault { get; set; } + + /// + /// 预留字段1 + /// + [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// 预留字段2 + /// + [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// 预留字段3 + /// + [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// 预留字段4 + /// + [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// 预留字段5 + /// + [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// 预留字段6 + /// + [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// 预留字段7 + /// + [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// 预留字段8 + /// + [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// 预留字段9 + /// + [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } + + /// + /// 预留字段10 + /// + [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")] + public string Reverse10 { get; set; } + + /// + /// 预留字段11 + /// + public int? ReverseI1 { get; set; } + + /// + /// 预留字段12 + /// + public int? ReverseI2 { get; set; } /// - /// 考核期间 (Dto.Base) - /// - public class Ghrp_PerformancePeriodBase - { - /// - /// 年度 - /// - [Display(Name = "YYYY"), Description("年度"), MaxLength(50, ErrorMessage = "年度 不能超过 50 个字符")] - public string YYYY { get; set; } - /// - /// 期间编号 - /// - [Display(Name = "PeriodNo"), Description("期间编号"), MaxLength(50, ErrorMessage = "期间编号 不能超过 50 个字符")] - public string PeriodNo { get; set; } - - /// - /// 期间名称 - /// - [Display(Name = "PeriodName"), Description("期间名称"), MaxLength(50, ErrorMessage = "期间名称 不能超过 50 个字符")] - public string PeriodName { get; set; } - - /// - /// 考核周期类别ID - /// - public long? PerformancePeriodTypeID { get; set; } - - /// - /// 考核周期类别 - /// - [Display(Name = "PeriodType"), Description("考核周期类别"), MaxLength(255, ErrorMessage = "考核周期类别 不能超过 255 个字符")] - public string PeriodType { get; set; } - - /// - /// 考核阶段数 - /// - [Display(Name = "Stage"), Description("考核阶段数"), MaxLength(255, ErrorMessage = "考核阶段数 不能超过 255 个字符")] - public string Stage { get; set; } - - /// - /// 阶段名称 - /// - [Display(Name = "StageItem"), Description("阶段名称"), MaxLength(255, ErrorMessage = "阶段名称 不能超过 255 个字符")] - public string StageItem { get; set; } - - /// - /// 当期类别 - /// - public int? PeriodNum { get; set; } - - /// - /// 当期是否启用 - /// - public int? IsUsing { get; set; } - - /// - /// 期间开始日 - /// - public string? BeginDate { get; set; } - - /// - /// 期间结束日 - /// - public string? EndDate { get; set; } - - /// - /// 员工填写开始日 - /// - public string? StaffBeginDate { get; set; } - - /// - /// 员工填写结束日 - /// - public string? StaffEndDate { get; set; } - - /// - /// 主管填写开始日 - /// - public string? MGBeginDate { get; set; } - - /// - /// 主管填写结束日 - /// - public string? MGEndDate { get; set; } - - /// - /// 人员状态基准日 - /// - public string? OnJobBaseDate { get; set; } - - /// - /// 前置期间 - /// - public long? PrePerformancePeriodID { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// 排序 - /// - public int? SortNo { get; set; } - - /// - /// 默认标志 - /// - public int? IsDefault { get; set; } - - /// - /// 预留字段1 - /// - [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// 预留字段2 - /// - [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// 预留字段3 - /// - [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// 预留字段4 - /// - [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// 预留字段5 - /// - [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - - /// - /// 预留字段6 - /// - [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")] - public string Reverse6 { get; set; } - - /// - /// 预留字段7 - /// - [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")] - public string Reverse7 { get; set; } - - /// - /// 预留字段8 - /// - [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")] - public string Reverse8 { get; set; } - - /// - /// 预留字段9 - /// - [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")] - public string Reverse9 { get; set; } - - /// - /// 预留字段10 - /// - [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")] - public string Reverse10 { get; set; } - - /// - /// 预留字段11 - /// - public int? ReverseI1 { get; set; } - - /// - /// 预留字段12 - /// - public int? ReverseI2 { get; set; } - - /// - /// 内置 - /// - public int? BuiltIn { get; set; } - } + /// 内置 + /// + public int? BuiltIn { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformancePeriodType.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformancePeriodType.Dto.Base.cs index f1f739b5..1becdcf2 100644 --- a/Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformancePeriodType.Dto.Base.cs +++ b/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 + +/// +/// 考核周期类别 (Dto.Base) +/// +public class Ghrp_PerformancePeriodTypeBase { /// - /// 考核周期类别 (Dto.Base) - /// - public class Ghrp_PerformancePeriodTypeBase - { - - /// - /// 类别编号 - /// - [Display(Name = "PeriodTypeNo"), Description("类别编号"), MaxLength(32, ErrorMessage = "类别编号 不能超过 32 个字符")] - public string PeriodTypeNo { get; set; } - - /// - /// 类别名称 - /// - [Display(Name = "PeriodTypeName"), Description("类别名称"), MaxLength(32, ErrorMessage = "类别名称 不能超过 32 个字符")] - public string PeriodTypeName { get; set; } - - /// - /// 多语编号 - /// - [Display(Name = "MKey"), Description("多语编号"), MaxLength(255, ErrorMessage = "多语编号 不能超过 255 个字符")] - public string MKey { get; set; } - - /// - /// 考核阶段数 - /// - [Display(Name = "Stage"), Description("考核阶段数"), MaxLength(255, ErrorMessage = "考核阶段数 不能超过 255 个字符")] - public string Stage { get; set; } - - /// - /// 考核阶段名称 - /// - [Display(Name = "StageItems"), Description("考核阶段名称"), MaxLength(255, ErrorMessage = "考核阶段名称 不能超过 255 个字符")] - public string StageItems { get; set; } - - /// - /// 集团数据归属ID - /// - public int? DataBelongID { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// 排序 - /// - public int? SortNo { get; set; } - - /// - /// 默认标志 - /// - public int? IsDefault { get; set; } - - /// - /// 预留字段1 - /// - [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// 预留字段2 - /// - [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// 预留字段3 - /// - [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// 预留字段4 - /// - [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// 预留字段5 - /// - [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - - /// - /// 预留字段6 - /// - [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")] - public string Reverse6 { get; set; } - - /// - /// 预留字段7 - /// - [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")] - public string Reverse7 { get; set; } - - /// - /// 预留字段8 - /// - [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")] - public string Reverse8 { get; set; } - - /// - /// 预留字段9 - /// - [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")] - public string Reverse9 { get; set; } - - /// - /// 预留字段10 - /// - [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")] - public string Reverse10 { get; set; } - - /// - /// 预留字段11 - /// - public int? ReverseI1 { get; set; } - - /// - /// 预留字段12 - /// - public int? ReverseI2 { get; set; } - - /// - /// 内置 - /// - public int? BuiltIn { get; set; } - - /// - /// 考核阶段名称 - /// - public List StageItems_List { get; set; } = new List(); - } + /// 类别编号 + /// + [Display(Name = "PeriodTypeNo"), Description("类别编号"), MaxLength(32, ErrorMessage = "类别编号 不能超过 32 个字符")] + public string PeriodTypeNo { get; set; } + + /// + /// 类别名称 + /// + [Display(Name = "PeriodTypeName"), Description("类别名称"), MaxLength(32, ErrorMessage = "类别名称 不能超过 32 个字符")] + public string PeriodTypeName { get; set; } + + /// + /// 多语编号 + /// + [Display(Name = "MKey"), Description("多语编号"), MaxLength(255, ErrorMessage = "多语编号 不能超过 255 个字符")] + public string MKey { get; set; } + + /// + /// 考核阶段数 + /// + [Display(Name = "Stage"), Description("考核阶段数"), MaxLength(255, ErrorMessage = "考核阶段数 不能超过 255 个字符")] + public string Stage { get; set; } + + /// + /// 考核阶段名称 + /// + [Display(Name = "StageItems"), Description("考核阶段名称"), MaxLength(255, ErrorMessage = "考核阶段名称 不能超过 255 个字符")] + public string StageItems { get; set; } + + /// + /// 集团数据归属ID + /// + public int? DataBelongID { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// 排序 + /// + public int? SortNo { get; set; } + + /// + /// 默认标志 + /// + public int? IsDefault { get; set; } + + /// + /// 预留字段1 + /// + [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// 预留字段2 + /// + [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// 预留字段3 + /// + [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// 预留字段4 + /// + [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// 预留字段5 + /// + [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// 预留字段6 + /// + [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// 预留字段7 + /// + [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// 预留字段8 + /// + [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// 预留字段9 + /// + [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } + + /// + /// 预留字段10 + /// + [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")] + public string Reverse10 { get; set; } + + /// + /// 预留字段11 + /// + public int? ReverseI1 { get; set; } + + /// + /// 预留字段12 + /// + public int? ReverseI2 { get; set; } + + /// + /// 内置 + /// + public int? BuiltIn { get; set; } + + /// + /// 考核阶段名称 + /// + public List StageItems_List { get; set; } = new List(); } diff --git a/Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformanceTemplate.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformanceTemplate.Dto.Base.cs index 0a8c421c..e804f47e 100644 --- a/Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformanceTemplate.Dto.Base.cs +++ b/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 + +/// +/// 考核模板 (Dto.Base) +/// +public class Ghrp_PerformanceTemplateBase { /// - /// 考核模板 (Dto.Base) - /// - public class Ghrp_PerformanceTemplateBase - { - - /// - /// 考核模板编号 - /// - [Display(Name = "TemplateNo"), Description("考核模板编号"), MaxLength(100, ErrorMessage = "考核模板编号 不能超过 100 个字符")] - public string TemplateNo { get; set; } - - /// - /// 考核模板名称 - /// - [Display(Name = "TemplateName"), Description("考核模板名称"), MaxLength(100, ErrorMessage = "考核模板名称 不能超过 100 个字符")] - public string TemplateName { get; set; } - - /// - /// 考核周期类别ID - /// - public long? PerformancePeriodTypeID { get; set; } - - /// - /// 考核周期类别编号 - /// - [Display(Name = "PeriodTypeNo"), Description("考核周期类别编号"), MaxLength(200, ErrorMessage = "考核周期类别编号 不能超过 200 个字符")] - public string PeriodTypeNo { get; set; } - - /// - /// 考核阶段 - /// - [Display(Name = "StageItem"), Description("考核阶段"), MaxLength(100, ErrorMessage = "考核阶段 不能超过 100 个字符")] - public string StageItem { get; set; } - - /// - /// 考核对象 - /// - public long? StaffGroupID { get; set; } - - /// - /// 总分 - /// - [Display(Name = "TotalScore"), Description("总分"), Column(TypeName = "decimal(18,2)")] - public decimal? TotalScore { get; set; } - - /// - /// 表单是否允许超过总分 - /// - public int? IsOutScore { get; set; } - - /// - /// 考核模板权重 - /// - [Display(Name = "Weight"), Description("考核模板权重"), Column(TypeName = "decimal(18,2)")] - public decimal? Weight { get; set; } - - /// - /// 考核阶数（含本人） - /// - public int? LevelNum { get; set; } - - /// - /// 考核主管显示方式 - /// - [Display(Name = "MGShowType"), Description("考核主管显示方式"), MaxLength(255, ErrorMessage = "考核主管显示方式 不能超过 255 个字符")] - public string MGShowType { get; set; } - - /// - /// 模板类型 - /// - [Display(Name = "TemplateType"), Description("模板类型"), MaxLength(255, ErrorMessage = "模板类型 不能超过 255 个字符")] - public string TemplateType { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// 排序 - /// - public int? SortNo { get; set; } - - /// - /// 默认标志 - /// - public int? IsDefault { get; set; } - - /// - /// 预留字段1 - /// - [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// 预留字段2 - /// - [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// 预留字段3 - /// - [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// 预留字段4 - /// - [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// 预留字段5 - /// - [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - - /// - /// 预留字段6 - /// - [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")] - public string Reverse6 { get; set; } - - /// - /// 预留字段7 - /// - [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")] - public string Reverse7 { get; set; } - - /// - /// 预留字段8 - /// - [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")] - public string Reverse8 { get; set; } - - /// - /// 预留字段9 - /// - [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")] - public string Reverse9 { get; set; } - - /// - /// 预留字段10 - /// - [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")] - public string Reverse10 { get; set; } - - /// - /// 预留字段11 - /// - public int? ReverseI1 { get; set; } - - /// - /// 预留字段12 - /// - public int? ReverseI2 { get; set; } - - /// - /// 内置 - /// - public int? BuiltIn { get; set; } - } + /// 考核模板编号 + /// + [Display(Name = "TemplateNo"), Description("考核模板编号"), MaxLength(100, ErrorMessage = "考核模板编号 不能超过 100 个字符")] + public string TemplateNo { get; set; } + + /// + /// 考核模板名称 + /// + [Display(Name = "TemplateName"), Description("考核模板名称"), MaxLength(100, ErrorMessage = "考核模板名称 不能超过 100 个字符")] + public string TemplateName { get; set; } + + /// + /// 考核周期类别ID + /// + public long? PerformancePeriodTypeID { get; set; } + + /// + /// 考核周期类别编号 + /// + [Display(Name = "PeriodTypeNo"), Description("考核周期类别编号"), MaxLength(200, ErrorMessage = "考核周期类别编号 不能超过 200 个字符")] + public string PeriodTypeNo { get; set; } + + /// + /// 考核阶段 + /// + [Display(Name = "StageItem"), Description("考核阶段"), MaxLength(100, ErrorMessage = "考核阶段 不能超过 100 个字符")] + public string StageItem { get; set; } + + /// + /// 考核对象 + /// + public long? StaffGroupID { get; set; } + + /// + /// 总分 + /// + [Display(Name = "TotalScore"), Description("总分"), Column(TypeName = "decimal(18,2)")] + public decimal? TotalScore { get; set; } + + /// + /// 表单是否允许超过总分 + /// + public int? IsOutScore { get; set; } + + /// + /// 考核模板权重 + /// + [Display(Name = "Weight"), Description("考核模板权重"), Column(TypeName = "decimal(18,2)")] + public decimal? Weight { get; set; } + + /// + /// 考核阶数（含本人） + /// + public int? LevelNum { get; set; } + + /// + /// 考核主管显示方式 + /// + [Display(Name = "MGShowType"), Description("考核主管显示方式"), MaxLength(255, ErrorMessage = "考核主管显示方式 不能超过 255 个字符")] + public string MGShowType { get; set; } + + /// + /// 模板类型 + /// + [Display(Name = "TemplateType"), Description("模板类型"), MaxLength(255, ErrorMessage = "模板类型 不能超过 255 个字符")] + public string TemplateType { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// 排序 + /// + public int? SortNo { get; set; } + + /// + /// 默认标志 + /// + public int? IsDefault { get; set; } + + /// + /// 预留字段1 + /// + [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// 预留字段2 + /// + [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// 预留字段3 + /// + [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// 预留字段4 + /// + [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// 预留字段5 + /// + [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// 预留字段6 + /// + [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// 预留字段7 + /// + [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// 预留字段8 + /// + [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// 预留字段9 + /// + [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } + + /// + /// 预留字段10 + /// + [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")] + public string Reverse10 { get; set; } + + /// + /// 预留字段11 + /// + public int? ReverseI1 { get; set; } + + /// + /// 预留字段12 + /// + public int? ReverseI2 { get; set; } + + /// + /// 内置 + /// + public int? BuiltIn { get; set; } } diff --git a/Tiobon.Core.Services/Ghra/Ghra_StaffGroupDetailServices.cs b/Tiobon.Core.Services/Ghra/Ghra_StaffGroupDetailServices.cs index 82bdfceb..a1627afb 100644 --- a/Tiobon.Core.Services/Ghra/Ghra_StaffGroupDetailServices.cs +++ b/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 +/// +/// 人员群组明细 (服务) +/// +public class Ghra_StaffGroupDetailServices : BaseServices, IGhra_StaffGroupDetailServices { - /// - /// 人员群组明细 (服务) - /// - public class Ghra_StaffGroupDetailServices : BaseServices, IGhra_StaffGroupDetailServices + private readonly IBaseRepository _dal; + public Ghra_StaffGroupDetailServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghra_StaffGroupDetailServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrp/Ghrp_PerformanceItemServices.cs b/Tiobon.Core.Services/Ghrp/Ghrp_PerformanceItemServices.cs index c666b01b..adb0eba6 100644 --- a/Tiobon.Core.Services/Ghrp/Ghrp_PerformanceItemServices.cs +++ b/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 +/// +/// 考核指标 (服务) +/// +public class Ghrp_PerformanceItemServices : BaseServices, IGhrp_PerformanceItemServices { - /// - /// 考核指标 (服务) - /// - public class Ghrp_PerformanceItemServices : BaseServices, IGhrp_PerformanceItemServices + private readonly IBaseRepository _dal; + public Ghrp_PerformanceItemServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrp_PerformanceItemServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } - public override async Task> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) - { + public override async Task> 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(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(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; } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrp/Ghrp_PerformancePeriodServices.cs b/Tiobon.Core.Services/Ghrp/Ghrp_PerformancePeriodServices.cs index 8f20c80b..908d06fa 100644 --- a/Tiobon.Core.Services/Ghrp/Ghrp_PerformancePeriodServices.cs +++ b/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 +/// +/// 考核期间 (服务) +/// +public class Ghrp_PerformancePeriodServices : BaseServices, IGhrp_PerformancePeriodServices { - /// - /// 考核期间 (服务) - /// - public class Ghrp_PerformancePeriodServices : BaseServices, IGhrp_PerformancePeriodServices + private readonly IBaseRepository _dal; + public Ghrp_PerformancePeriodServices(ICaching caching, IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } + /// + /// 查询 + /// + /// + /// + /// + /// + public override async Task> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) { - private readonly IBaseRepository _dal; - public Ghrp_PerformancePeriodServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } - /// - /// 查询 - /// - /// - /// - /// - /// - public override async Task> 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().Where(a => a.Id==x.PerformancePeriodTypeID).Select(x=> x.PeriodTypeName).FirstAsync(); - x.PrePerformancePeriodName = await Db.Queryable().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().Where(a => a.Id==x.PerformancePeriodTypeID).Select(x=> x.PeriodTypeName).FirstAsync(); + x.PrePerformancePeriodName = await Db.Queryable().Where(a => a.Id == x.PrePerformancePeriodID).Select(x => x.PeriodName).FirstAsync(); + }); - return result; - } + return result; + } - public override async Task Add(InsertGhrp_PerformancePeriodInput entity) - { - if (entity.PerformancePeriodTypeID != null) - entity.PeriodType = await Db.Queryable().Where(a => a.Id == entity.PerformancePeriodTypeID).Select(x => x.PeriodTypeNo).FirstAsync(); - var result = await base.Add(entity); + public override async Task Add(InsertGhrp_PerformancePeriodInput entity) + { + if (entity.PerformancePeriodTypeID != null) + entity.PeriodType = await Db.Queryable().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 Update(long Id, EditGhrp_PerformancePeriodInput editModel) - { - if (editModel.PerformancePeriodTypeID != null) - editModel.PeriodType = await Db.Queryable().Where(a => a.Id == editModel.PerformancePeriodTypeID).Select(x => x.PeriodTypeNo).FirstAsync(); + public override async Task Update(long Id, EditGhrp_PerformancePeriodInput editModel) + { + if (editModel.PerformancePeriodTypeID != null) + editModel.PeriodType = await Db.Queryable().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; + } - /// - /// 批量生成期间 - /// - /// - /// - public async Task BatchCreatePeriod(JObject jsonParam) - { - string PerformancePeriodTypeID = jsonParam["PerformancePeriodTypeID"]?.Value() ?? ""; // 考核周期类别 - if (string.IsNullOrEmpty(PerformancePeriodTypeID)) return ServiceResult.OprateSuccess("考核周期类别不能为空！"); - string YYYY = jsonParam["YYYY"]?.Value() ?? ""; // 展开年度 - if (string.IsNullOrEmpty(YYYY)) return ServiceResult.OprateSuccess("展开年度不能为空！"); - string BeginDate = jsonParam["BeginDate"]?.Value() ?? ""; // 期间开始日 - if (string.IsNullOrEmpty(BeginDate)) return ServiceResult.OprateSuccess("期间开始日不能为空！"); - string StaffBeginDate = jsonParam["StaffBeginDate"]?.Value() ?? "";// 员工填写开始日 - string StaffDays = jsonParam["StaffDays"]?.Value() ?? ""; // 填写天数 - string MGBeginDate = jsonParam["MGBeginDate"]?.Value() ?? ""; // 主管填写开始日 - string MGDays = jsonParam["MGDays"]?.Value() ?? ""; // 主管填写天数 - string OnJobBaseType = jsonParam["OnJobBaseType"]?.Value() ?? ""; // 人员状态基准日 - if (string.IsNullOrEmpty(OnJobBaseType)) return ServiceResult.OprateSuccess("人员状态基准日不能为空！"); - string sql = @$" + /// + /// 批量生成期间 + /// + /// + /// + public async Task BatchCreatePeriod(JObject jsonParam) + { + string PerformancePeriodTypeID = jsonParam["PerformancePeriodTypeID"]?.Value() ?? ""; // 考核周期类别 + if (string.IsNullOrEmpty(PerformancePeriodTypeID)) return ServiceResult.OprateSuccess("考核周期类别不能为空！"); + string YYYY = jsonParam["YYYY"]?.Value() ?? ""; // 展开年度 + if (string.IsNullOrEmpty(YYYY)) return ServiceResult.OprateSuccess("展开年度不能为空！"); + string BeginDate = jsonParam["BeginDate"]?.Value() ?? ""; // 期间开始日 + if (string.IsNullOrEmpty(BeginDate)) return ServiceResult.OprateSuccess("期间开始日不能为空！"); + string StaffBeginDate = jsonParam["StaffBeginDate"]?.Value() ?? "";// 员工填写开始日 + string StaffDays = jsonParam["StaffDays"]?.Value() ?? ""; // 填写天数 + string MGBeginDate = jsonParam["MGBeginDate"]?.Value() ?? ""; // 主管填写开始日 + string MGDays = jsonParam["MGDays"]?.Value() ?? ""; // 主管填写天数 + string OnJobBaseType = jsonParam["OnJobBaseType"]?.Value() ?? ""; // 人员状态基准日 + 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("批量展开成功！"); } + } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrp/Ghrp_PerformancePeriodTypeServices.cs b/Tiobon.Core.Services/Ghrp/Ghrp_PerformancePeriodTypeServices.cs index 56d568c3..b64b3dab 100644 --- a/Tiobon.Core.Services/Ghrp/Ghrp_PerformancePeriodTypeServices.cs +++ b/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 +/// +/// 考核周期类别 (服务) +/// +public class Ghrp_PerformancePeriodTypeServices : BaseServices, IGhrp_PerformancePeriodTypeServices { - /// - /// 考核周期类别 (服务) - /// - public class Ghrp_PerformancePeriodTypeServices : BaseServices, IGhrp_PerformancePeriodTypeServices + private readonly IBaseRepository _dal; + public Ghrp_PerformancePeriodTypeServices(ICaching caching, IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } + public override async Task> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) { - private readonly IBaseRepository _dal; - public Ghrp_PerformancePeriodTypeServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } - public override async Task> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) - { - - var result = await base.QueryFilterPage(filter, condition, IsEnable); - result.result.DT_TableDataT1.ForEach(async x => - { - 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 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 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 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> QueryForm(QueryForm body) - { - var result = await base.QueryForm(body); + public override async Task 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> 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>(StageItems); + var StageItems = result.result.DT_TableDataT1[0].StageItems; + if (!string.IsNullOrWhiteSpace(StageItems)) + result.result.DT_TableDataT1[0].StageItems_List = JsonConvert.DeserializeObject>(StageItems); - return result; - } + return result; + } - public async Task>> GetStageItems(string Stage) - { - List StageItmes = []; - if (Stage == "1Q1C") StageItmes = new List { "C" }; - if (Stage == "1Q2C") StageItmes = new List { "A", "C" }; - if (Stage == "1Q3C") StageItmes = new List { "A", "B", "C" }; + public async Task>> GetStageItems(string Stage) + { + List StageItmes = []; + if (Stage == "1Q1C") StageItmes = new List { "C" }; + if (Stage == "1Q2C") StageItmes = new List { "A", "C" }; + if (Stage == "1Q3C") StageItmes = new List { "A", "B", "C" }; - return ServiceResult>.OprateSuccess("查询成功！", StageItmes); - } + return ServiceResult>.OprateSuccess("查询成功！", StageItmes); } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrp/Ghrp_PerformanceTemplateServices.cs b/Tiobon.Core.Services/Ghrp/Ghrp_PerformanceTemplateServices.cs index d6f6d891..a295be93 100644 --- a/Tiobon.Core.Services/Ghrp/Ghrp_PerformanceTemplateServices.cs +++ b/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; + +/// +/// 考核模板 (服务) +/// +public class Ghrp_PerformanceTemplateServices : BaseServices, IGhrp_PerformanceTemplateServices { - /// - /// 考核模板 (服务) - /// - public class Ghrp_PerformanceTemplateServices : BaseServices, IGhrp_PerformanceTemplateServices + private readonly IBaseRepository _dal; + public Ghrp_PerformanceTemplateServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrp_PerformanceTemplateServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } - public override async Task> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) - { + public override async Task> 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 Add(InsertGhrp_PerformanceTemplateInput entity) + result.result.DT_TableDataT1.ForEach(async x => { - if (entity.PerformancePeriodTypeID != null) - entity.PeriodTypeNo = await Db.Queryable().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 Add(InsertGhrp_PerformanceTemplateInput entity) + { + if (entity.PerformancePeriodTypeID != null) + entity.PeriodTypeNo = await Db.Queryable().Where(a => a.Id == entity.PerformancePeriodTypeID).Select(x => x.PeriodTypeNo).FirstAsync(); + var result = await base.Add(entity); - public override async Task Update(long Id, EditGhrp_PerformanceTemplateInput editModel) - { - if (editModel.PerformancePeriodTypeID != null) - editModel.PeriodTypeNo = await Db.Queryable().Where(a => a.Id == editModel.PerformancePeriodTypeID).Select(x => x.PeriodTypeNo).FirstAsync(); + return result; + } + + public override async Task Update(long Id, EditGhrp_PerformanceTemplateInput editModel) + { + if (editModel.PerformancePeriodTypeID != null) + editModel.PeriodTypeNo = await Db.Queryable().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; } } \ No newline at end of file diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml index 96d5b023..4c356729 100644 --- a/Tiobon.Core/Tiobon.Core.xml +++ b/Tiobon.Core/Tiobon.Core.xml @@ -79,14 +79,14 @@ 初始化 (注入) - + 根据条件查询数据 条件 - + 查询作废 @@ -100,7 +100,7 @@ 主键ID - + 查询菜单表单信息 @@ -148,7 +148,7 @@ 主键IDs - + Excel导出 @@ -205,7 +205,7 @@ - + 导出Excel @@ -512,7 +512,7 @@ - + 获取新入职人员列表 @@ -749,7 +749,7 @@ 培训记录(Controller) - + 根据条件查询数据 @@ -804,7 +804,7 @@ 课程(Controller) - + 根据条件查询数据 @@ -827,7 +827,7 @@ - + 统计 @@ -873,14 +873,14 @@ 学分记录(Controller) - + 查询明细数据 body - + 根据工号查询学分明细 @@ -916,7 +916,7 @@ - + 根据条件查询数据 @@ -1019,7 +1019,7 @@ - + 根据条件查询数据 @@ -1072,7 +1072,7 @@ 考试记录(Controller) - + 根据条件查询数据 @@ -1194,7 +1194,7 @@ 开班管理(Controller) - + 根据条件查询数据 @@ -1355,7 +1355,7 @@ 培训计划(Controller) - + 根据条件查询数据 @@ -1363,21 +1363,21 @@ status - + 根据条件查询数据 条件 - + 根据条件查询数据 条件 - + 培训计划达成率——宝连通 @@ -1421,7 +1421,7 @@ 培训需求(Controller) - + 根据条件查询数据 @@ -1429,7 +1429,7 @@ status - + 查询菜单表单信息 @@ -1441,7 +1441,7 @@ 必选修查询(Controller) - + 根据条件查询数据 @@ -1469,28 +1469,28 @@ 培训记录(Controller) - + 获取ESS查询条件 - + 获取ESS查询条件 - + 获取学习记录 - + 获取课程 @@ -1514,7 +1514,7 @@ - + 讲师上课分析 @@ -1543,7 +1543,7 @@ 必选修规则结果(Controller) - + 根据条件查询数据 @@ -1561,7 +1561,7 @@ 问卷调查(Controller) - + 根据条件查询数据 @@ -1715,7 +1715,7 @@ 培训讲师异动(Controller) - + 根据条件查询数据 @@ -1728,7 +1728,7 @@ Ghre_Teacher(Controller) - + 根据条件查询数据 @@ -1756,7 +1756,7 @@ 【牛尾】培训计划(Controller) - + 根据条件查询数据 @@ -1796,7 +1796,7 @@ 人力需求维护(Controller) - + 根据条件查询数据 @@ -1804,7 +1804,7 @@ status - + Excel导出 @@ -1883,7 +1883,7 @@ - + 根据条件查询数据 @@ -1960,7 +1960,7 @@ - + 根据条件查询数据 @@ -2087,7 +2087,7 @@ 简历Ids - + ESS端查询面试记录 @@ -2171,7 +2171,7 @@ 语言别 - + Excel导出录用名单 @@ -2226,7 +2226,7 @@ - + 获取分组数据 @@ -2249,28 +2249,28 @@ - + 获取分组数据 - + 执行分组列栏位操作 - + 查询模板栏位 - + 查询模板栏位