diff --git a/Tiobon.Core.IServices/BASE/IBaseServices.cs b/Tiobon.Core.IServices/BASE/IBaseServices.cs index b72fa092..5985f4e5 100644 --- a/Tiobon.Core.IServices/BASE/IBaseServices.cs +++ b/Tiobon.Core.IServices/BASE/IBaseServices.cs @@ -1,178 +1,177 @@ -using System.Data; -using System.Linq.Expressions; -using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using SqlSugar; +using System.Data; +using System.Linq.Expressions; using Tiobon.Core.Common; using Tiobon.Core.Model; -namespace Tiobon.Core.IServices.BASE +namespace Tiobon.Core.IServices.BASE; + +public interface IBaseServices where TEntity : class { - public interface IBaseServices where TEntity : class - { - ISqlSugarClient Db { get; } + ISqlSugarClient Db { get; } + + Task QueryById(object objId); + Task QueryById(object objId, bool blnUseCache = false); + Task> QueryByIDs(object[] lstIds); + + Task Add(TEntity model); - Task QueryById(object objId); - Task QueryById(object objId, bool blnUseCache = false); - Task> QueryByIDs(object[] lstIds); + Task> Add(List listEntity); - Task Add(TEntity model); + Task DeleteById(object id); - Task> Add(List listEntity); + Task Delete(TEntity model); - Task DeleteById(object id); + Task DeleteByIds(object[] ids); - Task Delete(TEntity model); + Task Update(TEntity model); + Task Update(List model); + Task Update(TEntity entity, string where); - Task DeleteByIds(object[] ids); + Task Update(object operateAnonymousObjects); - Task Update(TEntity model); - Task Update(List model); - Task Update(TEntity entity, string where); + Task Update(TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, string where = ""); - Task Update(object operateAnonymousObjects); + Task> Query(); + Task> Query(string where); + Task> Query(Expression> whereExpression); + Task> Query(Expression> whereExpression, string orderByFields); + Task> Query(Expression> expression); + Task> Query(Expression> expression, Expression> whereExpression, string orderByFields); + Task> Query(Expression> whereExpression, Expression> orderByExpression, bool isAsc = true); + Task> Query(string where, string orderByFields); + Task> QuerySql(string sql, SugarParameter[] parameters = null); + Task QueryTable(string sql, SugarParameter[] parameters = null); - Task Update(TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, string where = ""); + Task> Query(Expression> whereExpression, int top, string orderByFields); + Task> Query(string where, int top, string orderByFields); - Task> Query(); - Task> Query(string where); - Task> Query(Expression> whereExpression); - Task> Query(Expression> whereExpression, string orderByFields); - Task> Query(Expression> expression); - Task> Query(Expression> expression, Expression> whereExpression, string orderByFields); - Task> Query(Expression> whereExpression, Expression> orderByExpression, bool isAsc = true); - Task> Query(string where, string orderByFields); - Task> QuerySql(string sql, SugarParameter[] parameters = null); - Task QueryTable(string sql, SugarParameter[] parameters = null); + Task> Query( + Expression> whereExpression, int pageIndex, int pageSize, string orderByFields); + Task> Query(string where, int pageIndex, int pageSize, string orderByFields); - Task> Query(Expression> whereExpression, int top, string orderByFields); - Task> Query(string where, int top, string orderByFields); - Task> Query( - Expression> whereExpression, int pageIndex, int pageSize, string orderByFields); - Task> Query(string where, int pageIndex, int pageSize, string orderByFields); + Task> QueryPage(Expression> whereExpression, int pageIndex = 1, int pageSize = 20, string orderByFields = null); + + Task> QueryMuch( + Expression> joinExpression, + Expression> selectExpression, + Expression> whereLambda = null) where T : class, new(); + Task> QueryPage(PaginationModel pagination); + + #region 分表 + Task QueryByIdSplit(object objId); + Task> AddSplit(TEntity entity); + Task DeleteSplit(TEntity entity, DateTime dateTime); + Task UpdateSplit(TEntity entity, DateTime dateTime); + Task> QueryPageSplit(Expression> whereExpression, DateTime beginTime, DateTime endTime, int pageIndex = 1, int pageSize = 20, string orderByFields = null); + #endregion +} + + +/// +/// 增删改查接口 +/// +/// +/// +/// +/// +public interface IBaseServices where TEntity : class +{ + ISqlSugarClient Db { get; } + + Task AnyAsync(object objId); + + Task AnyAsync(Expression> whereExpression); + + /// + /// 根据ID查询实体数据是否存在 + /// + /// + /// + Task QueryById(object objId); + Task QueryById(object objId, bool blnUseCache = false); + Task> QueryByIDs(object[] lstIds); + + Task> QueryForm(QueryForm body); + Task Add(TInsertDto model); - Task> QueryPage(Expression> whereExpression, int pageIndex = 1, int pageSize = 20, string orderByFields = null); + Task> Add(List listEntity); - Task> QueryMuch( - Expression> joinExpression, - Expression> selectExpression, - Expression> whereLambda = null) where T : class, new(); - Task> QueryPage(PaginationModel pagination); + Task DeleteById(object id); + Task DeleteById1(object id); - #region 分表 - Task QueryByIdSplit(object objId); - Task> AddSplit(TEntity entity); - Task DeleteSplit(TEntity entity, DateTime dateTime); - Task UpdateSplit(TEntity entity, DateTime dateTime); - Task> QueryPageSplit(Expression> whereExpression, DateTime beginTime, DateTime endTime, int pageIndex = 1, int pageSize = 20, string orderByFields = null); - #endregion - } + Task Delete(TEntity model); + Task DeleteByIds(object[] ids); + Task DeleteByIds1(long[] ids); /// - /// 增删改查接口 + /// 根据表达式,删除实体 /// - /// - /// - /// - /// - public interface IBaseServices where TEntity : class - { - ISqlSugarClient Db { get; } - - Task AnyAsync(object objId); - - Task AnyAsync(Expression> whereExpression); - - /// - /// 根据ID查询实体数据是否存在 - /// - /// - /// - Task QueryById(object objId); - Task QueryById(object objId, bool blnUseCache = false); - Task> QueryByIDs(object[] lstIds); - - Task> QueryForm(QueryForm body); - - Task Add(TInsertDto model); - - Task> Add(List listEntity); - - Task DeleteById(object id); - Task DeleteById1(object id); - - Task Delete(TEntity model); - - Task DeleteByIds(object[] ids); - Task DeleteByIds1(long[] ids); - - /// - /// 根据表达式,删除实体 - /// - /// - /// - Task Delete(Expression> whereExpression); - - Task Update(long Id, TEditDto model); - Task Update(long Id, TEditDto model, List lstColumns = null, List lstIgnoreColumns = null, string where = ""); - - Task Update(Dictionary editModels); - Task Update(List model); - Task Update(TEntity entity, string where); - - Task Update(object operateAnonymousObjects); - - Task Update(TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, string where = ""); - Task Update(List entitys, List lstColumns = null, List lstIgnoreColumns = null, string where = ""); - - Task> Query(); - Task> Query(string where); - Task> Query(Expression> whereExpression); - - Task> QueryDto(Expression> whereExpression); - Task QuerySingle(object objId); - Task QuerySingle(Expression> whereExpression); - Task QuerySingleDto(Expression> whereExpression); - Task> Query(Expression> whereExpression, string orderByFields); - Task> Query(Expression> expression); - Task> Query(Expression> expression, Expression> whereExpression, string orderByFields); - Task> Query(Expression> whereExpression, Expression> orderByExpression, bool isAsc = true); - Task> Query(string where, string orderByFields); - Task> QuerySql(string sql, SugarParameter[] parameters = null); - Task QueryTable(string sql, SugarParameter[] parameters = null); - - Task> Query(Expression> whereExpression, int top, string orderByFields); - Task> Query(string where, int top, string orderByFields); - - Task> Query( - Expression> whereExpression, int pageIndex, int pageSize, string orderByFields); - Task> Query(string where, int pageIndex, int pageSize, string orderByFields); - - - Task> QueryPage(Expression> whereExpression, int pageIndex = 1, int pageSize = 20, string orderByFields = null); - Task> QueryFilterPage([FromBody] QueryBody body); - Task> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true); - Task> ExportExcel(QueryExport body); - - Task> ImportExcel(IFormFile file, string menuName = null, long? MasterId = null); - - Task> DownloadExcel(string menuName); - - Task> QueryMuch( - Expression> joinExpression, - Expression> selectExpression, - Expression> whereLambda = null) where T : class, new(); - Task> QueryPage(PaginationModel pagination); - - #region 分表 - Task QueryByIdSplit(object objId); - Task> AddSplit(TEntity entity); - Task DeleteSplit(TEntity entity, DateTime dateTime); - Task UpdateSplit(TEntity entity, DateTime dateTime); - Task> QueryPageSplit(Expression> whereExpression, DateTime beginTime, DateTime endTime, int pageIndex = 1, int pageSize = 20, string orderByFields = null); - #endregion - } + /// + /// + Task Delete(Expression> whereExpression); + + Task Update(long Id, TEditDto model); + Task Update(long Id, TEditDto model, List lstColumns = null, List lstIgnoreColumns = null, string where = ""); + + Task Update(Dictionary editModels); + Task Update(List model); + Task Update(TEntity entity, string where); + + Task Update(object operateAnonymousObjects); + + Task Update(TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, string where = ""); + Task Update(List entitys, List lstColumns = null, List lstIgnoreColumns = null, string where = ""); + + Task> Query(); + Task> Query(string where); + Task> Query(Expression> whereExpression); + + Task> QueryDto(Expression> whereExpression); + Task QuerySingle(object objId); + Task QuerySingle(Expression> whereExpression); + Task QuerySingleDto(Expression> whereExpression); + Task> Query(Expression> whereExpression, string orderByFields); + Task> Query(Expression> expression); + Task> Query(Expression> expression, Expression> whereExpression, string orderByFields); + Task> Query(Expression> whereExpression, Expression> orderByExpression, bool isAsc = true); + Task> Query(string where, string orderByFields); + Task> QuerySql(string sql, SugarParameter[] parameters = null); + Task QueryTable(string sql, SugarParameter[] parameters = null); + + Task> Query(Expression> whereExpression, int top, string orderByFields); + Task> Query(string where, int top, string orderByFields); + + Task> Query( + Expression> whereExpression, int pageIndex, int pageSize, string orderByFields); + Task> Query(string where, int pageIndex, int pageSize, string orderByFields); + + + Task> QueryPage(Expression> whereExpression, int pageIndex = 1, int pageSize = 20, string orderByFields = null); + Task> QueryFilterPage([FromBody] QueryBody body); + Task> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true); + Task> ExportExcel(QueryExport body); + + Task> ImportExcel(IFormFile file, string menuName = null, long? MasterId = null); + + Task> DownloadExcel(string menuName); + + Task> QueryMuch( + Expression> joinExpression, + Expression> selectExpression, + Expression> whereLambda = null) where T : class, new(); + Task> QueryPage(PaginationModel pagination); + + #region 分表 + Task QueryByIdSplit(object objId); + Task> AddSplit(TEntity entity); + Task DeleteSplit(TEntity entity, DateTime dateTime); + Task UpdateSplit(TEntity entity, DateTime dateTime); + Task> QueryPageSplit(Expression> whereExpression, DateTime beginTime, DateTime endTime, int pageIndex = 1, int pageSize = 20, string orderByFields = null); + #endregion } diff --git a/Tiobon.Core.IServices/Ghra/IGhra_JobServices.cs b/Tiobon.Core.IServices/Ghra/IGhra_JobServices.cs index 54328c3f..c466e21a 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_JobServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_JobServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// Ghra_Job(自定义服务接口) /// - public interface IGhra_JobServices :IBaseServices +public interface IGhra_JobServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghra/IGhra_StaffEduBGServices.cs b/Tiobon.Core.IServices/Ghra/IGhra_StaffEduBGServices.cs index 434db318..ae8394ee 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_StaffEduBGServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_StaffEduBGServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// Ghra_StaffEduBG(自定义服务接口) /// - public interface IGhra_StaffEduBGServices :IBaseServices +public interface IGhra_StaffEduBGServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghra/IGhra_StaffLicenceServices.cs b/Tiobon.Core.IServices/Ghra/IGhra_StaffLicenceServices.cs index 7306c9c0..daa3cf7d 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_StaffLicenceServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_StaffLicenceServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// Ghra_StaffLicence(自定义服务接口) /// - public interface IGhra_StaffLicenceServices :IBaseServices +public interface IGhra_StaffLicenceServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghra/IGhra_StaffSocialRelationServices.cs b/Tiobon.Core.IServices/Ghra/IGhra_StaffSocialRelationServices.cs index c6297f6f..de886554 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_StaffSocialRelationServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_StaffSocialRelationServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghra_StaffSocialRelation(自定义服务接口) - /// - public interface IGhra_StaffSocialRelationServices :IBaseServices - { - } +namespace Tiobon.Core.IServices; + +/// +/// Ghra_StaffSocialRelation(自定义服务接口) +/// +public interface IGhra_StaffSocialRelationServices : IBaseServices +{ } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghra/IGhra_StaffTrainingServices.cs b/Tiobon.Core.IServices/Ghra/IGhra_StaffTrainingServices.cs index 3f4b6b34..eedd0211 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_StaffTrainingServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_StaffTrainingServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// Ghra_StaffTraining(自定义服务接口) /// - public interface IGhra_StaffTrainingServices :IBaseServices +public interface IGhra_StaffTrainingServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghra/IGhra_StaffWorkExpServices.cs b/Tiobon.Core.IServices/Ghra/IGhra_StaffWorkExpServices.cs index 54be65b6..cb598ed6 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_StaffWorkExpServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_StaffWorkExpServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghra_StaffWorkExp(自定义服务接口) - /// - public interface IGhra_StaffWorkExpServices :IBaseServices - { - } +namespace Tiobon.Core.IServices; + +/// +/// Ghra_StaffWorkExp(自定义服务接口) +/// +public interface IGhra_StaffWorkExpServices : 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 e2d5f6ce..e917b487 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_TitleServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_TitleServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 岗位(自定义服务接口) /// - public interface IGhra_TitleServices :IBaseServices +public interface IGhra_TitleServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghra/IGhra_ZoneServices.cs b/Tiobon.Core.IServices/Ghra/IGhra_ZoneServices.cs index b9931553..007ef316 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_ZoneServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_ZoneServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 厂区(自定义服务接口) /// - public interface IGhra_ZoneServices :IBaseServices +public interface IGhra_ZoneServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrc/IGhrc_SalaryItemServices.cs b/Tiobon.Core.IServices/Ghrc/IGhrc_SalaryItemServices.cs index 77f24293..dc7a5d63 100644 --- a/Tiobon.Core.IServices/Ghrc/IGhrc_SalaryItemServices.cs +++ b/Tiobon.Core.IServices/Ghrc/IGhrc_SalaryItemServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// Ghrc_SalaryItem(自定义服务接口) /// - public interface IGhrc_SalaryItemServices :IBaseServices +public interface IGhrc_SalaryItemServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_AttachmentServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_AttachmentServices.cs index e91a21fe..8275b8fd 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_AttachmentServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_AttachmentServices.cs @@ -8,8 +8,8 @@ namespace Tiobon.Core.IServices; /// /// 附件(自定义服务接口) /// -public interface IGhre_AttachmentServices :IBaseServices - { +public interface IGhre_AttachmentServices : IBaseServices +{ Task> UploadVideoAsync(ChunkUpload upload); } \ 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 2ef58ddc..8c7d66b9 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CertificateRuleServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CertificateRuleServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 培训证书规则(自定义服务接口) /// - public interface IGhre_CertificateRuleServices :IBaseServices +public interface IGhre_CertificateRuleServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_CertificateServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_CertificateServices.cs index 88998007..f32a291d 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CertificateServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CertificateServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 培训记录(自定义服务接口) /// - public interface IGhre_CertificateServices :IBaseServices +public interface IGhre_CertificateServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_ConfigServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ConfigServices.cs index 62743dcb..16509eb6 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ConfigServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ConfigServices.cs @@ -7,7 +7,7 @@ namespace Tiobon.Core.IServices; /// /// 参数配置(自定义服务接口) /// - public interface IGhre_ConfigServices :IBaseServices +public interface IGhre_ConfigServices : IBaseServices { - Task BulkUpdateValue(List entitys); - } \ No newline at end of file + Task BulkUpdateValue(List entitys); +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_CourseClassServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_CourseClassServices.cs index 14a94e33..7fe4252b 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CourseClassServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CourseClassServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 课程分类(自定义服务接口) /// - public interface IGhre_CourseClassServices :IBaseServices +public interface IGhre_CourseClassServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_CourseSceneServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_CourseSceneServices.cs index c1206dfc..09ead8b8 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CourseSceneServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CourseSceneServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 课程场景(自定义服务接口) /// - public interface IGhre_CourseSceneServices :IBaseServices +public interface IGhre_CourseSceneServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_CourseServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_CourseServices.cs index 05dd8516..d33bb557 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CourseServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CourseServices.cs @@ -11,7 +11,7 @@ namespace Tiobon.Core.IServices; public interface IGhre_CourseServices : IBaseServices { - Task> QueryList(QueryBody filter, string status, List ids); + Task> QueryList(QueryBody filter, string status, List ids); Task> QueryDeptID(int StaffID); Task> QueryTeacher(long? linkId); diff --git a/Tiobon.Core.IServices/Ghre/IGhre_CourseSnapServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_CourseSnapServices.cs index 2c0fa1c0..e12ed2ae 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CourseSnapServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CourseSnapServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// Ghre_CourseSnap(自定义服务接口) /// - public interface IGhre_CourseSnapServices :IBaseServices +public interface IGhre_CourseSnapServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_CourseWareAttachmentServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_CourseWareAttachmentServices.cs index ad63fe67..8f7721a5 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CourseWareAttachmentServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CourseWareAttachmentServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 课件附件(自定义服务接口) /// - public interface IGhre_CourseWareAttachmentServices :IBaseServices +public interface IGhre_CourseWareAttachmentServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_CourseWareServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_CourseWareServices.cs index 6873857b..b0bbbd9b 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CourseWareServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CourseWareServices.cs @@ -7,8 +7,8 @@ namespace Tiobon.Core.IServices; /// /// 课件(自定义服务接口) /// - public interface IGhre_CourseWareServices :IBaseServices +public interface IGhre_CourseWareServices : IBaseServices { - Task> DownZip(long id); - } \ No newline at end of file + Task> DownZip(long id); +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_ExamMessageLogServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ExamMessageLogServices.cs index 6f6f6759..c17a34bd 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamMessageLogServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamMessageLogServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 考试通知记录(自定义服务接口) /// - public interface IGhre_ExamMessageLogServices :IBaseServices +public interface IGhre_ExamMessageLogServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperConfigServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperConfigServices.cs index c030ad26..5dbd1f4e 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperConfigServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperConfigServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 试卷配置(自定义服务接口) /// - public interface IGhre_ExamPaperConfigServices :IBaseServices +public interface IGhre_ExamPaperConfigServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperQuestionServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperQuestionServices.cs index 585a7a90..474d33c8 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperQuestionServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperQuestionServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 试卷题目(自定义服务接口) /// - public interface IGhre_ExamPaperQuestionServices :IBaseServices +public interface IGhre_ExamPaperQuestionServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperServices.cs index 1a87fa14..31b04057 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperServices.cs @@ -4,25 +4,24 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// 试卷(自定义服务接口) - /// - public interface IGhre_ExamPaperServices :IBaseServices - { - Task> QueryDefault(long Id); +namespace Tiobon.Core.IServices; - Task> InsertConfig(InsertGhre_ExamPaperConfigInput insert); - Task> Insert1([FromBody] DefaultGhre_ExamPaperPageData insert); - Task Update1(long id, DefaultGhre_ExamPaperPageData insertModel); +/// +/// 试卷(自定义服务接口) +/// +public interface IGhre_ExamPaperServices : IBaseServices +{ + Task> QueryDefault(long Id); - Task UpdateStatus(long[] ids, string status); + Task> InsertConfig(InsertGhre_ExamPaperConfigInput insert); + Task> Insert1([FromBody] DefaultGhre_ExamPaperPageData insert); + Task Update1(long id, DefaultGhre_ExamPaperPageData insertModel); - Task> QueryList(QueryBody body, string status, List ids = null); + Task UpdateStatus(long[] ids, string status); - Task> GetSelectAsync(long? linkId, string KeyWords); + Task> QueryList(QueryBody body, string status, List ids = null); - Task> ExportExcel(QueryExport body, string status); - } + Task> GetSelectAsync(long? linkId, string KeyWords); + + Task> ExportExcel(QueryExport body, string status); } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordAnswerServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordAnswerServices.cs index b6780402..5e369ddc 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordAnswerServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordAnswerServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghre_ExamRecordAnswer(自定义服务接口) - /// - public interface IGhre_ExamRecordAnswerServices :IBaseServices - { - } +namespace Tiobon.Core.IServices; + +/// +/// Ghre_ExamRecordAnswer(自定义服务接口) +/// +public interface IGhre_ExamRecordAnswerServices : IBaseServices +{ } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordDetailServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordDetailServices.cs index 216f8160..88487653 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordDetailServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordDetailServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// Ghre_ExamRecordDetail(自定义服务接口) /// - public interface IGhre_ExamRecordDetailServices :IBaseServices +public interface IGhre_ExamRecordDetailServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_ExamStaffServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ExamStaffServices.cs index c410e941..a5c6e04c 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamStaffServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamStaffServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// Ghre_ExamStaff(自定义服务接口) /// - public interface IGhre_ExamStaffServices :IBaseServices +public interface IGhre_ExamStaffServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_QuestionAnswerServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_QuestionAnswerServices.cs index 9a590a52..0d5f12f2 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_QuestionAnswerServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_QuestionAnswerServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 题目答案(自定义服务接口) /// - public interface IGhre_QuestionAnswerServices :IBaseServices +public interface IGhre_QuestionAnswerServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_RequiredCourseServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_RequiredCourseServices.cs index 42bca7b3..d46750f4 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_RequiredCourseServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_RequiredCourseServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 必选修查询(自定义服务接口) /// -public interface IGhre_RequiredCourseServices :IBaseServices - { +public interface IGhre_RequiredCourseServices : IBaseServices +{ } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_SchoolAttachmentServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_SchoolAttachmentServices.cs index 565cc2c7..f2a75f63 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_SchoolAttachmentServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_SchoolAttachmentServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// 培训机构附件(自定义服务接口) - /// - public interface IGhre_SchoolAttachmentServices :IBaseServices - { - } +namespace Tiobon.Core.IServices; + +/// +/// 培训机构附件(自定义服务接口) +/// +public interface IGhre_SchoolAttachmentServices : IBaseServices +{ } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_SchoolServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_SchoolServices.cs index 25746426..dad8405e 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_SchoolServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_SchoolServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// 培训机构(自定义服务接口) - /// - public interface IGhre_SchoolServices :IBaseServices - { - } +namespace Tiobon.Core.IServices; + +/// +/// 培训机构(自定义服务接口) +/// +public interface IGhre_SchoolServices : IBaseServices +{ } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_StudyRecordServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_StudyRecordServices.cs index 1361709a..0692bf42 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_StudyRecordServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_StudyRecordServices.cs @@ -9,12 +9,12 @@ namespace Tiobon.Core.IServices; /// /// 培训记录(自定义服务接口) /// -public interface IGhre_StudyRecordServices :IBaseServices - { - Task> QueryESSSearchFields(QueryBody body); +public interface IGhre_StudyRecordServices : IBaseServices +{ + Task> QueryESSSearchFields(QueryBody body); - Task> QueryESS(QueryBody filter, string condition, bool? IsEnable = true); + Task> QueryESS(QueryBody filter, string condition, bool? IsEnable = true); Task> QueryStaff(QueryBody filter); diff --git a/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleResultServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleResultServices.cs index d4f718db..6b1937a4 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleResultServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleResultServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 必选修规则结果(自定义服务接口) /// - public interface IGhre_StudyRuleResultServices :IBaseServices +public interface IGhre_StudyRuleResultServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleServices.cs index e157c6c9..9c071b6d 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleServices.cs @@ -6,7 +6,7 @@ namespace Tiobon.Core.IServices; /// /// 必选修规则(自定义服务接口) /// - public interface IGhre_StudyRuleServices :IBaseServices +public interface IGhre_StudyRuleServices : IBaseServices { - Task StaffIn(); - } \ No newline at end of file + Task StaffIn(); +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleStaffServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleStaffServices.cs index 438704f2..9bc0a25d 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleStaffServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleStaffServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 必选修规则人员(自定义服务接口) /// - public interface IGhre_StudyRuleStaffServices :IBaseServices +public interface IGhre_StudyRuleStaffServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_TeacherAttachmentServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_TeacherAttachmentServices.cs index 7e722007..fd6e7957 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_TeacherAttachmentServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_TeacherAttachmentServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// Ghre_TeacherAttachment(自定义服务接口) /// - public interface IGhre_TeacherAttachmentServices :IBaseServices +public interface IGhre_TeacherAttachmentServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_TeacherChangeAttachmentServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_TeacherChangeAttachmentServices.cs index e3c3c0b0..5f3f63a4 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_TeacherChangeAttachmentServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_TeacherChangeAttachmentServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 培训讲师异动附件(自定义服务接口) /// - public interface IGhre_TeacherChangeAttachmentServices :IBaseServices +public interface IGhre_TeacherChangeAttachmentServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_TeacherChangeServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_TeacherChangeServices.cs index 86fa31cc..c1d3e2a6 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_TeacherChangeServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_TeacherChangeServices.cs @@ -3,12 +3,12 @@ using Tiobon.Core.Model; using Tiobon.Core.Model.Models; namespace Tiobon.Core.IServices; - - /// - /// 培训讲师异动(自定义服务接口) - /// -public interface IGhre_TeacherChangeServices :IBaseServices - { + +/// +/// 培训讲师异动(自定义服务接口) +/// +public interface IGhre_TeacherChangeServices : IBaseServices +{ Task UpdateStatus(InsertGhre_TeacherChangeInput input, string status); Task> InsertByStatus(InsertGhre_TeacherChangeInput insertModel, string status); diff --git a/Tiobon.Core.IServices/Ghre/IGhre_TeacherServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_TeacherServices.cs index 4239f108..e93c6c5d 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_TeacherServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_TeacherServices.cs @@ -7,8 +7,8 @@ namespace Tiobon.Core.IServices; /// /// Ghre_Teacher(自定义服务接口) /// -public interface IGhre_TeacherServices :IBaseServices - { +public interface IGhre_TeacherServices : IBaseServices +{ Task UpdateStatus(InsertGhre_TeacherInput input, string status); Task> InsertByStatus(InsertGhre_TeacherInput insertModel, string status); diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_AssessConfigServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_AssessConfigServices.cs index fb41ba8f..ef76d239 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_AssessConfigServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_AssessConfigServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 面试评估设定(自定义服务接口) /// -public interface IGhrh_AssessConfigServices :IBaseServices - { +public interface IGhrh_AssessConfigServices : IBaseServices +{ } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_HumanRequestDetailServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_HumanRequestDetailServices.cs index e2b475e6..b60588c4 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_HumanRequestDetailServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_HumanRequestDetailServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// 人力需求维护明细(自定义服务接口) - /// - public interface IGhrh_HumanRequestDetailServices :IBaseServices - { - } +namespace Tiobon.Core.IServices; + +/// +/// 人力需求维护明细(自定义服务接口) +/// +public interface IGhrh_HumanRequestDetailServices : IBaseServices +{ } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_InterviewAssessDetailServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_InterviewAssessDetailServices.cs index 58a3604d..ea1c21cf 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_InterviewAssessDetailServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_InterviewAssessDetailServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 面试单评估明细(自定义服务接口) /// - public interface IGhrh_InterviewAssessDetailServices :IBaseServices +public interface IGhrh_InterviewAssessDetailServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_InterviewLogServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_InterviewLogServices.cs index 9ae8d380..4ed5227e 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_InterviewLogServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_InterviewLogServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 面试工单日志(自定义服务接口) /// - public interface IGhrh_InterviewLogServices :IBaseServices +public interface IGhrh_InterviewLogServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_InterviewOrderServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_InterviewOrderServices.cs index 7133678b..d0638db4 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_InterviewOrderServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_InterviewOrderServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 面试工单(自定义服务接口) /// - public interface IGhrh_InterviewOrderServices :IBaseServices +public interface IGhrh_InterviewOrderServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_InterviewRecordServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_InterviewRecordServices.cs index 69d6607f..d929c5bc 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_InterviewRecordServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_InterviewRecordServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 面试记录(自定义服务接口) /// - public interface IGhrh_InterviewRecordServices :IBaseServices +public interface IGhrh_InterviewRecordServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeEduBGServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeEduBGServices.cs index fb740dba..f90bfec6 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeEduBGServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeEduBGServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 教育背景(自定义服务接口) /// - public interface IGhrh_ResumeEduBGServices :IBaseServices +public interface IGhrh_ResumeEduBGServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeHomeServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeHomeServices.cs index 4cec347c..403e8a56 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeHomeServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeHomeServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 家庭关系(自定义服务接口) /// - public interface IGhrh_ResumeHomeServices :IBaseServices +public interface IGhrh_ResumeHomeServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeInfoColumnServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeInfoColumnServices.cs index 87dd4170..535980cd 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeInfoColumnServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeInfoColumnServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 简历信息栏位(自定义服务接口) /// - public interface IGhrh_ResumeInfoColumnServices :IBaseServices +public interface IGhrh_ResumeInfoColumnServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeInfoGroupServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeInfoGroupServices.cs index bbbbb2f5..46aa8cdd 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeInfoGroupServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeInfoGroupServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 简历组别(自定义服务接口) /// - public interface IGhrh_ResumeInfoGroupServices :IBaseServices +public interface IGhrh_ResumeInfoGroupServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeLicenceServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeLicenceServices.cs index 94f86253..3f5e4204 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeLicenceServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeLicenceServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 证件(自定义服务接口) /// - public interface IGhrh_ResumeLicenceServices :IBaseServices +public interface IGhrh_ResumeLicenceServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeStatementServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeStatementServices.cs index d8772d7f..1a7f9d05 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeStatementServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeStatementServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 简历声明(自定义服务接口) /// - public interface IGhrh_ResumeStatementServices :IBaseServices +public interface IGhrh_ResumeStatementServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTagServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTagServices.cs index f94224ca..4b55a81e 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTagServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTagServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 简历标签(自定义服务接口) /// - public interface IGhrh_ResumeTagServices :IBaseServices +public interface IGhrh_ResumeTagServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTemplateServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTemplateServices.cs index d71d443d..b3525fd7 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTemplateServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTemplateServices.cs @@ -9,21 +9,21 @@ namespace Tiobon.Core.IServices; /// /// 简历模板(自定义服务接口) /// - public interface IGhrh_ResumeTemplateServices :IBaseServices +public interface IGhrh_ResumeTemplateServices : IBaseServices { - Task SwitchPublish(long id, int? isPublish); + Task SwitchPublish(long id, int? isPublish); - Task>> QueryGroup(QueryForm filter); + Task>> QueryGroup(QueryForm filter); - Task PhotoSwitch(long id, int? photoType); + Task PhotoSwitch(long id, int? photoType); - Task ColumnMove(long id, List columns); + Task ColumnMove(long id, List columns); - Task>> QueryTemplateColumn(QueryForm filter); + Task>> QueryTemplateColumn(QueryForm filter); - Task ExceteTemplateColumnChange(QueryForm filter); + Task ExceteTemplateColumnChange(QueryForm filter); - Task> QueryTemplateColumnSingle(QueryForm filter); + Task> QueryTemplateColumnSingle(QueryForm filter); - Task PT_GHR30_StaffTemplate_IUD(QueryForm1 filter); - } \ No newline at end of file + Task PT_GHR30_StaffTemplate_IUD(QueryForm1 filter); +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTrainingServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTrainingServices.cs index 21e29f13..eff1af67 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTrainingServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTrainingServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 简历培训记录(自定义服务接口) /// - public interface IGhrh_ResumeTrainingServices :IBaseServices +public interface IGhrh_ResumeTrainingServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeWorkExpServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeWorkExpServices.cs index 35766878..e17b3e60 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeWorkExpServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeWorkExpServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 工作经历(自定义服务接口) /// - public interface IGhrh_ResumeWorkExpServices :IBaseServices +public interface IGhrh_ResumeWorkExpServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_StatementServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_StatementServices.cs index a6c2f910..2f607c76 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_StatementServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_StatementServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 声明(自定义服务接口) /// - public interface IGhrh_StatementServices :IBaseServices +public interface IGhrh_StatementServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghro/IGhro_DeptServices.cs b/Tiobon.Core.IServices/Ghro/IGhro_DeptServices.cs index a323c5c1..1e272123 100644 --- a/Tiobon.Core.IServices/Ghro/IGhro_DeptServices.cs +++ b/Tiobon.Core.IServices/Ghro/IGhro_DeptServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// Ghro_Dept(自定义服务接口) /// - public interface IGhro_DeptServices :IBaseServices +public interface IGhro_DeptServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrs/IGhrs_AttachmentServices.cs b/Tiobon.Core.IServices/Ghrs/IGhrs_AttachmentServices.cs index bb54a405..4ddcd7e2 100644 --- a/Tiobon.Core.IServices/Ghrs/IGhrs_AttachmentServices.cs +++ b/Tiobon.Core.IServices/Ghrs/IGhrs_AttachmentServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// Ghrs_Attachment(自定义服务接口) /// - public interface IGhrs_AttachmentServices :IBaseServices +public interface IGhrs_AttachmentServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrs/IGhrs_DataRoleDetailServices.cs b/Tiobon.Core.IServices/Ghrs/IGhrs_DataRoleDetailServices.cs index fc8bfe2d..5d434903 100644 --- a/Tiobon.Core.IServices/Ghrs/IGhrs_DataRoleDetailServices.cs +++ b/Tiobon.Core.IServices/Ghrs/IGhrs_DataRoleDetailServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// Ghrs_DataRoleDetail(自定义服务接口) /// - public interface IGhrs_DataRoleDetailServices :IBaseServices +public interface IGhrs_DataRoleDetailServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrs/IGhrs_ListCommonSqlServices.cs b/Tiobon.Core.IServices/Ghrs/IGhrs_ListCommonSqlServices.cs index 8055f538..3c1dadef 100644 --- a/Tiobon.Core.IServices/Ghrs/IGhrs_ListCommonSqlServices.cs +++ b/Tiobon.Core.IServices/Ghrs/IGhrs_ListCommonSqlServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// Ghrs_ListCommonSql(自定义服务接口) /// - public interface IGhrs_ListCommonSqlServices :IBaseServices +public interface IGhrs_ListCommonSqlServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrs/IGhrs_MenuServices.cs b/Tiobon.Core.IServices/Ghrs/IGhrs_MenuServices.cs index 510ba574..e6dad364 100644 --- a/Tiobon.Core.IServices/Ghrs/IGhrs_MenuServices.cs +++ b/Tiobon.Core.IServices/Ghrs/IGhrs_MenuServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// Ghrs_Menu(自定义服务接口) /// - public interface IGhrs_MenuServices :IBaseServices +public interface IGhrs_MenuServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrs/IGhrs_ParaDetailServices.cs b/Tiobon.Core.IServices/Ghrs/IGhrs_ParaDetailServices.cs index 1b320e4e..5fb5a571 100644 --- a/Tiobon.Core.IServices/Ghrs/IGhrs_ParaDetailServices.cs +++ b/Tiobon.Core.IServices/Ghrs/IGhrs_ParaDetailServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// Ghrs_ParaDetail(自定义服务接口) /// - public interface IGhrs_ParaDetailServices :IBaseServices +public interface IGhrs_ParaDetailServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrs/IGhrs_UserServices.cs b/Tiobon.Core.IServices/Ghrs/IGhrs_UserServices.cs index 848a84b0..2b89eb7c 100644 --- a/Tiobon.Core.IServices/Ghrs/IGhrs_UserServices.cs +++ b/Tiobon.Core.IServices/Ghrs/IGhrs_UserServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// 系统用户(自定义服务接口) /// - public interface IGhrs_UserServices :IBaseServices +public interface IGhrs_UserServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrz/IGhrz_Shihua_OA_EmploymentServices.cs b/Tiobon.Core.IServices/Ghrz/IGhrz_Shihua_OA_EmploymentServices.cs index 42b20072..fc7cade5 100644 --- a/Tiobon.Core.IServices/Ghrz/IGhrz_Shihua_OA_EmploymentServices.cs +++ b/Tiobon.Core.IServices/Ghrz/IGhrz_Shihua_OA_EmploymentServices.cs @@ -6,6 +6,6 @@ namespace Tiobon.Core.IServices; /// /// Ghrz_Shihua_OA_Employment(自定义服务接口) /// - public interface IGhrz_Shihua_OA_EmploymentServices :IBaseServices +public interface IGhrz_Shihua_OA_EmploymentServices : IBaseServices { - } \ No newline at end of file +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/IBlogArticleServices.cs b/Tiobon.Core.IServices/IBlogArticleServices.cs index f33dfd03..28219bd8 100644 --- a/Tiobon.Core.IServices/IBlogArticleServices.cs +++ b/Tiobon.Core.IServices/IBlogArticleServices.cs @@ -1,16 +1,12 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; using Tiobon.Core.Model.ViewModels; -using System.Collections.Generic; -using System.Threading.Tasks; -namespace Tiobon.Core.IServices -{ - public interface ITiobonArticleServices :IBaseServices - { - Task> GetTiobons(); - Task GetTiobonDetails(long id); +namespace Tiobon.Core.IServices; - } +public interface ITiobonArticleServices :IBaseServices +{ + Task> GetTiobons(); + Task GetTiobonDetails(long id); } diff --git a/Tiobon.Core.IServices/IDS4Db/IApplicationUserServices.cs b/Tiobon.Core.IServices/IDS4Db/IApplicationUserServices.cs index 5a961887..6b6b1d4d 100644 --- a/Tiobon.Core.IServices/IDS4Db/IApplicationUserServices.cs +++ b/Tiobon.Core.IServices/IDS4Db/IApplicationUserServices.cs @@ -1,11 +1,9 @@ -using System.Threading.Tasks; -using Tiobon.Core.IServices.BASE; +using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.IDS4DbModels; -namespace Tiobon.Core.IServices +namespace Tiobon.Core.IServices; + +public partial interface IApplicationUserServices : IBaseServices { - public partial interface IApplicationUserServices : IBaseServices - { - bool IsEnable(); - } + bool IsEnable(); } \ No newline at end of file diff --git a/Tiobon.Core.IServices/IDepartmentServices.cs b/Tiobon.Core.IServices/IDepartmentServices.cs index e23bfa57..76efd1ee 100644 --- a/Tiobon.Core.IServices/IDepartmentServices.cs +++ b/Tiobon.Core.IServices/IDepartmentServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices +namespace Tiobon.Core.IServices; + +/// +/// IDepartmentServices +/// +public interface IDepartmentServices : IBaseServices { - /// - /// IDepartmentServices - /// - public interface IDepartmentServices : IBaseServices - { - } } \ No newline at end of file diff --git a/Tiobon.Core.IServices/IGhra_GradeServices.cs b/Tiobon.Core.IServices/IGhra_GradeServices.cs index d2186134..856d83df 100644 --- a/Tiobon.Core.IServices/IGhra_GradeServices.cs +++ b/Tiobon.Core.IServices/IGhra_GradeServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// 年级(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// 年级(自定义服务接口) +/// public interface IGhra_GradeServices :IBaseServices - { - } -} \ No newline at end of file +{ + } \ No newline at end of file diff --git a/Tiobon.Core.IServices/IGuestbookServices.cs b/Tiobon.Core.IServices/IGuestbookServices.cs index 6952b143..c05e32f6 100644 --- a/Tiobon.Core.IServices/IGuestbookServices.cs +++ b/Tiobon.Core.IServices/IGuestbookServices.cs @@ -1,19 +1,17 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model; using Tiobon.Core.Model.Models; -using System.Threading.Tasks; -namespace Tiobon.Core.IServices +namespace Tiobon.Core.IServices; + +public partial interface IGuestbookServices : IBaseServices { - public partial interface IGuestbookServices : IBaseServices - { - Task> TestTranInRepository(); - Task TestTranInRepositoryAOP(); + Task> TestTranInRepository(); + Task TestTranInRepositoryAOP(); - Task TestTranPropagation(); + Task TestTranPropagation(); - Task TestTranPropagationNoTran(); + Task TestTranPropagationNoTran(); - Task TestTranPropagationTran(); - } + Task TestTranPropagationTran(); } \ No newline at end of file diff --git a/Tiobon.Core.IServices/IModuleServices.cs b/Tiobon.Core.IServices/IModuleServices.cs index 126d0fc5..bdf989b9 100644 --- a/Tiobon.Core.IServices/IModuleServices.cs +++ b/Tiobon.Core.IServices/IModuleServices.cs @@ -1,14 +1,13 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// ModuleServices - /// +namespace Tiobon.Core.IServices; + +/// +/// ModuleServices +/// public interface IModuleServices :IBaseServices - { +{ } -} diff --git a/Tiobon.Core.IServices/IOperateLogServices.cs b/Tiobon.Core.IServices/IOperateLogServices.cs index 3d559450..ed376d89 100644 --- a/Tiobon.Core.IServices/IOperateLogServices.cs +++ b/Tiobon.Core.IServices/IOperateLogServices.cs @@ -1,14 +1,13 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// IOperateLogServices - /// - public interface IOperateLogServices : IBaseServices +namespace Tiobon.Core.IServices; + +/// +/// IOperateLogServices +/// +public interface IOperateLogServices : IBaseServices { - - } + } - \ No newline at end of file + \ No newline at end of file diff --git a/Tiobon.Core.IServices/IPasswordLibServices.cs b/Tiobon.Core.IServices/IPasswordLibServices.cs index 5f379793..a6e64f68 100644 --- a/Tiobon.Core.IServices/IPasswordLibServices.cs +++ b/Tiobon.Core.IServices/IPasswordLibServices.cs @@ -1,13 +1,11 @@ -using System.Threading.Tasks; -using Tiobon.Core.IServices.BASE; +using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices +namespace Tiobon.Core.IServices; + +public partial interface IPasswordLibServices :IBaseServices { - public partial interface IPasswordLibServices :IBaseServices - { - Task TestTranPropagation2(); - Task TestTranPropagationNoTranError(); - Task TestTranPropagationTran2(); - } + Task TestTranPropagation2(); + Task TestTranPropagationNoTranError(); + Task TestTranPropagationTran2(); } diff --git a/Tiobon.Core.IServices/IPermissionServices.cs b/Tiobon.Core.IServices/IPermissionServices.cs index 310ef74f..15f86a0a 100644 --- a/Tiobon.Core.IServices/IPermissionServices.cs +++ b/Tiobon.Core.IServices/IPermissionServices.cs @@ -1,8 +1,7 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices +namespace Tiobon.Core.IServices; + +public partial interface IPermissionServices : IBaseServices { - public partial interface IPermissionServices : IBaseServices - { - } } \ No newline at end of file diff --git a/Tiobon.Core.IServices/IRoleModulePermissionServices.cs b/Tiobon.Core.IServices/IRoleModulePermissionServices.cs index 1566df40..fd942d16 100644 --- a/Tiobon.Core.IServices/IRoleModulePermissionServices.cs +++ b/Tiobon.Core.IServices/IRoleModulePermissionServices.cs @@ -1,26 +1,23 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -using System.Collections.Generic; -using System.Threading.Tasks; -namespace Tiobon.Core.IServices -{ - /// - /// RoleModulePermissionServices - /// - public interface IRoleModulePermissionServices :IBaseServices +namespace Tiobon.Core.IServices; + +/// +/// RoleModulePermissionServices +/// +public interface IRoleModulePermissionServices :IBaseServices { - Task> GetRoleModule(); - Task> QueryMuchTable(); - Task> RoleModuleMaps(); - Task> GetRMPMaps(); - /// - /// ²˵ӿڵĹϵ - /// - /// ˵ - /// ӿ - /// - Task UpdateModuleId(long permissionId, long moduleId); - } + Task> GetRoleModule(); + Task> QueryMuchTable(); + Task> RoleModuleMaps(); + Task> GetRMPMaps(); + /// + /// ²˵ӿڵĹϵ + /// + /// ˵ + /// ӿ + /// + Task UpdateModuleId(long permissionId, long moduleId); } diff --git a/Tiobon.Core.IServices/IRoleServices.cs b/Tiobon.Core.IServices/IRoleServices.cs index f8e488fd..886f4065 100644 --- a/Tiobon.Core.IServices/IRoleServices.cs +++ b/Tiobon.Core.IServices/IRoleServices.cs @@ -1,16 +1,14 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -using System.Threading.Tasks; -namespace Tiobon.Core.IServices -{ - /// - /// RoleServices - /// - public interface IRoleServices :IBaseServices - { - Task SaveRole(string roleName); - Task GetRoleNameByRid(int rid); +namespace Tiobon.Core.IServices; + +/// +/// RoleServices +/// +public interface IRoleServices : IBaseServices +{ + Task SaveRole(string roleName); + Task GetRoleNameByRid(int rid); - } } diff --git a/Tiobon.Core.IServices/ISplitDemoServices.cs b/Tiobon.Core.IServices/ISplitDemoServices.cs index fc8fc007..68b551ae 100644 --- a/Tiobon.Core.IServices/ISplitDemoServices.cs +++ b/Tiobon.Core.IServices/ISplitDemoServices.cs @@ -1,15 +1,13 @@ - + using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -using System.Threading.Tasks; - -namespace Tiobon.Core.IServices -{ - /// - /// sysUserInfoServices - /// - public interface ISplitDemoServices : IBaseServices - { - } + +namespace Tiobon.Core.IServices; + +/// +/// sysUserInfoServices +/// +public interface ISplitDemoServices : IBaseServices +{ } diff --git a/Tiobon.Core.IServices/ITasksLogServices.cs b/Tiobon.Core.IServices/ITasksLogServices.cs index 32a49555..9524f38c 100644 --- a/Tiobon.Core.IServices/ITasksLogServices.cs +++ b/Tiobon.Core.IServices/ITasksLogServices.cs @@ -1,19 +1,14 @@ - -using System; -using System.Threading.Tasks; -using Tiobon.Core.IServices.BASE; +using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// ITasksLogServices - /// - public interface ITasksLogServices :IBaseServices - { - public Task> GetTaskLogs(long jobId, int page, int intPageSize,DateTime? runTime,DateTime? endTime); - public Task GetTaskOverview(long jobId, DateTime? runTime, DateTime? endTime, string type); - } +namespace Tiobon.Core.IServices; + +/// +/// ITasksLogServices +/// +public interface ITasksLogServices : IBaseServices +{ + public Task> GetTaskLogs(long jobId, int page, int intPageSize, DateTime? runTime, DateTime? endTime); + public Task GetTaskOverview(long jobId, DateTime? runTime, DateTime? endTime, string type); } - \ No newline at end of file diff --git a/Tiobon.Core.IServices/ITasksQzServices.cs b/Tiobon.Core.IServices/ITasksQzServices.cs index 1a51759d..3ba1e22c 100644 --- a/Tiobon.Core.IServices/ITasksQzServices.cs +++ b/Tiobon.Core.IServices/ITasksQzServices.cs @@ -2,15 +2,13 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// ITasksQzServices - /// - public interface ITasksQzServices :IBaseServices - { +namespace Tiobon.Core.IServices; + +/// +/// ITasksQzServices +/// +public interface ITasksQzServices : IBaseServices +{ + - - } } - \ No newline at end of file diff --git a/Tiobon.Core.IServices/ITenantService.cs b/Tiobon.Core.IServices/ITenantService.cs index 54515ec7..3c2a029d 100644 --- a/Tiobon.Core.IServices/ITenantService.cs +++ b/Tiobon.Core.IServices/ITenantService.cs @@ -1,5 +1,4 @@ -using System.Threading.Tasks; -using Tiobon.Core.IServices.BASE; +using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; namespace Tiobon.Core.IServices; diff --git a/Tiobon.Core.IServices/IUserRoleServices.cs b/Tiobon.Core.IServices/IUserRoleServices.cs index 2c1f2774..d7f93221 100644 --- a/Tiobon.Core.IServices/IUserRoleServices.cs +++ b/Tiobon.Core.IServices/IUserRoleServices.cs @@ -1,17 +1,15 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -using System.Threading.Tasks; -namespace Tiobon.Core.IServices -{ - /// - /// UserRoleServices - /// - public interface IUserRoleServices :IBaseServices - { +namespace Tiobon.Core.IServices; - Task SaveUserRole(long uid, long rid); - Task GetRoleIdByUid(long uid); - } +/// +/// UserRoleServices +/// +public interface IUserRoleServices : IBaseServices +{ + + Task SaveUserRole(long uid, long rid); + Task GetRoleIdByUid(long uid); } diff --git a/Tiobon.Core.IServices/IsysUserInfoServices.cs b/Tiobon.Core.IServices/IsysUserInfoServices.cs index d0ec71bc..c7633a0c 100644 --- a/Tiobon.Core.IServices/IsysUserInfoServices.cs +++ b/Tiobon.Core.IServices/IsysUserInfoServices.cs @@ -1,17 +1,15 @@ - + using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -using System.Threading.Tasks; -namespace Tiobon.Core.IServices -{ - /// - /// sysUserInfoServices - /// - public interface ISysUserInfoServices :IBaseServices - { - Task SaveUserInfo(string loginName, string loginPwd); - Task GetUserRoleNameStr(string loginName, string loginPwd); - } +namespace Tiobon.Core.IServices; + +/// +/// sysUserInfoServices +/// +public interface ISysUserInfoServices : IBaseServices +{ + Task SaveUserInfo(string loginName, string loginPwd); + Task GetUserRoleNameStr(string loginName, string loginPwd); } diff --git a/Tiobon.Core.Jobs/Helper.cs b/Tiobon.Core.Jobs/Helper.cs index 9c7009a4..1186bb53 100644 --- a/Tiobon.Core.Jobs/Helper.cs +++ b/Tiobon.Core.Jobs/Helper.cs @@ -1,17 +1,16 @@ -using Microsoft.Extensions.DependencyInjection; +using Autofac; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using System; using Tiobon.Core.Common; using Tiobon.Core.Common.DB; +using Tiobon.Core.Common.DB.Dapper.Extensions; using Tiobon.Core.Common.Seed; -using Tiobon.Core.Repository.UnitOfWorks; -using Autofac; +using Tiobon.Core.DataAccess; using Tiobon.Core.Extensions; +using Tiobon.Core.Repository.UnitOfWorks; using Tiobon.Core.Services.Extensions; -using Tiobon.Core.DataAccess; -using Microsoft.EntityFrameworkCore; -using Tiobon.Core.Extensions.HostedService; -using Tiobon.Core.Common.DB.Dapper.Extensions; namespace Tiobon.Core.Jobs; /// diff --git a/Tiobon.Core.Model/ApiResponse.cs b/Tiobon.Core.Model/ApiResponse.cs index b8a03802..6052c205 100644 --- a/Tiobon.Core.Model/ApiResponse.cs +++ b/Tiobon.Core.Model/ApiResponse.cs @@ -1,56 +1,55 @@ -namespace Tiobon.Core.Model +namespace Tiobon.Core.Model; + +public class ApiResponse { - public class ApiResponse - { - public int Status { get; set; } = 200; - public string Value { get; set; } = ""; - public ServiceResult MessageModel = new ServiceResult() { }; + public int Status { get; set; } = 200; + public string Value { get; set; } = ""; + public ServiceResult MessageModel = new ServiceResult() { }; - public ApiResponse(StatusCode apiCode, string msg = null) + public ApiResponse(StatusCode apiCode, string msg = null) + { + switch (apiCode) { - switch (apiCode) + case StatusCode.CODE401: { - case StatusCode.CODE401: - { - Status = 401; - Value = msg ?? "很抱歉,您无权访问该接口,请确保已经登录!"; - } - break; - case StatusCode.CODE403: - { - Status = 403; - Value = msg ?? "很抱歉,您的访问权限等级不够,联系管理员!"; - } - break; - case StatusCode.CODE404: - { - Status = 404; - Value = "资源不存在!"; - } - break; - case StatusCode.CODE500: - { - Status = 500; - Value = msg; - } - break; + Status = 401; + Value = msg ?? "很抱歉,您无权访问该接口,请确保已经登录!"; } - - MessageModel = new ServiceResult() + break; + case StatusCode.CODE403: + { + Status = 403; + Value = msg ?? "很抱歉,您的访问权限等级不够,联系管理员!"; + } + break; + case StatusCode.CODE404: + { + Status = 404; + Value = "资源不存在!"; + } + break; + case StatusCode.CODE500: { - Status = Status, - Message = Value, - Success = apiCode == StatusCode.CODE200 - }; + Status = 500; + Value = msg; + } + break; } - } - public enum StatusCode - { - CODE200, - CODE401, - CODE403, - CODE404, - CODE500 + MessageModel = new ServiceResult() + { + Status = Status, + Message = Value, + Success = apiCode == StatusCode.CODE200 + }; } +} + +public enum StatusCode +{ + CODE200, + CODE401, + CODE403, + CODE404, + CODE500 } \ No newline at end of file diff --git a/Tiobon.Core.Model/Base/BaseLog.cs b/Tiobon.Core.Model/Base/BaseLog.cs index 78f27e89..d6e459fd 100644 --- a/Tiobon.Core.Model/Base/BaseLog.cs +++ b/Tiobon.Core.Model/Base/BaseLog.cs @@ -1,7 +1,4 @@ -using SqlSugar; -using System; - -namespace Tiobon.Core.Model.Base; +namespace Tiobon.Core.Model.Base; public abstract class BaseLog : RootEntityTkey { diff --git a/Tiobon.Core.Model/Base/Ghra/Ghra_Grade.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghra/Ghra_Grade.Dto.Base.cs index 04657f0d..fbd94a9f 100644 --- a/Tiobon.Core.Model/Base/Ghra/Ghra_Grade.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghra/Ghra_Grade.Dto.Base.cs @@ -13,104 +13,100 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 年级 (Dto.Base) +/// +public class Ghra_GradeBase { /// - /// 年级 (Dto.Base) + /// GradeNo + /// + [Display(Name = "GradeNo"), Description("GradeNo"), MaxLength(100, ErrorMessage = "GradeNo 不能超过 100 个字符")] + public string GradeNo { get; set; } + + /// + /// GradeName + /// + [Display(Name = "GradeName"), Description("GradeName"), MaxLength(1000, ErrorMessage = "GradeName 不能超过 1000 个字符")] + public string GradeName { get; set; } + + /// + /// MKey + /// + [Display(Name = "MKey"), Description("MKey"), MaxLength(200, ErrorMessage = "MKey 不能超过 200 个字符")] + public string MKey { get; set; } + + /// + /// DataBelongID + /// + public int? DataBelongID { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// Reverse6 + /// + [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// Reverse7 + /// + [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// Reverse8 + /// + [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// Reverse9 + /// + [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } + + /// + /// ReverseI1 + /// + public int? ReverseI1 { get; set; } + + /// + /// ReverseI2 /// - public class Ghra_GradeBase - { - - /// - /// GradeNo - /// - [Display(Name = "GradeNo"), Description("GradeNo"), MaxLength(100, ErrorMessage = "GradeNo 不能超过 100 个字符")] - public string GradeNo { get; set; } - - /// - /// GradeName - /// - [Display(Name = "GradeName"), Description("GradeName"), MaxLength(1000, ErrorMessage = "GradeName 不能超过 1000 个字符")] - public string GradeName { get; set; } - - /// - /// MKey - /// - [Display(Name = "MKey"), Description("MKey"), MaxLength(200, ErrorMessage = "MKey 不能超过 200 个字符")] - public string MKey { get; set; } - - /// - /// DataBelongID - /// - public int? DataBelongID { get; set; } - - /// - /// Reverse1 - /// - [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// Reverse2 - /// - [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// Reverse3 - /// - [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// Reverse4 - /// - [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// Reverse5 - /// - [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - - /// - /// Reverse6 - /// - [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] - public string Reverse6 { get; set; } - - /// - /// Reverse7 - /// - [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] - public string Reverse7 { get; set; } - - /// - /// Reverse8 - /// - [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] - public string Reverse8 { get; set; } - - /// - /// Reverse9 - /// - [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] - public string Reverse9 { get; set; } - - /// - /// ReverseI1 - /// - public int? ReverseI1 { get; set; } - - /// - /// ReverseI2 - /// - public int? ReverseI2 { get; set; } - } + public int? ReverseI2 { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghra/Ghra_Job.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghra/Ghra_Job.Dto.Base.cs index 0b0b9220..ff97bda4 100644 --- a/Tiobon.Core.Model/Base/Ghra/Ghra_Job.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghra/Ghra_Job.Dto.Base.cs @@ -13,138 +13,134 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghra_Job (Dto.Base) +/// +public class Ghra_JobBase { /// - /// Ghra_Job (Dto.Base) - /// - public class Ghra_JobBase - { - - /// - /// JobID - /// - public int? JobID { get; set; } - - /// - /// JobNo - /// - [Display(Name = "JobNo"), Description("JobNo"), MaxLength(100, ErrorMessage = "JobNo 不能超过 100 个字符")] - public string JobNo { get; set; } - - /// - /// JobName - /// - [Display(Name = "JobName"), Description("JobName"), MaxLength(1000, ErrorMessage = "JobName 不能超过 1000 个字符")] - public string JobName { get; set; } - - /// - /// JobType - /// - [Display(Name = "JobType"), Description("JobType"), MaxLength(100, ErrorMessage = "JobType 不能超过 100 个字符")] - public string JobType { get; set; } - - /// - /// JobType2 - /// - [Display(Name = "JobType2"), Description("JobType2"), MaxLength(100, ErrorMessage = "JobType2 不能超过 100 个字符")] - public string JobType2 { get; set; } - - /// - /// MKey - /// - [Display(Name = "MKey"), Description("MKey"), MaxLength(200, ErrorMessage = "MKey 不能超过 200 个字符")] - public string MKey { get; set; } - - /// - /// DataBelongID - /// - [Display(Name = "DataBelongID"), Description("DataBelongID"), MaxLength(-1, ErrorMessage = "DataBelongID 不能超过 -1 个字符")] - public string DataBelongID { get; set; } - - /// - /// RemarkSz - /// - [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// SortNo - /// - public int? SortNo { get; set; } - - /// - /// IsDefault - /// - public int? IsDefault { get; set; } - - /// - /// ReverseI1 - /// - public int? ReverseI1 { get; set; } - - /// - /// ReverseI2 - /// - public int? ReverseI2 { get; set; } - - /// - /// Reverse1 - /// - [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// Reverse2 - /// - [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// Reverse3 - /// - [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// Reverse4 - /// - [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// Reverse5 - /// - [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - - /// - /// Reverse6 - /// - [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] - public string Reverse6 { get; set; } - - /// - /// Reverse7 - /// - [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] - public string Reverse7 { get; set; } - - /// - /// Reverse8 - /// - [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] - public string Reverse8 { get; set; } - - /// - /// Reverse9 - /// - [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] - public string Reverse9 { get; set; } - } + /// JobID + /// + public int? JobID { get; set; } + + /// + /// JobNo + /// + [Display(Name = "JobNo"), Description("JobNo"), MaxLength(100, ErrorMessage = "JobNo 不能超过 100 个字符")] + public string JobNo { get; set; } + + /// + /// JobName + /// + [Display(Name = "JobName"), Description("JobName"), MaxLength(1000, ErrorMessage = "JobName 不能超过 1000 个字符")] + public string JobName { get; set; } + + /// + /// JobType + /// + [Display(Name = "JobType"), Description("JobType"), MaxLength(100, ErrorMessage = "JobType 不能超过 100 个字符")] + public string JobType { get; set; } + + /// + /// JobType2 + /// + [Display(Name = "JobType2"), Description("JobType2"), MaxLength(100, ErrorMessage = "JobType2 不能超过 100 个字符")] + public string JobType2 { get; set; } + + /// + /// MKey + /// + [Display(Name = "MKey"), Description("MKey"), MaxLength(200, ErrorMessage = "MKey 不能超过 200 个字符")] + public string MKey { get; set; } + + /// + /// DataBelongID + /// + [Display(Name = "DataBelongID"), Description("DataBelongID"), MaxLength(-1, ErrorMessage = "DataBelongID 不能超过 -1 个字符")] + public string DataBelongID { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// ReverseI1 + /// + public int? ReverseI1 { get; set; } + + /// + /// ReverseI2 + /// + public int? ReverseI2 { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// Reverse6 + /// + [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// Reverse7 + /// + [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// Reverse8 + /// + [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// Reverse9 + /// + [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghra/Ghra_Staff.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghra/Ghra_Staff.Dto.Base.cs index 506c6d3c..0bce87cc 100644 --- a/Tiobon.Core.Model/Base/Ghra/Ghra_Staff.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghra/Ghra_Staff.Dto.Base.cs @@ -13,698 +13,693 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghra_Staff (Dto.Base) +/// +public class Ghra_StaffBase { /// - /// Ghra_Staff (Dto.Base) - /// - public class Ghra_StaffBase - { - - /// - /// StaffID - /// - public int? StaffID { get; set; } - - /// - /// StaffNo - /// - [Display(Name = "StaffNo"), Description("StaffNo"), MaxLength(30, ErrorMessage = "StaffNo 不能超过 30 个字符")] - public string StaffNo { get; set; } - - /// - /// StaffName - /// - [Display(Name = "StaffName"), Description("StaffName"), MaxLength(100, ErrorMessage = "StaffName 不能超过 100 个字符")] - public string StaffName { get; set; } - - /// - /// StaffEname - /// - [Display(Name = "StaffEname"), Description("StaffEname"), MaxLength(100, ErrorMessage = "StaffEname 不能超过 100 个字符")] - public string StaffEname { get; set; } - - /// - /// PinYinName - /// - [Display(Name = "PinYinName"), Description("PinYinName"), MaxLength(100, ErrorMessage = "PinYinName 不能超过 100 个字符")] - public string PinYinName { get; set; } - - /// - /// 首次入职日 - /// - public DateTime? FirstInDate { get; set; } - - /// - /// Indate - /// - public DateTime? Indate { get; set; } - - /// - /// OutDate - /// - public DateTime? OutDate { get; set; } - - /// - /// SalaryEndDate - /// - public DateTime? SalaryEndDate { get; set; } - - /// - /// ProbationEndDate - /// - public DateTime? ProbationEndDate { get; set; } - - /// - /// RegularDate - /// - public DateTime? RegularDate { get; set; } - - /// - /// DeptID - /// - public int? DeptID { get; set; } - - /// - /// DataBelongID - /// - public int? DataBelongID { get; set; } - - /// - /// TitleID - /// - public int? TitleID { get; set; } - - /// - /// GradeID - /// - public int? GradeID { get; set; } - - /// - /// JobID - /// - public int? JobID { get; set; } - - /// - /// LegalCompanyID - /// - public int? LegalCompanyID { get; set; } - - /// - /// WorkPlaceID - /// - public int? WorkPlaceID { get; set; } - - /// - /// CostCenterID - /// - public int? CostCenterID { get; set; } - - /// - /// ZoneID - /// - public int? ZoneID { get; set; } - - /// - /// StaffType1 - /// - public int? StaffType1 { get; set; } - - /// - /// StaffType2 - /// - public int? StaffType2 { get; set; } - - /// - /// StaffType3 - /// - public int? StaffType3 { get; set; } - - /// - /// StaffType4 - /// - public int? StaffType4 { get; set; } - - /// - /// StaffType5 - /// - public int? StaffType5 { get; set; } - - /// - /// ManagerID - /// - public int? ManagerID { get; set; } - - /// - /// 默认角色,用,号分割 - /// - [Display(Name = "StaffRoleIDs"), Description("默认角色,用,号分割"), MaxLength(2000, ErrorMessage = "默认角色,用,号分割 不能超过 2000 个字符")] - public string StaffRoleIDs { get; set; } - - /// - /// IdCardNo - /// - [Display(Name = "IdCardNo"), Description("IdCardNo"), MaxLength(50, ErrorMessage = "IdCardNo 不能超过 50 个字符")] - public string IdCardNo { get; set; } - - /// - /// Email - /// - [Display(Name = "Email"), Description("Email"), MaxLength(50, ErrorMessage = "Email 不能超过 50 个字符")] - public string Email { get; set; } - - /// - /// Mobile - /// - [Display(Name = "Mobile"), Description("Mobile"), MaxLength(50, ErrorMessage = "Mobile 不能超过 50 个字符")] - public string Mobile { get; set; } - - /// - /// Gender - /// - [Display(Name = "Gender"), Description("Gender"), MaxLength(50, ErrorMessage = "Gender 不能超过 50 个字符")] - public string Gender { get; set; } - - /// - /// PhotoUrl - /// - [Display(Name = "PhotoUrl"), Description("PhotoUrl"), MaxLength(1000, ErrorMessage = "PhotoUrl 不能超过 1000 个字符")] - public string PhotoUrl { get; set; } - - /// - /// RemarkSz - /// - [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// ToDoType - /// - [Display(Name = "ToDoType"), Description("ToDoType"), MaxLength(100, ErrorMessage = "ToDoType 不能超过 100 个字符")] - public string ToDoType { get; set; } - - /// - /// WorkID - /// - public int? WorkID { get; set; } - - /// - /// WorkState - /// - public int? WorkState { get; set; } - - /// - /// IsRelease - /// - public int? IsRelease { get; set; } - - /// - /// SortNo - /// - public int? SortNo { get; set; } - - /// - /// IsDefault - /// - public int? IsDefault { get; set; } - - /// - /// Reverse1 - /// - [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// Reverse2 - /// - [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// Reverse3 - /// - [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// Reverse4 - /// - [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// Reverse5 - /// - [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - - /// - /// Reverse6 - /// - [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] - public string Reverse6 { get; set; } - - /// - /// Reverse7 - /// - [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] - public string Reverse7 { get; set; } - - /// - /// Reverse8 - /// - [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] - public string Reverse8 { get; set; } - - /// - /// Reverse9 - /// - [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] - public string Reverse9 { get; set; } - - /// - /// ChangeI1 - /// - public int? ChangeI1 { get; set; } - - /// - /// ChangeI2 - /// - public int? ChangeI2 { get; set; } - - /// - /// ChangeI3 - /// - public int? ChangeI3 { get; set; } - - /// - /// Nation - /// - [Display(Name = "Nation"), Description("Nation"), MaxLength(100, ErrorMessage = "Nation 不能超过 100 个字符")] - public string Nation { get; set; } - - /// - /// NationNo - /// - [Display(Name = "NationNo"), Description("NationNo"), MaxLength(100, ErrorMessage = "NationNo 不能超过 100 个字符")] - public string NationNo { get; set; } - - /// - /// NativePlace - /// - [Display(Name = "NativePlace"), Description("NativePlace"), MaxLength(100, ErrorMessage = "NativePlace 不能超过 100 个字符")] - public string NativePlace { get; set; } - - /// - /// MaritalStatus - /// - [Display(Name = "MaritalStatus"), Description("MaritalStatus"), MaxLength(100, ErrorMessage = "MaritalStatus 不能超过 100 个字符")] - public string MaritalStatus { get; set; } - - /// - /// NowAddress - /// - [Display(Name = "NowAddress"), Description("NowAddress"), MaxLength(1000, ErrorMessage = "NowAddress 不能超过 1000 个字符")] - public string NowAddress { get; set; } - - /// - /// PoliticStatus - /// - [Display(Name = "PoliticStatus"), Description("PoliticStatus"), MaxLength(100, ErrorMessage = "PoliticStatus 不能超过 100 个字符")] - public string PoliticStatus { get; set; } - - /// - /// RegisteredType - /// - [Display(Name = "RegisteredType"), Description("RegisteredType"), MaxLength(100, ErrorMessage = "RegisteredType 不能超过 100 个字符")] - public string RegisteredType { get; set; } - - /// - /// Birthday - /// - public DateTime? Birthday { get; set; } - - /// - /// EduDegree - /// - [Display(Name = "EduDegree"), Description("EduDegree"), MaxLength(100, ErrorMessage = "EduDegree 不能超过 100 个字符")] - public string EduDegree { get; set; } - - /// - /// UrgentContact - /// - [Display(Name = "UrgentContact"), Description("UrgentContact"), MaxLength(100, ErrorMessage = "UrgentContact 不能超过 100 个字符")] - public string UrgentContact { get; set; } - - /// - /// UrgentContactTel - /// - [Display(Name = "UrgentContactTel"), Description("UrgentContactTel"), MaxLength(100, ErrorMessage = "UrgentContactTel 不能超过 100 个字符")] - public string UrgentContactTel { get; set; } - - /// - /// PreJobSeniority - /// - [Display(Name = "PreJobSeniority"), Description("PreJobSeniority"), Column(TypeName = "decimal(18,2)")] - public decimal? PreJobSeniority { get; set; } - - /// - /// InUnion - /// - [Display(Name = "InUnion"), Description("InUnion"), MaxLength(100, ErrorMessage = "InUnion 不能超过 100 个字符")] - public string InUnion { get; set; } - - /// - /// DiseaseStation - /// - [Display(Name = "DiseaseStation"), Description("DiseaseStation"), MaxLength(100, ErrorMessage = "DiseaseStation 不能超过 100 个字符")] - public string DiseaseStation { get; set; } - - /// - /// OnJobCheckUp - /// - [Display(Name = "OnJobCheckUp"), Description("OnJobCheckUp"), MaxLength(100, ErrorMessage = "OnJobCheckUp 不能超过 100 个字符")] - public string OnJobCheckUp { get; set; } - - /// - /// DiseaseCheckUp - /// - [Display(Name = "DiseaseCheckUp"), Description("DiseaseCheckUp"), MaxLength(100, ErrorMessage = "DiseaseCheckUp 不能超过 100 个字符")] - public string DiseaseCheckUp { get; set; } - - /// - /// ManagerID2 - /// - public int? ManagerID2 { get; set; } - - /// - /// TaxID - /// - public int? TaxID { get; set; } - - /// - /// PeriodMasterID - /// - public int? PeriodMasterID { get; set; } - - /// - /// OvertimeRuleID - /// - public int? OvertimeRuleID { get; set; } - - /// - /// RegisteredPlace - /// - [Display(Name = "RegisteredPlace"), Description("RegisteredPlace"), MaxLength(1000, ErrorMessage = "RegisteredPlace 不能超过 1000 个字符")] - public string RegisteredPlace { get; set; } - - /// - /// RegisteredAddress - /// - [Display(Name = "RegisteredAddress"), Description("RegisteredAddress"), MaxLength(1000, ErrorMessage = "RegisteredAddress 不能超过 1000 个字符")] - public string RegisteredAddress { get; set; } - - /// - /// HomeAddress - /// - [Display(Name = "HomeAddress"), Description("HomeAddress"), MaxLength(1000, ErrorMessage = "HomeAddress 不能超过 1000 个字符")] - public string HomeAddress { get; set; } - - /// - /// BankAccount - /// - [Display(Name = "BankAccount"), Description("BankAccount"), MaxLength(1000, ErrorMessage = "BankAccount 不能超过 1000 个字符")] - public string BankAccount { get; set; } - - /// - /// UrgentContactAddress - /// - [Display(Name = "UrgentContactAddress"), Description("UrgentContactAddress"), MaxLength(1000, ErrorMessage = "UrgentContactAddress 不能超过 1000 个字符")] - public string UrgentContactAddress { get; set; } - - /// - /// UrgentRelation - /// - [Display(Name = "UrgentRelation"), Description("UrgentRelation"), MaxLength(1000, ErrorMessage = "UrgentRelation 不能超过 1000 个字符")] - public string UrgentRelation { get; set; } - - /// - /// Urgent2Contact - /// - [Display(Name = "Urgent2Contact"), Description("Urgent2Contact"), MaxLength(1000, ErrorMessage = "Urgent2Contact 不能超过 1000 个字符")] - public string Urgent2Contact { get; set; } - - /// - /// Urgent2ContactTel - /// - [Display(Name = "Urgent2ContactTel"), Description("Urgent2ContactTel"), MaxLength(1000, ErrorMessage = "Urgent2ContactTel 不能超过 1000 个字符")] - public string Urgent2ContactTel { get; set; } - - /// - /// Urgent2ContactAddress - /// - [Display(Name = "Urgent2ContactAddress"), Description("Urgent2ContactAddress"), MaxLength(1000, ErrorMessage = "Urgent2ContactAddress 不能超过 1000 个字符")] - public string Urgent2ContactAddress { get; set; } - - /// - /// Urgent2Relation - /// - [Display(Name = "Urgent2Relation"), Description("Urgent2Relation"), MaxLength(1000, ErrorMessage = "Urgent2Relation 不能超过 1000 个字符")] - public string Urgent2Relation { get; set; } - - /// - /// Introducer - /// - [Display(Name = "Introducer"), Description("Introducer"), MaxLength(1000, ErrorMessage = "Introducer 不能超过 1000 个字符")] - public string Introducer { get; set; } - - /// - /// AttendCheckType - /// - [Display(Name = "AttendCheckType"), Description("AttendCheckType"), MaxLength(100, ErrorMessage = "AttendCheckType 不能超过 100 个字符")] - public string AttendCheckType { get; set; } - - /// - /// OTExemption - /// - [Display(Name = "OTExemption"), Description("OTExemption"), MaxLength(100, ErrorMessage = "OTExemption 不能超过 100 个字符")] - public string OTExemption { get; set; } - - /// - /// OldStaffNo - /// - [Display(Name = "OldStaffNo"), Description("OldStaffNo"), MaxLength(100, ErrorMessage = "OldStaffNo 不能超过 100 个字符")] - public string OldStaffNo { get; set; } - - /// - /// Reverse10 - /// - [Display(Name = "Reverse10"), Description("Reverse10"), MaxLength(1000, ErrorMessage = "Reverse10 不能超过 1000 个字符")] - public string Reverse10 { get; set; } - - /// - /// Reverse11 - /// - [Display(Name = "Reverse11"), Description("Reverse11"), MaxLength(1000, ErrorMessage = "Reverse11 不能超过 1000 个字符")] - public string Reverse11 { get; set; } - - /// - /// Reverse12 - /// - [Display(Name = "Reverse12"), Description("Reverse12"), MaxLength(1000, ErrorMessage = "Reverse12 不能超过 1000 个字符")] - public string Reverse12 { get; set; } - - /// - /// Reverse13 - /// - [Display(Name = "Reverse13"), Description("Reverse13"), MaxLength(1000, ErrorMessage = "Reverse13 不能超过 1000 个字符")] - public string Reverse13 { get; set; } - - /// - /// Reverse14 - /// - [Display(Name = "Reverse14"), Description("Reverse14"), MaxLength(1000, ErrorMessage = "Reverse14 不能超过 1000 个字符")] - public string Reverse14 { get; set; } - - /// - /// Reverse15 - /// - [Display(Name = "Reverse15"), Description("Reverse15"), MaxLength(1000, ErrorMessage = "Reverse15 不能超过 1000 个字符")] - public string Reverse15 { get; set; } - - /// - /// Reverse16 - /// - [Display(Name = "Reverse16"), Description("Reverse16"), MaxLength(1000, ErrorMessage = "Reverse16 不能超过 1000 个字符")] - public string Reverse16 { get; set; } - - /// - /// ChangeI4 - /// - public int? ChangeI4 { get; set; } - - /// - /// ChangeI5 - /// - public int? ChangeI5 { get; set; } - - /// - /// ChangeI6 - /// - public int? ChangeI6 { get; set; } - - /// - /// ChangeS1 - /// - [Display(Name = "ChangeS1"), Description("ChangeS1"), MaxLength(100, ErrorMessage = "ChangeS1 不能超过 100 个字符")] - public string ChangeS1 { get; set; } - - /// - /// ChangeS2 - /// - [Display(Name = "ChangeS2"), Description("ChangeS2"), MaxLength(100, ErrorMessage = "ChangeS2 不能超过 100 个字符")] - public string ChangeS2 { get; set; } - - /// - /// ChangeS3 - /// - [Display(Name = "ChangeS3"), Description("ChangeS3"), MaxLength(100, ErrorMessage = "ChangeS3 不能超过 100 个字符")] - public string ChangeS3 { get; set; } - - /// - /// ExpectTitleID - /// - public int? ExpectTitleID { get; set; } - - /// - /// ExpectDeptID - /// - public int? ExpectDeptID { get; set; } - - /// - /// ConfirmUserID - /// - public int? ConfirmUserID { get; set; } - - /// - /// ConfirmTime - /// - public DateTime? ConfirmTime { get; set; } - - /// - /// ConfirmComment - /// - [Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")] - public string ConfirmComment { get; set; } - - /// - /// IsInsure - /// - public int? IsInsure { get; set; } - - /// - /// IsFund - /// - public int? IsFund { get; set; } - - /// - /// SeniorityBegin - /// - public DateTime? SeniorityBegin { get; set; } - - /// - /// IDCardBegin - /// - public DateTime? IDCardBegin { get; set; } - - /// - /// IDCardEnd - /// - public DateTime? IDCardEnd { get; set; } - - /// - /// GraduateDate - /// - public DateTime? GraduateDate { get; set; } - - /// - /// EmploymentDate - /// - public DateTime? EmploymentDate { get; set; } - - /// - /// PreJoinDate - /// - public DateTime? PreJoinDate { get; set; } - - /// - /// IsCalSalary - /// - public int? IsCalSalary { get; set; } - - /// - /// InsureAccountID - /// - public int? InsureAccountID { get; set; } - - /// - /// FundAccountID - /// - public int? FundAccountID { get; set; } - - /// - /// InsureDate - /// - public DateTime? InsureDate { get; set; } - - /// - /// InsureBase - /// - [Display(Name = "InsureBase"), Description("InsureBase"), Column(TypeName = "decimal(18,4)")] - public decimal? InsureBase { get; set; } - - /// - /// FundBase - /// - [Display(Name = "FundBase"), Description("FundBase"), Column(TypeName = "decimal(18,4)")] - public decimal? FundBase { get; set; } - - /// - /// IsInInsure - /// - public int? IsInInsure { get; set; } - - /// - /// InInsureAccountNo - /// - public int? InInsureAccountNo { get; set; } - - /// - /// AttachmentIDs - /// - [Display(Name = "AttachmentIDs"), Description("AttachmentIDs"), MaxLength(-1, ErrorMessage = "AttachmentIDs 不能超过 -1 个字符")] - public string AttachmentIDs { get; set; } - - /// - /// IDCardOrg - /// - [Display(Name = "IDCardOrg"), Description("IDCardOrg"), MaxLength(1000, ErrorMessage = "IDCardOrg 不能超过 1000 个字符")] - public string IDCardOrg { get; set; } - - /// - /// SalaryReportType - /// - public int? SalaryReportType { get; set; } - - /// - /// IsSalaryPay - /// - public int? IsSalaryPay { get; set; } - } + /// StaffID + /// + public int? StaffID { get; set; } + + /// + /// StaffNo + /// + [Display(Name = "StaffNo"), Description("StaffNo"), MaxLength(30, ErrorMessage = "StaffNo 不能超过 30 个字符")] + public string StaffNo { get; set; } + + /// + /// StaffName + /// + [Display(Name = "StaffName"), Description("StaffName"), MaxLength(100, ErrorMessage = "StaffName 不能超过 100 个字符")] + public string StaffName { get; set; } + + /// + /// StaffEname + /// + [Display(Name = "StaffEname"), Description("StaffEname"), MaxLength(100, ErrorMessage = "StaffEname 不能超过 100 个字符")] + public string StaffEname { get; set; } + + /// + /// PinYinName + /// + [Display(Name = "PinYinName"), Description("PinYinName"), MaxLength(100, ErrorMessage = "PinYinName 不能超过 100 个字符")] + public string PinYinName { get; set; } + + /// + /// 首次入职日 + /// + public DateTime? FirstInDate { get; set; } + + /// + /// Indate + /// + public DateTime? Indate { get; set; } + + /// + /// OutDate + /// + public DateTime? OutDate { get; set; } + + /// + /// SalaryEndDate + /// + public DateTime? SalaryEndDate { get; set; } + + /// + /// ProbationEndDate + /// + public DateTime? ProbationEndDate { get; set; } + + /// + /// RegularDate + /// + public DateTime? RegularDate { get; set; } + + /// + /// DeptID + /// + public int? DeptID { get; set; } + + /// + /// DataBelongID + /// + public int? DataBelongID { get; set; } + + /// + /// TitleID + /// + public int? TitleID { get; set; } + + /// + /// GradeID + /// + public int? GradeID { get; set; } + + /// + /// JobID + /// + public int? JobID { get; set; } + + /// + /// LegalCompanyID + /// + public int? LegalCompanyID { get; set; } + + /// + /// WorkPlaceID + /// + public int? WorkPlaceID { get; set; } + + /// + /// CostCenterID + /// + public int? CostCenterID { get; set; } + + /// + /// ZoneID + /// + public int? ZoneID { get; set; } + + /// + /// StaffType1 + /// + public int? StaffType1 { get; set; } + + /// + /// StaffType2 + /// + public int? StaffType2 { get; set; } + + /// + /// StaffType3 + /// + public int? StaffType3 { get; set; } + + /// + /// StaffType4 + /// + public int? StaffType4 { get; set; } + + /// + /// StaffType5 + /// + public int? StaffType5 { get; set; } + + /// + /// ManagerID + /// + public int? ManagerID { get; set; } + + /// + /// 默认角色,用,号分割 + /// + [Display(Name = "StaffRoleIDs"), Description("默认角色,用,号分割"), MaxLength(2000, ErrorMessage = "默认角色,用,号分割 不能超过 2000 个字符")] + public string StaffRoleIDs { get; set; } + + /// + /// IdCardNo + /// + [Display(Name = "IdCardNo"), Description("IdCardNo"), MaxLength(50, ErrorMessage = "IdCardNo 不能超过 50 个字符")] + public string IdCardNo { get; set; } + + /// + /// Email + /// + [Display(Name = "Email"), Description("Email"), MaxLength(50, ErrorMessage = "Email 不能超过 50 个字符")] + public string Email { get; set; } + + /// + /// Mobile + /// + [Display(Name = "Mobile"), Description("Mobile"), MaxLength(50, ErrorMessage = "Mobile 不能超过 50 个字符")] + public string Mobile { get; set; } + + /// + /// Gender + /// + [Display(Name = "Gender"), Description("Gender"), MaxLength(50, ErrorMessage = "Gender 不能超过 50 个字符")] + public string Gender { get; set; } + + /// + /// PhotoUrl + /// + [Display(Name = "PhotoUrl"), Description("PhotoUrl"), MaxLength(1000, ErrorMessage = "PhotoUrl 不能超过 1000 个字符")] + public string PhotoUrl { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// ToDoType + /// + [Display(Name = "ToDoType"), Description("ToDoType"), MaxLength(100, ErrorMessage = "ToDoType 不能超过 100 个字符")] + public string ToDoType { get; set; } + + /// + /// WorkID + /// + public int? WorkID { get; set; } + + /// + /// WorkState + /// + public int? WorkState { get; set; } + + /// + /// IsRelease + /// + public int? IsRelease { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// Reverse6 + /// + [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// Reverse7 + /// + [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// Reverse8 + /// + [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// Reverse9 + /// + [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } + + /// + /// ChangeI1 + /// + public int? ChangeI1 { get; set; } + + /// + /// ChangeI2 + /// + public int? ChangeI2 { get; set; } + + /// + /// ChangeI3 + /// + public int? ChangeI3 { get; set; } + + /// + /// Nation + /// + [Display(Name = "Nation"), Description("Nation"), MaxLength(100, ErrorMessage = "Nation 不能超过 100 个字符")] + public string Nation { get; set; } + + /// + /// NationNo + /// + [Display(Name = "NationNo"), Description("NationNo"), MaxLength(100, ErrorMessage = "NationNo 不能超过 100 个字符")] + public string NationNo { get; set; } + + /// + /// NativePlace + /// + [Display(Name = "NativePlace"), Description("NativePlace"), MaxLength(100, ErrorMessage = "NativePlace 不能超过 100 个字符")] + public string NativePlace { get; set; } + + /// + /// MaritalStatus + /// + [Display(Name = "MaritalStatus"), Description("MaritalStatus"), MaxLength(100, ErrorMessage = "MaritalStatus 不能超过 100 个字符")] + public string MaritalStatus { get; set; } + + /// + /// NowAddress + /// + [Display(Name = "NowAddress"), Description("NowAddress"), MaxLength(1000, ErrorMessage = "NowAddress 不能超过 1000 个字符")] + public string NowAddress { get; set; } + + /// + /// PoliticStatus + /// + [Display(Name = "PoliticStatus"), Description("PoliticStatus"), MaxLength(100, ErrorMessage = "PoliticStatus 不能超过 100 个字符")] + public string PoliticStatus { get; set; } + + /// + /// RegisteredType + /// + [Display(Name = "RegisteredType"), Description("RegisteredType"), MaxLength(100, ErrorMessage = "RegisteredType 不能超过 100 个字符")] + public string RegisteredType { get; set; } + + /// + /// Birthday + /// + public DateTime? Birthday { get; set; } + + /// + /// EduDegree + /// + [Display(Name = "EduDegree"), Description("EduDegree"), MaxLength(100, ErrorMessage = "EduDegree 不能超过 100 个字符")] + public string EduDegree { get; set; } + + /// + /// UrgentContact + /// + [Display(Name = "UrgentContact"), Description("UrgentContact"), MaxLength(100, ErrorMessage = "UrgentContact 不能超过 100 个字符")] + public string UrgentContact { get; set; } + + /// + /// UrgentContactTel + /// + [Display(Name = "UrgentContactTel"), Description("UrgentContactTel"), MaxLength(100, ErrorMessage = "UrgentContactTel 不能超过 100 个字符")] + public string UrgentContactTel { get; set; } + + /// + /// PreJobSeniority + /// + [Display(Name = "PreJobSeniority"), Description("PreJobSeniority"), Column(TypeName = "decimal(18,2)")] + public decimal? PreJobSeniority { get; set; } + + /// + /// InUnion + /// + [Display(Name = "InUnion"), Description("InUnion"), MaxLength(100, ErrorMessage = "InUnion 不能超过 100 个字符")] + public string InUnion { get; set; } + + /// + /// DiseaseStation + /// + [Display(Name = "DiseaseStation"), Description("DiseaseStation"), MaxLength(100, ErrorMessage = "DiseaseStation 不能超过 100 个字符")] + public string DiseaseStation { get; set; } + + /// + /// OnJobCheckUp + /// + [Display(Name = "OnJobCheckUp"), Description("OnJobCheckUp"), MaxLength(100, ErrorMessage = "OnJobCheckUp 不能超过 100 个字符")] + public string OnJobCheckUp { get; set; } + + /// + /// DiseaseCheckUp + /// + [Display(Name = "DiseaseCheckUp"), Description("DiseaseCheckUp"), MaxLength(100, ErrorMessage = "DiseaseCheckUp 不能超过 100 个字符")] + public string DiseaseCheckUp { get; set; } + + /// + /// ManagerID2 + /// + public int? ManagerID2 { get; set; } + + /// + /// TaxID + /// + public int? TaxID { get; set; } + + /// + /// PeriodMasterID + /// + public int? PeriodMasterID { get; set; } + + /// + /// OvertimeRuleID + /// + public int? OvertimeRuleID { get; set; } + + /// + /// RegisteredPlace + /// + [Display(Name = "RegisteredPlace"), Description("RegisteredPlace"), MaxLength(1000, ErrorMessage = "RegisteredPlace 不能超过 1000 个字符")] + public string RegisteredPlace { get; set; } + + /// + /// RegisteredAddress + /// + [Display(Name = "RegisteredAddress"), Description("RegisteredAddress"), MaxLength(1000, ErrorMessage = "RegisteredAddress 不能超过 1000 个字符")] + public string RegisteredAddress { get; set; } + + /// + /// HomeAddress + /// + [Display(Name = "HomeAddress"), Description("HomeAddress"), MaxLength(1000, ErrorMessage = "HomeAddress 不能超过 1000 个字符")] + public string HomeAddress { get; set; } + + /// + /// BankAccount + /// + [Display(Name = "BankAccount"), Description("BankAccount"), MaxLength(1000, ErrorMessage = "BankAccount 不能超过 1000 个字符")] + public string BankAccount { get; set; } + + /// + /// UrgentContactAddress + /// + [Display(Name = "UrgentContactAddress"), Description("UrgentContactAddress"), MaxLength(1000, ErrorMessage = "UrgentContactAddress 不能超过 1000 个字符")] + public string UrgentContactAddress { get; set; } + + /// + /// UrgentRelation + /// + [Display(Name = "UrgentRelation"), Description("UrgentRelation"), MaxLength(1000, ErrorMessage = "UrgentRelation 不能超过 1000 个字符")] + public string UrgentRelation { get; set; } + + /// + /// Urgent2Contact + /// + [Display(Name = "Urgent2Contact"), Description("Urgent2Contact"), MaxLength(1000, ErrorMessage = "Urgent2Contact 不能超过 1000 个字符")] + public string Urgent2Contact { get; set; } + + /// + /// Urgent2ContactTel + /// + [Display(Name = "Urgent2ContactTel"), Description("Urgent2ContactTel"), MaxLength(1000, ErrorMessage = "Urgent2ContactTel 不能超过 1000 个字符")] + public string Urgent2ContactTel { get; set; } + + /// + /// Urgent2ContactAddress + /// + [Display(Name = "Urgent2ContactAddress"), Description("Urgent2ContactAddress"), MaxLength(1000, ErrorMessage = "Urgent2ContactAddress 不能超过 1000 个字符")] + public string Urgent2ContactAddress { get; set; } + + /// + /// Urgent2Relation + /// + [Display(Name = "Urgent2Relation"), Description("Urgent2Relation"), MaxLength(1000, ErrorMessage = "Urgent2Relation 不能超过 1000 个字符")] + public string Urgent2Relation { get; set; } + + /// + /// Introducer + /// + [Display(Name = "Introducer"), Description("Introducer"), MaxLength(1000, ErrorMessage = "Introducer 不能超过 1000 个字符")] + public string Introducer { get; set; } + + /// + /// AttendCheckType + /// + [Display(Name = "AttendCheckType"), Description("AttendCheckType"), MaxLength(100, ErrorMessage = "AttendCheckType 不能超过 100 个字符")] + public string AttendCheckType { get; set; } + + /// + /// OTExemption + /// + [Display(Name = "OTExemption"), Description("OTExemption"), MaxLength(100, ErrorMessage = "OTExemption 不能超过 100 个字符")] + public string OTExemption { get; set; } + + /// + /// OldStaffNo + /// + [Display(Name = "OldStaffNo"), Description("OldStaffNo"), MaxLength(100, ErrorMessage = "OldStaffNo 不能超过 100 个字符")] + public string OldStaffNo { get; set; } + + /// + /// Reverse10 + /// + [Display(Name = "Reverse10"), Description("Reverse10"), MaxLength(1000, ErrorMessage = "Reverse10 不能超过 1000 个字符")] + public string Reverse10 { get; set; } + + /// + /// Reverse11 + /// + [Display(Name = "Reverse11"), Description("Reverse11"), MaxLength(1000, ErrorMessage = "Reverse11 不能超过 1000 个字符")] + public string Reverse11 { get; set; } + + /// + /// Reverse12 + /// + [Display(Name = "Reverse12"), Description("Reverse12"), MaxLength(1000, ErrorMessage = "Reverse12 不能超过 1000 个字符")] + public string Reverse12 { get; set; } + + /// + /// Reverse13 + /// + [Display(Name = "Reverse13"), Description("Reverse13"), MaxLength(1000, ErrorMessage = "Reverse13 不能超过 1000 个字符")] + public string Reverse13 { get; set; } + + /// + /// Reverse14 + /// + [Display(Name = "Reverse14"), Description("Reverse14"), MaxLength(1000, ErrorMessage = "Reverse14 不能超过 1000 个字符")] + public string Reverse14 { get; set; } + + /// + /// Reverse15 + /// + [Display(Name = "Reverse15"), Description("Reverse15"), MaxLength(1000, ErrorMessage = "Reverse15 不能超过 1000 个字符")] + public string Reverse15 { get; set; } + + /// + /// Reverse16 + /// + [Display(Name = "Reverse16"), Description("Reverse16"), MaxLength(1000, ErrorMessage = "Reverse16 不能超过 1000 个字符")] + public string Reverse16 { get; set; } + + /// + /// ChangeI4 + /// + public int? ChangeI4 { get; set; } + + /// + /// ChangeI5 + /// + public int? ChangeI5 { get; set; } + + /// + /// ChangeI6 + /// + public int? ChangeI6 { get; set; } + + /// + /// ChangeS1 + /// + [Display(Name = "ChangeS1"), Description("ChangeS1"), MaxLength(100, ErrorMessage = "ChangeS1 不能超过 100 个字符")] + public string ChangeS1 { get; set; } + + /// + /// ChangeS2 + /// + [Display(Name = "ChangeS2"), Description("ChangeS2"), MaxLength(100, ErrorMessage = "ChangeS2 不能超过 100 个字符")] + public string ChangeS2 { get; set; } + + /// + /// ChangeS3 + /// + [Display(Name = "ChangeS3"), Description("ChangeS3"), MaxLength(100, ErrorMessage = "ChangeS3 不能超过 100 个字符")] + public string ChangeS3 { get; set; } + + /// + /// ExpectTitleID + /// + public int? ExpectTitleID { get; set; } + + /// + /// ExpectDeptID + /// + public int? ExpectDeptID { get; set; } + + /// + /// ConfirmUserID + /// + public int? ConfirmUserID { get; set; } + + /// + /// ConfirmTime + /// + public DateTime? ConfirmTime { get; set; } + + /// + /// ConfirmComment + /// + [Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")] + public string ConfirmComment { get; set; } + + /// + /// IsInsure + /// + public int? IsInsure { get; set; } + + /// + /// IsFund + /// + public int? IsFund { get; set; } + + /// + /// SeniorityBegin + /// + public DateTime? SeniorityBegin { get; set; } + + /// + /// IDCardBegin + /// + public DateTime? IDCardBegin { get; set; } + + /// + /// IDCardEnd + /// + public DateTime? IDCardEnd { get; set; } + + /// + /// GraduateDate + /// + public DateTime? GraduateDate { get; set; } + + /// + /// EmploymentDate + /// + public DateTime? EmploymentDate { get; set; } + + /// + /// PreJoinDate + /// + public DateTime? PreJoinDate { get; set; } + + /// + /// IsCalSalary + /// + public int? IsCalSalary { get; set; } + + /// + /// InsureAccountID + /// + public int? InsureAccountID { get; set; } + + /// + /// FundAccountID + /// + public int? FundAccountID { get; set; } + + /// + /// InsureDate + /// + public DateTime? InsureDate { get; set; } + + /// + /// InsureBase + /// + [Display(Name = "InsureBase"), Description("InsureBase"), Column(TypeName = "decimal(18,4)")] + public decimal? InsureBase { get; set; } + + /// + /// FundBase + /// + [Display(Name = "FundBase"), Description("FundBase"), Column(TypeName = "decimal(18,4)")] + public decimal? FundBase { get; set; } + + /// + /// IsInInsure + /// + public int? IsInInsure { get; set; } + + /// + /// InInsureAccountNo + /// + public int? InInsureAccountNo { get; set; } + + /// + /// AttachmentIDs + /// + [Display(Name = "AttachmentIDs"), Description("AttachmentIDs"), MaxLength(-1, ErrorMessage = "AttachmentIDs 不能超过 -1 个字符")] + public string AttachmentIDs { get; set; } + + /// + /// IDCardOrg + /// + [Display(Name = "IDCardOrg"), Description("IDCardOrg"), MaxLength(1000, ErrorMessage = "IDCardOrg 不能超过 1000 个字符")] + public string IDCardOrg { get; set; } + + /// + /// SalaryReportType + /// + public int? SalaryReportType { get; set; } + + /// + /// IsSalaryPay + /// + public int? IsSalaryPay { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghra/Ghra_StaffLicence.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghra/Ghra_StaffLicence.Dto.Base.cs index 8eaaccf8..2814ca96 100644 --- a/Tiobon.Core.Model/Base/Ghra/Ghra_StaffLicence.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghra/Ghra_StaffLicence.Dto.Base.cs @@ -13,134 +13,130 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghra_StaffLicence (Dto.Base) +/// +public class Ghra_StaffLicenceBase { /// - /// Ghra_StaffLicence (Dto.Base) - /// - public class Ghra_StaffLicenceBase - { - - /// - /// 证件ID - /// - public int? StaffLicenceID { get; set; } - - /// - /// 员工ID - /// - public int? StaffID { get; set; } - - /// - /// BeginDate - /// - public DateTime? BeginDate { get; set; } - - /// - /// EndDate - /// - public DateTime? EndDate { get; set; } - - /// - /// LicenceTypeID - /// - public int? LicenceTypeID { get; set; } - - /// - /// LicenceName - /// - [Display(Name = "LicenceName"), Description("LicenceName"), MaxLength(200, ErrorMessage = "LicenceName 不能超过 200 个字符")] - public string LicenceName { get; set; } - - /// - /// LicenceLevel - /// - [Display(Name = "LicenceLevel"), Description("LicenceLevel"), MaxLength(200, ErrorMessage = "LicenceLevel 不能超过 200 个字符")] - public string LicenceLevel { get; set; } - - /// - /// LicenceNo - /// - [Display(Name = "LicenceNo"), Description("LicenceNo"), MaxLength(200, ErrorMessage = "LicenceNo 不能超过 200 个字符")] - public string LicenceNo { get; set; } - - /// - /// LicenceUnit - /// - [Display(Name = "LicenceUnit"), Description("LicenceUnit"), MaxLength(200, ErrorMessage = "LicenceUnit 不能超过 200 个字符")] - public string LicenceUnit { get; set; } - - /// - /// LicenceInitialDate - /// - public DateTime? LicenceInitialDate { get; set; } - - /// - /// LicenceReviewDate - /// - public DateTime? LicenceReviewDate { get; set; } - - /// - /// LicencePayType - /// - [Display(Name = "LicencePayType"), Description("LicencePayType"), MaxLength(100, ErrorMessage = "LicencePayType 不能超过 100 个字符")] - public string LicencePayType { get; set; } - - /// - /// RemarkSz - /// - [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// SortNo - /// - public int? SortNo { get; set; } - - /// - /// IsDefault - /// - public int? IsDefault { get; set; } - - /// - /// AttachmentIDs - /// - [Display(Name = "AttachmentIDs"), Description("AttachmentIDs"), MaxLength(-1, ErrorMessage = "AttachmentIDs 不能超过 -1 个字符")] - public string AttachmentIDs { get; set; } - - /// - /// Reverse1 - /// - [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// Reverse2 - /// - [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// Reverse3 - /// - [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// Reverse4 - /// - [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// Reverse5 - /// - [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - } + /// 证件ID + /// + public int? StaffLicenceID { get; set; } + + /// + /// 员工ID + /// + public int? StaffID { get; set; } + + /// + /// BeginDate + /// + public DateTime? BeginDate { get; set; } + + /// + /// EndDate + /// + public DateTime? EndDate { get; set; } + + /// + /// LicenceTypeID + /// + public int? LicenceTypeID { get; set; } + + /// + /// LicenceName + /// + [Display(Name = "LicenceName"), Description("LicenceName"), MaxLength(200, ErrorMessage = "LicenceName 不能超过 200 个字符")] + public string LicenceName { get; set; } + + /// + /// LicenceLevel + /// + [Display(Name = "LicenceLevel"), Description("LicenceLevel"), MaxLength(200, ErrorMessage = "LicenceLevel 不能超过 200 个字符")] + public string LicenceLevel { get; set; } + + /// + /// LicenceNo + /// + [Display(Name = "LicenceNo"), Description("LicenceNo"), MaxLength(200, ErrorMessage = "LicenceNo 不能超过 200 个字符")] + public string LicenceNo { get; set; } + + /// + /// LicenceUnit + /// + [Display(Name = "LicenceUnit"), Description("LicenceUnit"), MaxLength(200, ErrorMessage = "LicenceUnit 不能超过 200 个字符")] + public string LicenceUnit { get; set; } + + /// + /// LicenceInitialDate + /// + public DateTime? LicenceInitialDate { get; set; } + + /// + /// LicenceReviewDate + /// + public DateTime? LicenceReviewDate { get; set; } + + /// + /// LicencePayType + /// + [Display(Name = "LicencePayType"), Description("LicencePayType"), MaxLength(100, ErrorMessage = "LicencePayType 不能超过 100 个字符")] + public string LicencePayType { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// AttachmentIDs + /// + [Display(Name = "AttachmentIDs"), Description("AttachmentIDs"), MaxLength(-1, ErrorMessage = "AttachmentIDs 不能超过 -1 个字符")] + public string AttachmentIDs { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghra/Ghra_StaffSocialRelation.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghra/Ghra_StaffSocialRelation.Dto.Base.cs index b0d599e2..96e719aa 100644 --- a/Tiobon.Core.Model/Base/Ghra/Ghra_StaffSocialRelation.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghra/Ghra_StaffSocialRelation.Dto.Base.cs @@ -13,132 +13,128 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghra_StaffSocialRelation (Dto.Base) +/// +public class Ghra_StaffSocialRelationBase { /// - /// Ghra_StaffSocialRelation (Dto.Base) - /// - public class Ghra_StaffSocialRelationBase - { - - /// - /// StaffSocialRelationID - /// - public int? StaffSocialRelationID { get; set; } - - /// - /// StaffID - /// - public int? StaffID { get; set; } - - /// - /// RelationType - /// - [Display(Name = "RelationType"), Description("RelationType"), MaxLength(100, ErrorMessage = "RelationType 不能超过 100 个字符")] - public string RelationType { get; set; } - - /// - /// RelationName - /// - [Display(Name = "RelationName"), Description("RelationName"), MaxLength(100, ErrorMessage = "RelationName 不能超过 100 个字符")] - public string RelationName { get; set; } - - /// - /// IDCardNo - /// - [Display(Name = "IDCardNo"), Description("IDCardNo"), MaxLength(100, ErrorMessage = "IDCardNo 不能超过 100 个字符")] - public string IDCardNo { get; set; } - - /// - /// Gender - /// - [Display(Name = "Gender"), Description("Gender"), MaxLength(100, ErrorMessage = "Gender 不能超过 100 个字符")] - public string Gender { get; set; } - - /// - /// Birthday - /// - public DateTime? Birthday { get; set; } - - /// - /// CompanyName - /// - [Display(Name = "CompanyName"), Description("CompanyName"), MaxLength(1000, ErrorMessage = "CompanyName 不能超过 1000 个字符")] - public string CompanyName { get; set; } - - /// - /// DeptName - /// - [Display(Name = "DeptName"), Description("DeptName"), MaxLength(1000, ErrorMessage = "DeptName 不能超过 1000 个字符")] - public string DeptName { get; set; } - - /// - /// RelationAddress - /// - [Display(Name = "RelationAddress"), Description("RelationAddress"), MaxLength(2000, ErrorMessage = "RelationAddress 不能超过 2000 个字符")] - public string RelationAddress { get; set; } - - /// - /// RelationTel - /// - [Display(Name = "RelationTel"), Description("RelationTel"), MaxLength(100, ErrorMessage = "RelationTel 不能超过 100 个字符")] - public string RelationTel { get; set; } - - /// - /// AttachmentIDs - /// - [Display(Name = "AttachmentIDs"), Description("AttachmentIDs"), MaxLength(-1, ErrorMessage = "AttachmentIDs 不能超过 -1 个字符")] - public string AttachmentIDs { get; set; } - - /// - /// RemarkSz - /// - [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// SortNo - /// - public int? SortNo { get; set; } - - /// - /// IsDefault - /// - public int? IsDefault { get; set; } - - /// - /// Reverse1 - /// - [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// Reverse2 - /// - [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// Reverse3 - /// - [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// Reverse4 - /// - [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// Reverse5 - /// - [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - } + /// StaffSocialRelationID + /// + public int? StaffSocialRelationID { get; set; } + + /// + /// StaffID + /// + public int? StaffID { get; set; } + + /// + /// RelationType + /// + [Display(Name = "RelationType"), Description("RelationType"), MaxLength(100, ErrorMessage = "RelationType 不能超过 100 个字符")] + public string RelationType { get; set; } + + /// + /// RelationName + /// + [Display(Name = "RelationName"), Description("RelationName"), MaxLength(100, ErrorMessage = "RelationName 不能超过 100 个字符")] + public string RelationName { get; set; } + + /// + /// IDCardNo + /// + [Display(Name = "IDCardNo"), Description("IDCardNo"), MaxLength(100, ErrorMessage = "IDCardNo 不能超过 100 个字符")] + public string IDCardNo { get; set; } + + /// + /// Gender + /// + [Display(Name = "Gender"), Description("Gender"), MaxLength(100, ErrorMessage = "Gender 不能超过 100 个字符")] + public string Gender { get; set; } + + /// + /// Birthday + /// + public DateTime? Birthday { get; set; } + + /// + /// CompanyName + /// + [Display(Name = "CompanyName"), Description("CompanyName"), MaxLength(1000, ErrorMessage = "CompanyName 不能超过 1000 个字符")] + public string CompanyName { get; set; } + + /// + /// DeptName + /// + [Display(Name = "DeptName"), Description("DeptName"), MaxLength(1000, ErrorMessage = "DeptName 不能超过 1000 个字符")] + public string DeptName { get; set; } + + /// + /// RelationAddress + /// + [Display(Name = "RelationAddress"), Description("RelationAddress"), MaxLength(2000, ErrorMessage = "RelationAddress 不能超过 2000 个字符")] + public string RelationAddress { get; set; } + + /// + /// RelationTel + /// + [Display(Name = "RelationTel"), Description("RelationTel"), MaxLength(100, ErrorMessage = "RelationTel 不能超过 100 个字符")] + public string RelationTel { get; set; } + + /// + /// AttachmentIDs + /// + [Display(Name = "AttachmentIDs"), Description("AttachmentIDs"), MaxLength(-1, ErrorMessage = "AttachmentIDs 不能超过 -1 个字符")] + public string AttachmentIDs { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghra/Ghra_StaffTraining.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghra/Ghra_StaffTraining.Dto.Base.cs index a56677f3..8fe71b0c 100644 --- a/Tiobon.Core.Model/Base/Ghra/Ghra_StaffTraining.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghra/Ghra_StaffTraining.Dto.Base.cs @@ -13,129 +13,124 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghra_StaffTraining (Dto.Base) +/// +public class Ghra_StaffTrainingBase { /// - /// Ghra_StaffTraining (Dto.Base) - /// - public class Ghra_StaffTrainingBase - { - - /// - /// StaffTrainingID - /// - public int? StaffTrainingID { get; set; } - - /// - /// StaffID - /// - public int? StaffID { get; set; } - - /// - /// TrainingOrgID - /// - public int? TrainingOrgID { get; set; } - - /// - /// TrainingOrgName - /// - [Display(Name = "TrainingOrgName"), Description("TrainingOrgName"), MaxLength(1000, ErrorMessage = "TrainingOrgName 不能超过 1000 个字符")] - public string TrainingOrgName { get; set; } - - /// - /// CourseID - /// - public int? CourseID { get; set; } - - /// - /// CourseName - /// - [Display(Name = "CourseName"), Description("CourseName"), MaxLength(1000, ErrorMessage = "CourseName 不能超过 1000 个字符")] - public string CourseName { get; set; } - - /// - /// ClassHour - /// - [Display(Name = "ClassHour"), Description("ClassHour"), Column(TypeName = "decimal(18,2)")] - public decimal? ClassHour { get; set; } - - /// - /// IsPass - /// - public int? IsPass { get; set; } - - /// - /// ClassCredit - /// - [Display(Name = "ClassCredit"), Description("ClassCredit"), Column(TypeName = "decimal(18,2)")] - public decimal? ClassCredit { get; set; } - - /// - /// BeginDate - /// - public DateTime? BeginDate { get; set; } - - /// - /// EndDate - /// - public DateTime? EndDate { get; set; } - - /// - /// AttachmentIDs - /// - [Display(Name = "AttachmentIDs"), Description("AttachmentIDs"), MaxLength(-1, ErrorMessage = "AttachmentIDs 不能超过 -1 个字符")] - public string AttachmentIDs { get; set; } - - /// - /// RemarkSz - /// - [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// SortNo - /// - public int? SortNo { get; set; } - - /// - /// IsDefault - /// - public int? IsDefault { get; set; } - - /// - /// Reverse1 - /// - [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// Reverse2 - /// - [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// Reverse3 - /// - [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// Reverse4 - /// - [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// Reverse5 - /// - [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - } + /// StaffTrainingID + /// + public int? StaffTrainingID { get; set; } + + /// + /// StaffID + /// + public int? StaffID { get; set; } + + /// + /// TrainingOrgID + /// + public int? TrainingOrgID { get; set; } + + /// + /// TrainingOrgName + /// + [Display(Name = "TrainingOrgName"), Description("TrainingOrgName"), MaxLength(1000, ErrorMessage = "TrainingOrgName 不能超过 1000 个字符")] + public string TrainingOrgName { get; set; } + + /// + /// CourseID + /// + public int? CourseID { get; set; } + + /// + /// CourseName + /// + [Display(Name = "CourseName"), Description("CourseName"), MaxLength(1000, ErrorMessage = "CourseName 不能超过 1000 个字符")] + public string CourseName { get; set; } + + /// + /// ClassHour + /// + [Display(Name = "ClassHour"), Description("ClassHour"), Column(TypeName = "decimal(18,2)")] + public decimal? ClassHour { get; set; } + + /// + /// IsPass + /// + public int? IsPass { get; set; } + + /// + /// ClassCredit + /// + [Display(Name = "ClassCredit"), Description("ClassCredit"), Column(TypeName = "decimal(18,2)")] + public decimal? ClassCredit { get; set; } + + /// + /// BeginDate + /// + public DateTime? BeginDate { get; set; } + + /// + /// EndDate + /// + public DateTime? EndDate { get; set; } + + /// + /// AttachmentIDs + /// + [Display(Name = "AttachmentIDs"), Description("AttachmentIDs"), MaxLength(-1, ErrorMessage = "AttachmentIDs 不能超过 -1 个字符")] + public string AttachmentIDs { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghra/Ghra_StaffWorkExp.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghra/Ghra_StaffWorkExp.Dto.Base.cs index 3e3c647b..64857ecb 100644 --- a/Tiobon.Core.Model/Base/Ghra/Ghra_StaffWorkExp.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghra/Ghra_StaffWorkExp.Dto.Base.cs @@ -13,140 +13,136 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghra_StaffWorkExp (Dto.Base) +/// +public class Ghra_StaffWorkExpBase { /// - /// Ghra_StaffWorkExp (Dto.Base) - /// - public class Ghra_StaffWorkExpBase - { - - /// - /// 工作经历ID - /// - public int? StaffWorkExpID { get; set; } - - /// - /// 员工ID - /// - public int? StaffID { get; set; } - - /// - /// 开始日期 - /// - public DateTime? BeginDate { get; set; } - - /// - /// 结束日 - /// - public DateTime? EndDate { get; set; } - - /// - /// 公司名 - /// - [Display(Name = "CompanyName"), Description("公司名"), MaxLength(1000, ErrorMessage = "公司名 不能超过 1000 个字符")] - public string CompanyName { get; set; } - - /// - /// 部门名 - /// - [Display(Name = "DeptName"), Description("部门名"), MaxLength(1000, ErrorMessage = "部门名 不能超过 1000 个字符")] - public string DeptName { get; set; } - - /// - /// 职称名 - /// - [Display(Name = "TitleName"), Description("职称名"), MaxLength(1000, ErrorMessage = "职称名 不能超过 1000 个字符")] - public string TitleName { get; set; } - - /// - /// 公司内 - /// - public int? IsCompany { get; set; } - - /// - /// 计算年资 - /// - public int? IsCalSeniority { get; set; } - - /// - /// 本业 - /// - public int? IsBase { get; set; } - - /// - /// 年资 - /// - [Display(Name = "Seniority"), Description("年资"), Column(TypeName = "decimal(18,2)")] - public decimal? Seniority { get; set; } - - /// - /// 离职原因 - /// - [Display(Name = "SeparationReason"), Description("离职原因"), MaxLength(1000, ErrorMessage = "离职原因 不能超过 1000 个字符")] - public string SeparationReason { get; set; } - - /// - /// 薪资 - /// - [Display(Name = "SalaryAmount"), Description("薪资"), Column(TypeName = "decimal(18,2)")] - public decimal? SalaryAmount { get; set; } - - /// - /// AttachmentIDs - /// - [Display(Name = "AttachmentIDs"), Description("AttachmentIDs"), MaxLength(-1, ErrorMessage = "AttachmentIDs 不能超过 -1 个字符")] - public string AttachmentIDs { get; set; } - - /// - /// RemarkSz - /// - [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// SortNo - /// - public int? SortNo { get; set; } - - /// - /// IsDefault - /// - public int? IsDefault { get; set; } - - /// - /// Reverse1 - /// - [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// Reverse2 - /// - [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// Reverse3 - /// - [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// Reverse4 - /// - [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// Reverse5 - /// - [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - } + /// 工作经历ID + /// + public int? StaffWorkExpID { get; set; } + + /// + /// 员工ID + /// + public int? StaffID { get; set; } + + /// + /// 开始日期 + /// + public DateTime? BeginDate { get; set; } + + /// + /// 结束日 + /// + public DateTime? EndDate { get; set; } + + /// + /// 公司名 + /// + [Display(Name = "CompanyName"), Description("公司名"), MaxLength(1000, ErrorMessage = "公司名 不能超过 1000 个字符")] + public string CompanyName { get; set; } + + /// + /// 部门名 + /// + [Display(Name = "DeptName"), Description("部门名"), MaxLength(1000, ErrorMessage = "部门名 不能超过 1000 个字符")] + public string DeptName { get; set; } + + /// + /// 职称名 + /// + [Display(Name = "TitleName"), Description("职称名"), MaxLength(1000, ErrorMessage = "职称名 不能超过 1000 个字符")] + public string TitleName { get; set; } + + /// + /// 公司内 + /// + public int? IsCompany { get; set; } + + /// + /// 计算年资 + /// + public int? IsCalSeniority { get; set; } + + /// + /// 本业 + /// + public int? IsBase { get; set; } + + /// + /// 年资 + /// + [Display(Name = "Seniority"), Description("年资"), Column(TypeName = "decimal(18,2)")] + public decimal? Seniority { get; set; } + + /// + /// 离职原因 + /// + [Display(Name = "SeparationReason"), Description("离职原因"), MaxLength(1000, ErrorMessage = "离职原因 不能超过 1000 个字符")] + public string SeparationReason { get; set; } + + /// + /// 薪资 + /// + [Display(Name = "SalaryAmount"), Description("薪资"), Column(TypeName = "decimal(18,2)")] + public decimal? SalaryAmount { get; set; } + + /// + /// AttachmentIDs + /// + [Display(Name = "AttachmentIDs"), Description("AttachmentIDs"), MaxLength(-1, ErrorMessage = "AttachmentIDs 不能超过 -1 个字符")] + public string AttachmentIDs { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghra/Ghra_Zone.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghra/Ghra_Zone.Dto.Base.cs index 693dd7d2..36bc8c13 100644 --- a/Tiobon.Core.Model/Base/Ghra/Ghra_Zone.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghra/Ghra_Zone.Dto.Base.cs @@ -13,115 +13,111 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 厂区 (Dto.Base) +/// +public class Ghra_ZoneBase { /// - /// 厂区 (Dto.Base) - /// - public class Ghra_ZoneBase - { - - /// - /// ZoneID - /// - public int? ZoneID { get; set; } - - /// - /// ZoneNo - /// - [Display(Name = "ZoneNo"), Description("ZoneNo"), MaxLength(100, ErrorMessage = "ZoneNo 不能超过 100 个字符")] - public string ZoneNo { get; set; } - - /// - /// ZoneName - /// - [Display(Name = "ZoneName"), Description("ZoneName"), MaxLength(1000, ErrorMessage = "ZoneName 不能超过 1000 个字符")] - public string ZoneName { get; set; } - - /// - /// MKey - /// - [Display(Name = "MKey"), Description("MKey"), MaxLength(200, ErrorMessage = "MKey 不能超过 200 个字符")] - public string MKey { get; set; } - - /// - /// DataBelongID - /// - public int? DataBelongID { get; set; } - - /// - /// RemarkSz - /// - [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// SortNo - /// - public int? SortNo { get; set; } - - /// - /// IsDefault - /// - public int? IsDefault { get; set; } - - /// - /// Reverse1 - /// - [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// Reverse2 - /// - [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// Reverse3 - /// - [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// Reverse4 - /// - [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// Reverse5 - /// - [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - - /// - /// Reverse6 - /// - [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] - public string Reverse6 { get; set; } - - /// - /// Reverse7 - /// - [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] - public string Reverse7 { get; set; } - - /// - /// Reverse8 - /// - [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] - public string Reverse8 { get; set; } - - /// - /// Reverse9 - /// - [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] - public string Reverse9 { get; set; } - } + /// ZoneID + /// + public int? ZoneID { get; set; } + + /// + /// ZoneNo + /// + [Display(Name = "ZoneNo"), Description("ZoneNo"), MaxLength(100, ErrorMessage = "ZoneNo 不能超过 100 个字符")] + public string ZoneNo { get; set; } + + /// + /// ZoneName + /// + [Display(Name = "ZoneName"), Description("ZoneName"), MaxLength(1000, ErrorMessage = "ZoneName 不能超过 1000 个字符")] + public string ZoneName { get; set; } + + /// + /// MKey + /// + [Display(Name = "MKey"), Description("MKey"), MaxLength(200, ErrorMessage = "MKey 不能超过 200 个字符")] + public string MKey { get; set; } + + /// + /// DataBelongID + /// + public int? DataBelongID { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// Reverse6 + /// + [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// Reverse7 + /// + [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// Reverse8 + /// + [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// Reverse9 + /// + [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_Attachment.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_Attachment.Dto.Base.cs index bbeb334d..17e1223b 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_Attachment.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_Attachment.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 Ghre_AttachmentBase { /// - /// 附件 (Dto.Base) - /// - public class Ghre_AttachmentBase - { - - /// - /// 附件编号 - /// - [Display(Name = "AttachmentNo"), Description("附件编号"), MaxLength(100, ErrorMessage = "附件编号 不能超过 100 个字符")] - public string AttachmentNo { get; set; } - - /// - /// 附件名称 - /// - [Display(Name = "AttachmentName"), Description("附件名称"), MaxLength(200, ErrorMessage = "附件名称 不能超过 200 个字符")] - public string AttachmentName { get; set; } - - /// - /// 附件名称 - /// - [Display(Name = "AttachmentEname"), Description("附件名称"), MaxLength(500, ErrorMessage = "附件名称 不能超过 500 个字符")] - public string AttachmentEname { get; set; } - - /// - /// 表名 - /// - [Display(Name = "TableName"), Description("表名"), MaxLength(200, ErrorMessage = "表名 不能超过 200 个字符")] - public string TableName { get; set; } - - /// - /// 表主键 - /// - public int? TableKeyID { get; set; } - - /// - /// 员工ID - /// - public int? StaffID { get; set; } - - /// - /// 附件类型 - /// - [Display(Name = "AttachmentType"), Description("附件类型"), MaxLength(100, ErrorMessage = "附件类型 不能超过 100 个字符")] - public string AttachmentType { get; set; } - - /// - /// 附件分组ID - /// - public int? AttachmentGroupID { get; set; } - - /// - /// 附件文件名 - /// - [Display(Name = "AttachFileName"), Description("附件文件名"), MaxLength(200, ErrorMessage = "附件文件名 不能超过 200 个字符")] - public string AttachFileName { get; set; } - - /// - /// 附件 - /// - - /// - /// 附件扩展名 - /// - [Display(Name = "AttachFileExtension"), Description("附件扩展名"), MaxLength(100, ErrorMessage = "附件扩展名 不能超过 100 个字符")] - public string AttachFileExtension { get; set; } - - /// - /// 附件大小 - /// - - /// - /// 物理路径 - /// - [Display(Name = "PhysicsPath"), Description("物理路径"), MaxLength(500, ErrorMessage = "物理路径 不能超过 500 个字符")] - public string PhysicsPath { get; set; } - - /// - /// 相对路径 - /// - [Display(Name = "RelativePath"), Description("相对路径"), MaxLength(500, ErrorMessage = "相对路径 不能超过 500 个字符")] - public string RelativePath { get; set; } - - /// - /// 缩略图路径 - /// - [Display(Name = "ThumbnailPath"), Description("缩略图路径"), MaxLength(500, ErrorMessage = "缩略图路径 不能超过 500 个字符")] - public string ThumbnailPath { get; set; } - - /// - /// 文件路径 - /// - [Display(Name = "FileURL"), Description("文件路径"), MaxLength(500, ErrorMessage = "文件路径 不能超过 500 个字符")] - public string FileURL { get; set; } - - /// - /// 公司ID - /// - public int? CompanyID { 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; } - } + /// 附件编号 + /// + [Display(Name = "AttachmentNo"), Description("附件编号"), MaxLength(100, ErrorMessage = "附件编号 不能超过 100 个字符")] + public string AttachmentNo { get; set; } + + /// + /// 附件名称 + /// + [Display(Name = "AttachmentName"), Description("附件名称"), MaxLength(200, ErrorMessage = "附件名称 不能超过 200 个字符")] + public string AttachmentName { get; set; } + + /// + /// 附件名称 + /// + [Display(Name = "AttachmentEname"), Description("附件名称"), MaxLength(500, ErrorMessage = "附件名称 不能超过 500 个字符")] + public string AttachmentEname { get; set; } + + /// + /// 表名 + /// + [Display(Name = "TableName"), Description("表名"), MaxLength(200, ErrorMessage = "表名 不能超过 200 个字符")] + public string TableName { get; set; } + + /// + /// 表主键 + /// + public int? TableKeyID { get; set; } + + /// + /// 员工ID + /// + public int? StaffID { get; set; } + + /// + /// 附件类型 + /// + [Display(Name = "AttachmentType"), Description("附件类型"), MaxLength(100, ErrorMessage = "附件类型 不能超过 100 个字符")] + public string AttachmentType { get; set; } + + /// + /// 附件分组ID + /// + public int? AttachmentGroupID { get; set; } + + /// + /// 附件文件名 + /// + [Display(Name = "AttachFileName"), Description("附件文件名"), MaxLength(200, ErrorMessage = "附件文件名 不能超过 200 个字符")] + public string AttachFileName { get; set; } + + /// + /// 附件 + /// + + /// + /// 附件扩展名 + /// + [Display(Name = "AttachFileExtension"), Description("附件扩展名"), MaxLength(100, ErrorMessage = "附件扩展名 不能超过 100 个字符")] + public string AttachFileExtension { get; set; } + + /// + /// 附件大小 + /// + + /// + /// 物理路径 + /// + [Display(Name = "PhysicsPath"), Description("物理路径"), MaxLength(500, ErrorMessage = "物理路径 不能超过 500 个字符")] + public string PhysicsPath { get; set; } + + /// + /// 相对路径 + /// + [Display(Name = "RelativePath"), Description("相对路径"), MaxLength(500, ErrorMessage = "相对路径 不能超过 500 个字符")] + public string RelativePath { get; set; } + + /// + /// 缩略图路径 + /// + [Display(Name = "ThumbnailPath"), Description("缩略图路径"), MaxLength(500, ErrorMessage = "缩略图路径 不能超过 500 个字符")] + public string ThumbnailPath { get; set; } + + /// + /// 文件路径 + /// + [Display(Name = "FileURL"), Description("文件路径"), MaxLength(500, ErrorMessage = "文件路径 不能超过 500 个字符")] + public string FileURL { get; set; } + + /// + /// 公司ID + /// + public int? CompanyID { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_CertificateRule.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_CertificateRule.Dto.Base.cs index f987e596..b73521da 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_CertificateRule.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_CertificateRule.Dto.Base.cs @@ -13,164 +13,160 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训证书规则 (Dto.Base) +/// +public class Ghre_CertificateRuleBase { /// - /// 培训证书规则 (Dto.Base) - /// - public class Ghre_CertificateRuleBase - { - - /// - /// 规则类型 - /// - [Display(Name = "RuleType"), Description("规则类型"), MaxLength(32, ErrorMessage = "规则类型 不能超过 32 个字符")] - public string RuleType { get; set; } - - /// - /// 规则编号 - /// - [Display(Name = "RuleNo"), Description("规则编号"), MaxLength(32, ErrorMessage = "规则编号 不能超过 32 个字符")] - public string RuleNo { get; set; } - - /// - /// 证书名称 - /// - [Display(Name = "CertificateName"), Description("证书名称"), MaxLength(32, ErrorMessage = "证书名称 不能超过 32 个字符")] - public string CertificateName { get; set; } - - /// - /// 课程场景ID - /// - public long? CourseSceneId { get; set; } - - /// - /// 课程ID - /// - public long? CourseId { get; set; } - - /// - /// 有效期类型 - /// - [Display(Name = "ValidityType"), Description("有效期类型"), MaxLength(32, ErrorMessage = "有效期类型 不能超过 32 个字符")] - public string ValidityType { get; set; } - - /// - /// 固定数 - /// - public int? StaticNum { get; set; } - - /// - /// 固定类型 - /// - [Display(Name = "StaticType"), Description("固定类型"), MaxLength(32, ErrorMessage = "固定类型 不能超过 32 个字符")] - public string StaticType { get; set; } - - /// - /// 有效期 - /// - public DateTime? ValidityTime { get; set; } - - /// - /// 发放规则 - /// - [Display(Name = "SendRule"), Description("发放规则"), MaxLength(32, ErrorMessage = "发放规则 不能超过 32 个字符")] - public string SendRule { get; set; } - - /// - /// 分数 - /// - public int? ScoreMin { get; set; } - - /// - /// 分数1 - /// - public int? ScoreMax { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 规则类型 + /// + [Display(Name = "RuleType"), Description("规则类型"), MaxLength(32, ErrorMessage = "规则类型 不能超过 32 个字符")] + public string RuleType { get; set; } + + /// + /// 规则编号 + /// + [Display(Name = "RuleNo"), Description("规则编号"), MaxLength(32, ErrorMessage = "规则编号 不能超过 32 个字符")] + public string RuleNo { get; set; } + + /// + /// 证书名称 + /// + [Display(Name = "CertificateName"), Description("证书名称"), MaxLength(32, ErrorMessage = "证书名称 不能超过 32 个字符")] + public string CertificateName { get; set; } + + /// + /// 课程场景ID + /// + public long? CourseSceneId { get; set; } + + /// + /// 课程ID + /// + public long? CourseId { get; set; } + + /// + /// 有效期类型 + /// + [Display(Name = "ValidityType"), Description("有效期类型"), MaxLength(32, ErrorMessage = "有效期类型 不能超过 32 个字符")] + public string ValidityType { get; set; } + + /// + /// 固定数 + /// + public int? StaticNum { get; set; } + + /// + /// 固定类型 + /// + [Display(Name = "StaticType"), Description("固定类型"), MaxLength(32, ErrorMessage = "固定类型 不能超过 32 个字符")] + public string StaticType { get; set; } + + /// + /// 有效期 + /// + public DateTime? ValidityTime { get; set; } + + /// + /// 发放规则 + /// + [Display(Name = "SendRule"), Description("发放规则"), MaxLength(32, ErrorMessage = "发放规则 不能超过 32 个字符")] + public string SendRule { get; set; } + + /// + /// 分数 + /// + public int? ScoreMin { get; set; } + + /// + /// 分数1 + /// + public int? ScoreMax { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_Config.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_Config.Dto.Base.cs index bc155a2c..591c2046 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_Config.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_Config.Dto.Base.cs @@ -13,138 +13,134 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 参数配置 (Dto.Base) +/// +public class Ghre_ConfigBase { /// - /// 参数配置 (Dto.Base) - /// - public class Ghre_ConfigBase - { - - /// - /// 参数名称 - /// - [Display(Name = "ConfigName"), Description("参数名称"), MaxLength(32, ErrorMessage = "参数名称 不能超过 32 个字符")] - public string ConfigName { get; set; } - - /// - /// 参数代码 - /// - [Display(Name = "ConfigCode"), Description("参数代码"), MaxLength(32, ErrorMessage = "参数代码 不能超过 32 个字符")] - public string ConfigCode { get; set; } - - /// - /// 参数值 - /// - [Display(Name = "ConfigValue"), Description("参数值"), MaxLength(32, ErrorMessage = "参数值 不能超过 32 个字符")] - public string ConfigValue { get; set; } - - /// - /// 参数类型 - /// - [Display(Name = "InputType"), Description("参数类型"), MaxLength(32, ErrorMessage = "参数类型 不能超过 32 个字符")] - public string InputType { get; set; } - - /// - /// 配置内容 - /// - [Display(Name = "AvailableValue"), Description("配置内容"), MaxLength(128, ErrorMessage = "配置内容 不能超过 128 个字符")] - public string AvailableValue { get; set; } - - /// - /// 排序 - /// - public int? Sequence { get; set; } - - /// - /// 是否多选 - /// - public bool? IsMultiple { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 参数名称 + /// + [Display(Name = "ConfigName"), Description("参数名称"), MaxLength(32, ErrorMessage = "参数名称 不能超过 32 个字符")] + public string ConfigName { get; set; } + + /// + /// 参数代码 + /// + [Display(Name = "ConfigCode"), Description("参数代码"), MaxLength(32, ErrorMessage = "参数代码 不能超过 32 个字符")] + public string ConfigCode { get; set; } + + /// + /// 参数值 + /// + [Display(Name = "ConfigValue"), Description("参数值"), MaxLength(32, ErrorMessage = "参数值 不能超过 32 个字符")] + public string ConfigValue { get; set; } + + /// + /// 参数类型 + /// + [Display(Name = "InputType"), Description("参数类型"), MaxLength(32, ErrorMessage = "参数类型 不能超过 32 个字符")] + public string InputType { get; set; } + + /// + /// 配置内容 + /// + [Display(Name = "AvailableValue"), Description("配置内容"), MaxLength(128, ErrorMessage = "配置内容 不能超过 128 个字符")] + public string AvailableValue { get; set; } + + /// + /// 排序 + /// + public int? Sequence { get; set; } + + /// + /// 是否多选 + /// + public bool? IsMultiple { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_CourseClass.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_CourseClass.Dto.Base.cs index 3fcd7d12..eb7d0540 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_CourseClass.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_CourseClass.Dto.Base.cs @@ -13,115 +13,111 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 课程分类 (Dto.Base) +/// +public class Ghre_CourseClassBase { /// - /// 课程分类 (Dto.Base) - /// - public class Ghre_CourseClassBase - { - - /// - /// 分类编号 - /// - [Display(Name = "ClassNo"), Description("分类编号"), MaxLength(32, ErrorMessage = "分类编号 不能超过 32 个字符"), EntityColumn(Unique = true)] - public string ClassNo { get; set; } - - /// - /// 分类名称 - /// - [Display(Name = "ClassName"), Description("分类名称"), MaxLength(32, ErrorMessage = "分类名称 不能超过 32 个字符"), EntityColumn(Unique = true)] - public string ClassName { 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; } - } + /// 分类编号 + /// + [Display(Name = "ClassNo"), Description("分类编号"), MaxLength(32, ErrorMessage = "分类编号 不能超过 32 个字符"), EntityColumn(Unique = true)] + public string ClassNo { get; set; } + + /// + /// 分类名称 + /// + [Display(Name = "ClassName"), Description("分类名称"), MaxLength(32, ErrorMessage = "分类名称 不能超过 32 个字符"), EntityColumn(Unique = true)] + public string ClassName { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_CourseSnap.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_CourseSnap.Dto.Base.cs index 3895c3a7..fd133de4 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_CourseSnap.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_CourseSnap.Dto.Base.cs @@ -13,270 +13,265 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghre_CourseSnap (Dto.Base) +/// +public class Ghre_CourseSnapBase { /// - /// Ghre_CourseSnap (Dto.Base) - /// - public class Ghre_CourseSnapBase - { - - /// - /// 课程ID - /// - public long? CourseId { get; set; } - - /// - /// 课程编号 - /// - [Display(Name = "CourseNo"), Description("课程编号"), MaxLength(32, ErrorMessage = "课程编号 不能超过 32 个字符")] - public string CourseNo { get; set; } - - /// - /// 课程名称 - /// - [Display(Name = "CourseName"), Description("课程名称"), MaxLength(32, ErrorMessage = "课程名称 不能超过 32 个字符")] - public string CourseName { get; set; } - - /// - /// 课程分类ID - /// - [Display(Name = "CourseClassId"), Description("课程分类ID"), MaxLength(2000, ErrorMessage = "课程分类ID 不能超过 2000 个字符")] - public string CourseClassId { get; set; } - - /// - /// 课程分类 - /// - [Display(Name = "CourseClass"), Description("课程分类"), MaxLength(2000, ErrorMessage = "课程分类 不能超过 2000 个字符")] - public string CourseClass { get; set; } - - /// - /// 课程场景ID - /// - public long? CourseSceneId { get; set; } - - /// - /// 课程场景 - /// - [Display(Name = "CourseScene"), Description("课程场景"), MaxLength(64, ErrorMessage = "课程场景 不能超过 64 个字符")] - public string CourseScene { get; set; } - - /// - /// 课件ID - /// - [Display(Name = "CourseWareId"), Description("课件ID"), MaxLength(2000, ErrorMessage = "课件ID 不能超过 2000 个字符")] - public string CourseWareId { get; set; } - - /// - /// 标准课时 - /// - public int? StandardHour { get; set; } - - /// - /// 学分 - /// - public int? CreditPoints { get; set; } - - /// - /// 课程负责人 - /// - public int? ManagerId { get; set; } - - /// - /// 课程负责人部门ID - /// - public int? ManagerDeptId { get; set; } - - /// - /// 内/外训 - /// - [Display(Name = "InOrOut"), Description("内/外训"), MaxLength(32, ErrorMessage = "内/外训 不能超过 32 个字符")] - public string InOrOut { get; set; } - - /// - /// 讲师ID - /// - public int? TeacherId { get; set; } - - /// - /// 讲师部门ID - /// - public int? TeacherDeptId { get; set; } - - /// - /// 培训机构ID - /// - public long? SchoolId { get; set; } - - /// - /// 培训机构讲师ID - /// - public long? SchoolTeacherId { get; set; } - - /// - /// 市场价格 - /// - [Display(Name = "Price"), Description("市场价格"), Column(TypeName = "decimal(20,2)")] - public decimal? Price { get; set; } - - /// - /// 收费方式,天数、时间、项目 - /// - [Display(Name = "ChargeMethod"), Description("收费方式,天数、时间、项目"), MaxLength(32, ErrorMessage = "收费方式,天数、时间、项目 不能超过 32 个字符")] - public string ChargeMethod { get; set; } - - /// - /// 是否公开课 - /// - public bool? IsOPen { get; set; } - - /// - /// 培训有效期(月) - /// - public int? ValidityPeriod { get; set; } - - /// - /// 试卷ID - /// - [Display(Name = "ExamPaperId"), Description("试卷ID"), MaxLength(2000, ErrorMessage = "试卷ID 不能超过 2000 个字符")] - public string ExamPaperId { get; set; } - - /// - /// 反馈单ID - /// - public long? FeedbackOrderId { get; set; } - - /// - /// 封面图 - /// - [Display(Name = "CoverUrl"), Description("封面图"), MaxLength(2000, ErrorMessage = "封面图 不能超过 2000 个字符")] - public string CoverUrl { get; set; } - - /// - /// 是否使用默认封面 - /// - public bool? UseDefaultCoverImage { get; set; } - - /// - /// 默认封面图Name - /// - [Display(Name = "DefaultCoverImageName"), Description("默认封面图Name"), MaxLength(32, ErrorMessage = "默认封面图Name 不能超过 32 个字符")] - public string DefaultCoverImageName { get; set; } - - /// - /// 课程大纲 - /// - [Display(Name = "Outline"), Description("课程大纲"), MaxLength(2000, ErrorMessage = "课程大纲 不能超过 2000 个字符")] - public string Outline { get; set; } - - /// - /// 课前准备 - /// - [Display(Name = "BeforeReady"), Description("课前准备"), MaxLength(2000, ErrorMessage = "课前准备 不能超过 2000 个字符")] - public string BeforeReady { get; set; } - - /// - /// 状态 - /// - [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] - public string Status { 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; } - - /// - /// CourseClass1 - /// - [Display(Name = "CourseClass1"), Description("CourseClass1"), MaxLength(2000, ErrorMessage = "CourseClass1 不能超过 2000 个字符")] - public string CourseClass1 { get; set; } - } + /// 课程ID + /// + public long? CourseId { get; set; } + + /// + /// 课程编号 + /// + [Display(Name = "CourseNo"), Description("课程编号"), MaxLength(32, ErrorMessage = "课程编号 不能超过 32 个字符")] + public string CourseNo { get; set; } + + /// + /// 课程名称 + /// + [Display(Name = "CourseName"), Description("课程名称"), MaxLength(32, ErrorMessage = "课程名称 不能超过 32 个字符")] + public string CourseName { get; set; } + + /// + /// 课程分类ID + /// + [Display(Name = "CourseClassId"), Description("课程分类ID"), MaxLength(2000, ErrorMessage = "课程分类ID 不能超过 2000 个字符")] + public string CourseClassId { get; set; } + + /// + /// 课程分类 + /// + [Display(Name = "CourseClass"), Description("课程分类"), MaxLength(2000, ErrorMessage = "课程分类 不能超过 2000 个字符")] + public string CourseClass { get; set; } + + /// + /// 课程场景ID + /// + public long? CourseSceneId { get; set; } + + /// + /// 课程场景 + /// + [Display(Name = "CourseScene"), Description("课程场景"), MaxLength(64, ErrorMessage = "课程场景 不能超过 64 个字符")] + public string CourseScene { get; set; } + + /// + /// 课件ID + /// + [Display(Name = "CourseWareId"), Description("课件ID"), MaxLength(2000, ErrorMessage = "课件ID 不能超过 2000 个字符")] + public string CourseWareId { get; set; } + + /// + /// 标准课时 + /// + public int? StandardHour { get; set; } + + /// + /// 学分 + /// + public int? CreditPoints { get; set; } + + /// + /// 课程负责人 + /// + public int? ManagerId { get; set; } + + /// + /// 课程负责人部门ID + /// + public int? ManagerDeptId { get; set; } + + /// + /// 内/外训 + /// + [Display(Name = "InOrOut"), Description("内/外训"), MaxLength(32, ErrorMessage = "内/外训 不能超过 32 个字符")] + public string InOrOut { get; set; } + + /// + /// 讲师ID + /// + public int? TeacherId { get; set; } + + /// + /// 讲师部门ID + /// + public int? TeacherDeptId { get; set; } + + /// + /// 培训机构ID + /// + public long? SchoolId { get; set; } + + /// + /// 培训机构讲师ID + /// + public long? SchoolTeacherId { get; set; } + + /// + /// 市场价格 + /// + [Display(Name = "Price"), Description("市场价格"), Column(TypeName = "decimal(20,2)")] + public decimal? Price { get; set; } + + /// + /// 收费方式,天数、时间、项目 + /// + [Display(Name = "ChargeMethod"), Description("收费方式,天数、时间、项目"), MaxLength(32, ErrorMessage = "收费方式,天数、时间、项目 不能超过 32 个字符")] + public string ChargeMethod { get; set; } + + /// + /// 是否公开课 + /// + public bool? IsOPen { get; set; } + + /// + /// 培训有效期(月) + /// + public int? ValidityPeriod { get; set; } + + /// + /// 试卷ID + /// + [Display(Name = "ExamPaperId"), Description("试卷ID"), MaxLength(2000, ErrorMessage = "试卷ID 不能超过 2000 个字符")] + public string ExamPaperId { get; set; } + + /// + /// 反馈单ID + /// + public long? FeedbackOrderId { get; set; } + + /// + /// 封面图 + /// + [Display(Name = "CoverUrl"), Description("封面图"), MaxLength(2000, ErrorMessage = "封面图 不能超过 2000 个字符")] + public string CoverUrl { get; set; } + + /// + /// 是否使用默认封面 + /// + public bool? UseDefaultCoverImage { get; set; } + + /// + /// 默认封面图Name + /// + [Display(Name = "DefaultCoverImageName"), Description("默认封面图Name"), MaxLength(32, ErrorMessage = "默认封面图Name 不能超过 32 个字符")] + public string DefaultCoverImageName { get; set; } + + /// + /// 课程大纲 + /// + [Display(Name = "Outline"), Description("课程大纲"), MaxLength(2000, ErrorMessage = "课程大纲 不能超过 2000 个字符")] + public string Outline { get; set; } + + /// + /// 课前准备 + /// + [Display(Name = "BeforeReady"), Description("课前准备"), MaxLength(2000, ErrorMessage = "课前准备 不能超过 2000 个字符")] + public string BeforeReady { get; set; } + + /// + /// 状态 + /// + [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] + public string Status { 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; } + + /// + /// CourseClass1 + /// + [Display(Name = "CourseClass1"), Description("CourseClass1"), MaxLength(2000, ErrorMessage = "CourseClass1 不能超过 2000 个字符")] + public string CourseClass1 { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_CourseWare.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_CourseWare.Dto.Base.cs index 2b7263a0..9f9297bb 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_CourseWare.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_CourseWare.Dto.Base.cs @@ -13,155 +13,151 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 课件 (Dto.Base) +/// +public class Ghre_CourseWareBase { /// - /// 课件 (Dto.Base) - /// - public class Ghre_CourseWareBase - { - - /// - /// 课件编号 - /// - [Display(Name = "CourseWareNo"), Description("课件编号"), MaxLength(32, ErrorMessage = "课件编号 不能超过 32 个字符")] - public string CourseWareNo { get; set; } - - /// - /// 课件名称 - /// - [Display(Name = "CourseWareName"), Description("课件名称"), MaxLength(32, ErrorMessage = "课件名称 不能超过 32 个字符")] - public string CourseWareName { get; set; } - - /// - /// 版本号 - /// - [Display(Name = "VersionNo"), Description("版本号"), MaxLength(32, ErrorMessage = "版本号 不能超过 32 个字符")] - public string VersionNo { get; set; } - - /// - /// 课程ID - /// - [Display(Name = "CourseIds"), Description("课程分类ID"), MaxLength(2000, ErrorMessage = "课程分类ID 不能超过 2000 个字符")] - public string CourseIds { get; set; } - - /// - /// 课程 - /// - [Display(Name = "CourseNames"), Description("课程分类"), MaxLength(2000, ErrorMessage = "课程分类 不能超过 2000 个字符")] - public string CourseNames { get; set; } - - /// - /// 分钟 - /// - public int? Minutes { get; set; } - - /// - /// 时 - /// - public int? Hours { get; set; } - - /// - /// 来源 - /// - [Display(Name = "Source"), Description("来源"), MaxLength(32, ErrorMessage = "来源 不能超过 32 个字符")] - public string Source { get; set; } - - /// - /// 链接 - /// - [Display(Name = "Link"), Description("链接"), MaxLength(256, ErrorMessage = "链接 不能超过 256 个字符")] - public string Link { 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; } - } + /// 课件编号 + /// + [Display(Name = "CourseWareNo"), Description("课件编号"), MaxLength(32, ErrorMessage = "课件编号 不能超过 32 个字符")] + public string CourseWareNo { get; set; } + + /// + /// 课件名称 + /// + [Display(Name = "CourseWareName"), Description("课件名称"), MaxLength(32, ErrorMessage = "课件名称 不能超过 32 个字符")] + public string CourseWareName { get; set; } + + /// + /// 版本号 + /// + [Display(Name = "VersionNo"), Description("版本号"), MaxLength(32, ErrorMessage = "版本号 不能超过 32 个字符")] + public string VersionNo { get; set; } + + /// + /// 课程ID + /// + [Display(Name = "CourseIds"), Description("课程分类ID"), MaxLength(2000, ErrorMessage = "课程分类ID 不能超过 2000 个字符")] + public string CourseIds { get; set; } + + /// + /// 课程 + /// + [Display(Name = "CourseNames"), Description("课程分类"), MaxLength(2000, ErrorMessage = "课程分类 不能超过 2000 个字符")] + public string CourseNames { get; set; } + + /// + /// 分钟 + /// + public int? Minutes { get; set; } + + /// + /// 时 + /// + public int? Hours { get; set; } + + /// + /// 来源 + /// + [Display(Name = "Source"), Description("来源"), MaxLength(32, ErrorMessage = "来源 不能超过 32 个字符")] + public string Source { get; set; } + + /// + /// 链接 + /// + [Display(Name = "Link"), Description("链接"), MaxLength(256, ErrorMessage = "链接 不能超过 256 个字符")] + public string Link { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_CourseWareAttachment.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_CourseWareAttachment.Dto.Base.cs index ea819fc1..7abe8caa 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_CourseWareAttachment.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_CourseWareAttachment.Dto.Base.cs @@ -14,132 +14,131 @@ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models +namespace Tiobon.Core.Model.Models; + + +/// +/// 课件附件 (Dto.Base) +/// +public class Ghre_CourseWareAttachmentBase { /// - /// 课件附件 (Dto.Base) - /// - public class Ghre_CourseWareAttachmentBase - { - - /// - /// 课件ID - /// - public long? CourseWareId { get; set; } - - /// - /// 附件名 - /// - [Display(Name = "AttachmentName"), Description("附件名"), MaxLength(64, ErrorMessage = "附件名 不能超过 64 个字符")] - public string AttachmentName { get; set; } - - /// - /// 扩展名 - /// - [Display(Name = "AttachFileExtension"), Description("扩展名"), MaxLength(256, ErrorMessage = "扩展名 不能超过 256 个字符")] - public string AttachFileExtension { get; set; } - - /// - /// 路径 - /// - [Display(Name = "RelativePath"), Description("路径"), MaxLength(2000, ErrorMessage = "路径 不能超过 2000 个字符")] - public string RelativePath { get; set; } - - /// - /// 大小 - /// - public int? AttachFileSize { get; set; } - - /// - /// 是否允许下载 - /// - public bool? IsAllowDownload { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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? SortNo { get; set; } - } + /// 课件ID + /// + public long? CourseWareId { get; set; } + + /// + /// 附件名 + /// + [Display(Name = "AttachmentName"), Description("附件名"), MaxLength(64, ErrorMessage = "附件名 不能超过 64 个字符")] + public string AttachmentName { get; set; } + + /// + /// 扩展名 + /// + [Display(Name = "AttachFileExtension"), Description("扩展名"), MaxLength(256, ErrorMessage = "扩展名 不能超过 256 个字符")] + public string AttachFileExtension { get; set; } + + /// + /// 路径 + /// + [Display(Name = "RelativePath"), Description("路径"), MaxLength(2000, ErrorMessage = "路径 不能超过 2000 个字符")] + public string RelativePath { get; set; } + + /// + /// 大小 + /// + public int? AttachFileSize { get; set; } + + /// + /// 是否允许下载 + /// + public bool? IsAllowDownload { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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? SortNo { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_CreditPoint.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_CreditPoint.Dto.Base.cs index df354488..5b8b09c5 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_CreditPoint.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_CreditPoint.Dto.Base.cs @@ -13,128 +13,124 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 学分记录 (Dto.Base) +/// +public class Ghre_CreditPointBase { /// - /// 学分记录 (Dto.Base) - /// - public class Ghre_CreditPointBase - { - - /// - /// 员工ID - /// - public int? StaffId { get; set; } - - /// - /// 课程ID - /// - public long? CourseId { get; set; } - - /// - /// 课程快照ID - /// - public long? CourseSnapId { get; set; } - - /// - /// 考试ID - /// - public long? ExamId { get; set; } - - /// - /// 获得日期 - /// - public DateTime? Date { get; set; } - - /// - /// 获得学分 - /// - public int? CreditPoints { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 员工ID + /// + public int? StaffId { get; set; } + + /// + /// 课程ID + /// + public long? CourseId { get; set; } + + /// + /// 课程快照ID + /// + public long? CourseSnapId { get; set; } + + /// + /// 考试ID + /// + public long? ExamId { get; set; } + + /// + /// 获得日期 + /// + public DateTime? Date { get; set; } + + /// + /// 获得学分 + /// + public int? CreditPoints { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_Exam.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_Exam.Dto.Base.cs index 67fcb72c..1be0cefc 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_Exam.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_Exam.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 Ghre_ExamBase { /// - /// 考试 (Dto.Base) - /// - public class Ghre_ExamBase - { - - /// - /// 关联类型 - /// - [Display(Name = "LinkType"), Description("关联类型"), MaxLength(32, ErrorMessage = "关联类型 不能超过 32 个字符")] - public string LinkType { get; set; } - - /// - /// 课程场景ID - /// - public long? CourseSceneId { get; set; } - - /// - /// 课程ID - /// - public long? CourseId { get; set; } - - /// - /// 试卷ID - /// - public long? ExamPaperId { get; set; } - - /// - /// 封面图片URL - /// - [Display(Name = "CoverUrl"), Description("封面图片URL"), MaxLength(256, ErrorMessage = "封面图片URL 不能超过 256 个字符")] - public string CoverUrl { get; set; } - - /// - /// 考试编号 - /// - [Display(Name = "ExamNo"), Description("考试编号"), MaxLength(32, ErrorMessage = "考试编号 不能超过 32 个字符")] - public string ExamNo { get; set; } - - /// - /// 考试名称 - /// - [Display(Name = "ExamName"), Description("考试名称"), MaxLength(32, ErrorMessage = "考试名称 不能超过 32 个字符")] - public string ExamName { get; set; } - - /// - /// 日期类型 - /// - [Display(Name = "DateType"), Description("日期类型"), MaxLength(32, ErrorMessage = "日期类型 不能超过 32 个字符")] - public string DateType { get; set; } - - /// - /// 开始时间 - /// - public DateTime? BeginTime { get; set; } - - /// - /// 结束时间 - /// - public DateTime? EndTime { get; set; } - - /// - /// 学完多久 - /// - public int? AfterHowLong { get; set; } - - /// - /// 考试形式 - /// - [Display(Name = "ExamMode"), Description("考试形式"), MaxLength(32, ErrorMessage = "考试形式 不能超过 32 个字符")] - public string ExamMode { get; set; } - - /// - /// 是否关联开班 - /// - public bool? IsLinkOpenClass { get; set; } - - /// - /// 开班ID - /// - public long? OpenClassId { get; set; } - - /// - /// 状态 - /// - [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] - public string Status { get; set; } - - /// - /// 线下考试地点 - /// - [Display(Name = "ExamPlace"), Description("线下考试地点"), MaxLength(64, ErrorMessage = "线下考试地点 不能超过 64 个字符")] - public string ExamPlace { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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 bool? UseDefaultCoverImage { get; set; } - - /// - /// 默认封面图Name - /// - [Display(Name = "DefaultCoverImageName"), Description("默认封面图Name"), MaxLength(32, ErrorMessage = "默认封面图Name 不能超过 32 个字符")] - public string DefaultCoverImageName { get; set; } - } + /// 关联类型 + /// + [Display(Name = "LinkType"), Description("关联类型"), MaxLength(32, ErrorMessage = "关联类型 不能超过 32 个字符")] + public string LinkType { get; set; } + + /// + /// 课程场景ID + /// + public long? CourseSceneId { get; set; } + + /// + /// 课程ID + /// + public long? CourseId { get; set; } + + /// + /// 试卷ID + /// + public long? ExamPaperId { get; set; } + + /// + /// 封面图片URL + /// + [Display(Name = "CoverUrl"), Description("封面图片URL"), MaxLength(256, ErrorMessage = "封面图片URL 不能超过 256 个字符")] + public string CoverUrl { get; set; } + + /// + /// 考试编号 + /// + [Display(Name = "ExamNo"), Description("考试编号"), MaxLength(32, ErrorMessage = "考试编号 不能超过 32 个字符")] + public string ExamNo { get; set; } + + /// + /// 考试名称 + /// + [Display(Name = "ExamName"), Description("考试名称"), MaxLength(32, ErrorMessage = "考试名称 不能超过 32 个字符")] + public string ExamName { get; set; } + + /// + /// 日期类型 + /// + [Display(Name = "DateType"), Description("日期类型"), MaxLength(32, ErrorMessage = "日期类型 不能超过 32 个字符")] + public string DateType { get; set; } + + /// + /// 开始时间 + /// + public DateTime? BeginTime { get; set; } + + /// + /// 结束时间 + /// + public DateTime? EndTime { get; set; } + + /// + /// 学完多久 + /// + public int? AfterHowLong { get; set; } + + /// + /// 考试形式 + /// + [Display(Name = "ExamMode"), Description("考试形式"), MaxLength(32, ErrorMessage = "考试形式 不能超过 32 个字符")] + public string ExamMode { get; set; } + + /// + /// 是否关联开班 + /// + public bool? IsLinkOpenClass { get; set; } + + /// + /// 开班ID + /// + public long? OpenClassId { get; set; } + + /// + /// 状态 + /// + [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] + public string Status { get; set; } + + /// + /// 线下考试地点 + /// + [Display(Name = "ExamPlace"), Description("线下考试地点"), MaxLength(64, ErrorMessage = "线下考试地点 不能超过 64 个字符")] + public string ExamPlace { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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 bool? UseDefaultCoverImage { get; set; } + + /// + /// 默认封面图Name + /// + [Display(Name = "DefaultCoverImageName"), Description("默认封面图Name"), MaxLength(32, ErrorMessage = "默认封面图Name 不能超过 32 个字符")] + public string DefaultCoverImageName { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_ExamMessageLog.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_ExamMessageLog.Dto.Base.cs index 4ab39da8..cce8742f 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_ExamMessageLog.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_ExamMessageLog.Dto.Base.cs @@ -13,126 +13,122 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 考试通知记录 (Dto.Base) +/// +public class Ghre_ExamMessageLogBase { /// - /// 考试通知记录 (Dto.Base) - /// - public class Ghre_ExamMessageLogBase - { - - /// - /// 试卷ID - /// - public long? ExamId { get; set; } - - /// - /// 发送类型 - /// - [Display(Name = "SendType"), Description("发送类型"), MaxLength(256, ErrorMessage = "发送类型 不能超过 256 个字符")] - public string SendType { get; set; } - - /// - /// 通知设置 - /// - [Display(Name = "MsgSet"), Description("通知设置"), MaxLength(32, ErrorMessage = "通知设置 不能超过 32 个字符")] - public string MsgSet { get; set; } - - /// - /// 通知范围 - /// - [Display(Name = "NotificationScope"), Description("通知范围"), MaxLength(32, ErrorMessage = "通知范围 不能超过 32 个字符")] - public string NotificationScope { get; set; } - - /// - /// 是否第一次打开 - /// - public bool? IsFirstEntry { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 试卷ID + /// + public long? ExamId { get; set; } + + /// + /// 发送类型 + /// + [Display(Name = "SendType"), Description("发送类型"), MaxLength(256, ErrorMessage = "发送类型 不能超过 256 个字符")] + public string SendType { get; set; } + + /// + /// 通知设置 + /// + [Display(Name = "MsgSet"), Description("通知设置"), MaxLength(32, ErrorMessage = "通知设置 不能超过 32 个字符")] + public string MsgSet { get; set; } + + /// + /// 通知范围 + /// + [Display(Name = "NotificationScope"), Description("通知范围"), MaxLength(32, ErrorMessage = "通知范围 不能超过 32 个字符")] + public string NotificationScope { get; set; } + + /// + /// 是否第一次打开 + /// + public bool? IsFirstEntry { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_ExamPaper.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_ExamPaper.Dto.Base.cs index f52e67e6..660dded3 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_ExamPaper.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_ExamPaper.Dto.Base.cs @@ -14,183 +14,178 @@ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ */ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 试卷 (Dto.Base) +/// +public class Ghre_ExamPaperBase { /// - /// 试卷 (Dto.Base) - /// - public class Ghre_ExamPaperBase - { - - /// - /// 试卷编号 - /// - [Display(Name = "PaperNo"), Description("试卷编号"), MaxLength(32, ErrorMessage = "试卷编号 不能超过 32 个字符")] - public string PaperNo { get; set; } - - /// - /// 试卷名称 - /// - [Display(Name = "PaperName"), Description("试卷名称"), MaxLength(32, ErrorMessage = "试卷名称 不能超过 32 个字符")] - public string PaperName { get; set; } - - /// - /// 答题时长 - /// - public int? AnswerTime { get; set; } - - /// - /// 评分方式 - /// - [Display(Name = "ScoreMethod"), Description("评分方式"), MaxLength(32, ErrorMessage = "评分方式 不能超过 32 个字符")] - public string ScoreMethod { get; set; } - - /// - /// 卷面总分 - /// - [Display(Name = "TotalScore"), Description("卷面总分"), Column(TypeName = "decimal(20,2)")] - public decimal? TotalScore { get; set; } - - /// - /// 及格分 - /// - [Display(Name = "PassScore"), Description("及格分"), Column(TypeName = "decimal(20,2)")] - public decimal? PassScore { get; set; } - - /// - /// 重考次数 - /// - public int? RetakeTimes { get; set; } - - /// - /// 关联类型 - /// - [Display(Name = "LinkType"), Description("关联类型"), MaxLength(32, ErrorMessage = "关联类型 不能超过 32 个字符")] - public string LinkType { get; set; } - - /// - /// 关联ID - /// - public long? LinkId { get; set; } - /// - /// 关联次数 - /// - public int? LinkTimes { get; set; } - - /// - /// 封面图片URL - /// - [Display(Name = "CoverUrl"), Description("封面图片URL"), MaxLength(64, ErrorMessage = "封面图片URL 不能超过 64 个字符")] - public string CoverUrl { get; set; } - - /// - /// 封面图片背景 - /// - [Display(Name = "CoverBackGround"), Description("封面图片背景"), MaxLength(64, ErrorMessage = "封面图片背景 不能超过 64 个字符")] - public string CoverBackGround { get; set; } - - /// - /// 试卷风格 - /// - [Display(Name = "Style"), Description("试卷风格"), MaxLength(32, ErrorMessage = "试卷风格 不能超过 32 个字符")] - public string Style { get; set; } - - /// - /// 出题方式 - /// - [Display(Name = "SetMethod"), Description("关联类型"), MaxLength(32, ErrorMessage = "关联类型 不能超过 32 个字符")] - public string SetMethod { get; set; } - - /// - /// 状态 - /// - [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] - public string Status { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 试卷编号 + /// + [Display(Name = "PaperNo"), Description("试卷编号"), MaxLength(32, ErrorMessage = "试卷编号 不能超过 32 个字符")] + public string PaperNo { get; set; } + + /// + /// 试卷名称 + /// + [Display(Name = "PaperName"), Description("试卷名称"), MaxLength(32, ErrorMessage = "试卷名称 不能超过 32 个字符")] + public string PaperName { get; set; } + + /// + /// 答题时长 + /// + public int? AnswerTime { get; set; } + + /// + /// 评分方式 + /// + [Display(Name = "ScoreMethod"), Description("评分方式"), MaxLength(32, ErrorMessage = "评分方式 不能超过 32 个字符")] + public string ScoreMethod { get; set; } + + /// + /// 卷面总分 + /// + [Display(Name = "TotalScore"), Description("卷面总分"), Column(TypeName = "decimal(20,2)")] + public decimal? TotalScore { get; set; } + + /// + /// 及格分 + /// + [Display(Name = "PassScore"), Description("及格分"), Column(TypeName = "decimal(20,2)")] + public decimal? PassScore { get; set; } + + /// + /// 重考次数 + /// + public int? RetakeTimes { get; set; } + + /// + /// 关联类型 + /// + [Display(Name = "LinkType"), Description("关联类型"), MaxLength(32, ErrorMessage = "关联类型 不能超过 32 个字符")] + public string LinkType { get; set; } + + /// + /// 关联ID + /// + public long? LinkId { get; set; } + /// + /// 关联次数 + /// + public int? LinkTimes { get; set; } + + /// + /// 封面图片URL + /// + [Display(Name = "CoverUrl"), Description("封面图片URL"), MaxLength(64, ErrorMessage = "封面图片URL 不能超过 64 个字符")] + public string CoverUrl { get; set; } + + /// + /// 封面图片背景 + /// + [Display(Name = "CoverBackGround"), Description("封面图片背景"), MaxLength(64, ErrorMessage = "封面图片背景 不能超过 64 个字符")] + public string CoverBackGround { get; set; } + + /// + /// 试卷风格 + /// + [Display(Name = "Style"), Description("试卷风格"), MaxLength(32, ErrorMessage = "试卷风格 不能超过 32 个字符")] + public string Style { get; set; } + + /// + /// 出题方式 + /// + [Display(Name = "SetMethod"), Description("关联类型"), MaxLength(32, ErrorMessage = "关联类型 不能超过 32 个字符")] + public string SetMethod { get; set; } + + /// + /// 状态 + /// + [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] + public string Status { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_ExamPaperConfig.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_ExamPaperConfig.Dto.Base.cs index 9ac55c02..2f28d5a6 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_ExamPaperConfig.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_ExamPaperConfig.Dto.Base.cs @@ -13,145 +13,140 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 试卷配置 (Dto.Base) +/// +public class Ghre_ExamPaperConfigBase { /// - /// 试卷配置 (Dto.Base) - /// - public class Ghre_ExamPaperConfigBase - { - - /// - /// 试卷ID - /// - [Display(Name = "ExamPaperId"), Description("试卷ID")] - public long? ExamPaperId { get; set; } - - /// - /// 课程ID - /// - [Display(Name = "CourseId"), Description("课程ID")] - public long? CourseId { get; set; } - - /// - /// 排序号 - /// - public int? TaxisNo { get; set; } - - /// - /// 难易程度 - /// - [Display(Name = "DifficultyLevel"), Description("难易程度"), MaxLength(32, ErrorMessage = "难易程度 不能超过 32 个字符")] - public string DifficultyLevel { get; set; } - - /// - /// 题目类型 - /// - [Display(Name = "QuestionType"), Description("题目类型"), MaxLength(32, ErrorMessage = "题目类型 不能超过 32 个字符")] - public string QuestionType { get; set; } - - /// - /// 题目内容ID - /// - [Display(Name = "QuestionId"), Description("题目内容ID")] - public long? QuestionId { get; set; } - - /// - /// 数量 - /// - public int? Quantity { get; set; } - - /// - /// 分值 - /// - [Display(Name = "Score"), Description("分值"), Column(TypeName = "decimal(20,2)")] - public decimal? Score { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// 默认标志 - /// - public int? IsDefault { get; set; } - - /// - /// 预留字段1 - /// - [Display(Name = "Reverse1"), Description("预留字段1")] - 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; } - } + /// 试卷ID + /// + [Display(Name = "ExamPaperId"), Description("试卷ID")] + public long? ExamPaperId { get; set; } + + /// + /// 课程ID + /// + [Display(Name = "CourseId"), Description("课程ID")] + public long? CourseId { get; set; } + + /// + /// 排序号 + /// + public int? TaxisNo { get; set; } + + /// + /// 难易程度 + /// + [Display(Name = "DifficultyLevel"), Description("难易程度"), MaxLength(32, ErrorMessage = "难易程度 不能超过 32 个字符")] + public string DifficultyLevel { get; set; } + + /// + /// 题目类型 + /// + [Display(Name = "QuestionType"), Description("题目类型"), MaxLength(32, ErrorMessage = "题目类型 不能超过 32 个字符")] + public string QuestionType { get; set; } + + /// + /// 题目内容ID + /// + [Display(Name = "QuestionId"), Description("题目内容ID")] + public long? QuestionId { get; set; } + + /// + /// 数量 + /// + public int? Quantity { get; set; } + + /// + /// 分值 + /// + [Display(Name = "Score"), Description("分值"), Column(TypeName = "decimal(20,2)")] + public decimal? Score { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// 默认标志 + /// + public int? IsDefault { get; set; } + + /// + /// 预留字段1 + /// + [Display(Name = "Reverse1"), Description("预留字段1")] + 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_ExamPaperQuestion.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_ExamPaperQuestion.Dto.Base.cs index a0a0b8cb..0816aa07 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_ExamPaperQuestion.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_ExamPaperQuestion.Dto.Base.cs @@ -13,126 +13,121 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 试卷题目 (Dto.Base) +/// +public class Ghre_ExamPaperQuestionBase { /// - /// 试卷题目 (Dto.Base) - /// - public class Ghre_ExamPaperQuestionBase - { - - /// - /// 试卷ID - /// - public long? ExamPaperId { get; set; } - - /// - /// 题目ID - /// - [Display(Name = "QuestionId"), Description("题目ID"), MaxLength(10, ErrorMessage = "题目ID 不能超过 10 个字符")] - public long? QuestionId { get; set; } - - /// - /// 试卷配置ID - /// - public long? ConfigId { get; set; } - - /// - /// 排序号 - /// - public int? TaxisNo { get; set; } - - /// - /// 分值 - /// - [Display(Name = "Score"), Description("分值"), Column(TypeName = "decimal(20,2)")] - public decimal? Score { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 试卷ID + /// + public long? ExamPaperId { get; set; } + + /// + /// 题目ID + /// + [Display(Name = "QuestionId"), Description("题目ID"), MaxLength(10, ErrorMessage = "题目ID 不能超过 10 个字符")] + public long? QuestionId { get; set; } + + /// + /// 试卷配置ID + /// + public long? ConfigId { get; set; } + + /// + /// 排序号 + /// + public int? TaxisNo { get; set; } + + /// + /// 分值 + /// + [Display(Name = "Score"), Description("分值"), Column(TypeName = "decimal(20,2)")] + public decimal? Score { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_ExamRecordAnswer.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_ExamRecordAnswer.Dto.Base.cs index 8097f9c9..3ff8c3fc 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_ExamRecordAnswer.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_ExamRecordAnswer.Dto.Base.cs @@ -13,124 +13,120 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghre_ExamRecordAnswer (Dto.Base) +/// +public class Ghre_ExamRecordAnswerBase { /// - /// Ghre_ExamRecordAnswer (Dto.Base) - /// - public class Ghre_ExamRecordAnswerBase - { - - /// - /// 答题记录ID - /// - public long? ExamRecordId { get; set; } - - /// - /// 答题记录明细ID - /// - public long? ExamRecordDetailId { get; set; } - - /// - /// 题目答案ID - /// - public long? QuestionAnswerId { get; set; } - - /// - /// 答案内容 - /// - [Display(Name = "AnswerContent"), Description("答案内容"), MaxLength(2000, ErrorMessage = "答案内容 不能超过 2000 个字符")] - public string AnswerContent { get; set; } - - /// - /// 排序号 - /// - public int? TaxisNo { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 答题记录ID + /// + public long? ExamRecordId { get; set; } + + /// + /// 答题记录明细ID + /// + public long? ExamRecordDetailId { get; set; } + + /// + /// 题目答案ID + /// + public long? QuestionAnswerId { get; set; } + + /// + /// 答案内容 + /// + [Display(Name = "AnswerContent"), Description("答案内容"), MaxLength(2000, ErrorMessage = "答案内容 不能超过 2000 个字符")] + public string AnswerContent { get; set; } + + /// + /// 排序号 + /// + public int? TaxisNo { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_ExamRecordDetail.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_ExamRecordDetail.Dto.Base.cs index d41fbd9a..305d8059 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_ExamRecordDetail.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_ExamRecordDetail.Dto.Base.cs @@ -13,146 +13,141 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghre_ExamRecordDetail (Dto.Base) +/// +public class Ghre_ExamRecordDetailBase { /// - /// Ghre_ExamRecordDetail (Dto.Base) - /// - public class Ghre_ExamRecordDetailBase - { - - /// - /// 答题记录ID - /// - public long? ExamRecordId { get; set; } - - /// - /// 试卷ID - /// - public long? ExamPaperId { get; set; } - - /// - /// 试卷题目ID - /// - public long? ExamPaperQuestionId { get; set; } - - /// - /// 题目ID - /// - public long? QuestionId { get; set; } - - /// - /// 员工ID - /// - public long? StaffId { get; set; } - - /// - /// 得分 - /// - [Display(Name = "Score"), Description("得分"), Column(TypeName = "decimal(20,2)")] - public decimal? Score { get; set; } - - /// - /// 调整得分 - /// - [Display(Name = "AdjustScore"), Description("调整得分"), Column(TypeName = "decimal(20,2)")] - public decimal? AdjustScore { get; set; } - - /// - /// 是否正确 - /// - public bool? IsCorrect { get; set; } - - /// - /// 排序号 - /// - public int? TaxisNo { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 答题记录ID + /// + public long? ExamRecordId { get; set; } + + /// + /// 试卷ID + /// + public long? ExamPaperId { get; set; } + + /// + /// 试卷题目ID + /// + public long? ExamPaperQuestionId { get; set; } + + /// + /// 题目ID + /// + public long? QuestionId { get; set; } + + /// + /// 员工ID + /// + public long? StaffId { get; set; } + + /// + /// 得分 + /// + [Display(Name = "Score"), Description("得分"), Column(TypeName = "decimal(20,2)")] + public decimal? Score { get; set; } + + /// + /// 调整得分 + /// + [Display(Name = "AdjustScore"), Description("调整得分"), Column(TypeName = "decimal(20,2)")] + public decimal? AdjustScore { get; set; } + + /// + /// 是否正确 + /// + public bool? IsCorrect { get; set; } + + /// + /// 排序号 + /// + public int? TaxisNo { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_ExamStaff.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_ExamStaff.Dto.Base.cs index ff93e868..cdf4fc2a 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_ExamStaff.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_ExamStaff.Dto.Base.cs @@ -13,119 +13,115 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghre_ExamStaff (Dto.Base) +/// +public class Ghre_ExamStaffBase { /// - /// Ghre_ExamStaff (Dto.Base) - /// - public class Ghre_ExamStaffBase - { - - /// - /// 试卷ID - /// - public long? ExamId { get; set; } - - /// - /// 员工ID - /// - public int? StaffId { get; set; } - - /// - /// 员工ID - /// - public long? StudyRuleId { get; set; } - - /// - /// 来源 - /// - [Display(Name = "Source"), Description("来源"), MaxLength(32, ErrorMessage = "来源 不能超过 32 个字符")] - public string Source { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 试卷ID + /// + public long? ExamId { get; set; } + + /// + /// 员工ID + /// + public int? StaffId { get; set; } + + /// + /// 员工ID + /// + public long? StudyRuleId { get; set; } + + /// + /// 来源 + /// + [Display(Name = "Source"), Description("来源"), MaxLength(32, ErrorMessage = "来源 不能超过 32 个字符")] + public string Source { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_Question.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_Question.Dto.Base.cs index a54f2e82..fc48212e 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_Question.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_Question.Dto.Base.cs @@ -13,134 +13,130 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 题目 (Dto.Base) +/// +public class Ghre_QuestionBase { /// - /// 题目 (Dto.Base) - /// - public class Ghre_QuestionBase - { - - /// - /// 课程Id - /// - [Display(Name = "CourseIds"), Description("课程Id")] - public long? CourseId { get; set; } - - /// - /// 题目编号 - /// - [Display(Name = "QuestionNo"), Description("题目编号"), MaxLength(32, ErrorMessage = "题目编号 不能超过 32 个字符")] - public string QuestionNo { get; set; } - - /// - /// 难易程度 - /// - [Display(Name = "DifficultyLevel"), Description("难易程度"), MaxLength(32, ErrorMessage = "难易程度 不能超过 32 个字符")] - public string DifficultyLevel { get; set; } - - /// - /// 题目类型 - /// - [Display(Name = "QuestionType"), Description("题目类型"), MaxLength(32, ErrorMessage = "题目类型 不能超过 32 个字符")] - public string QuestionType { get; set; } - - /// - /// 题目内容 - /// - [Display(Name = "QuestionContent"), Description("题目内容"), MaxLength(2000, ErrorMessage = "题目内容 不能超过 2000 个字符")] - public string QuestionContent { get; set; } - - /// - /// 题目解析 - /// - [Display(Name = "QuestionAnalysis"), Description("题目解析"), MaxLength(2000, ErrorMessage = "题目解析 不能超过 2000 个字符")] - public string QuestionAnalysis { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 课程Id + /// + [Display(Name = "CourseIds"), Description("课程Id")] + public long? CourseId { get; set; } + + /// + /// 题目编号 + /// + [Display(Name = "QuestionNo"), Description("题目编号"), MaxLength(32, ErrorMessage = "题目编号 不能超过 32 个字符")] + public string QuestionNo { get; set; } + + /// + /// 难易程度 + /// + [Display(Name = "DifficultyLevel"), Description("难易程度"), MaxLength(32, ErrorMessage = "难易程度 不能超过 32 个字符")] + public string DifficultyLevel { get; set; } + + /// + /// 题目类型 + /// + [Display(Name = "QuestionType"), Description("题目类型"), MaxLength(32, ErrorMessage = "题目类型 不能超过 32 个字符")] + public string QuestionType { get; set; } + + /// + /// 题目内容 + /// + [Display(Name = "QuestionContent"), Description("题目内容"), MaxLength(2000, ErrorMessage = "题目内容 不能超过 2000 个字符")] + public string QuestionContent { get; set; } + + /// + /// 题目解析 + /// + [Display(Name = "QuestionAnalysis"), Description("题目解析"), MaxLength(2000, ErrorMessage = "题目解析 不能超过 2000 个字符")] + public string QuestionAnalysis { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_QuestionAnswer.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_QuestionAnswer.Dto.Base.cs index 52dca68f..9f38b718 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_QuestionAnswer.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_QuestionAnswer.Dto.Base.cs @@ -13,141 +13,137 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 题目答案 (Dto.Base) +/// +public class Ghre_QuestionAnswerBase { /// - /// 题目答案 (Dto.Base) - /// - public class Ghre_QuestionAnswerBase - { - - /// - /// 题目ID - /// - public long? QuestionId { get; set; } - - /// - /// 题目编号 - /// - [Display(Name = "QuestionNo"), Description("题目编号"), MaxLength(32, ErrorMessage = "答案内容 不能超过 32 个字符")] - public string QuestionNo { get; set; } - - /// - /// 答案内容 - /// - [Display(Name = "AnswerContent"), Description("答案内容"), MaxLength(2000, ErrorMessage = "答案内容 不能超过 64 个字符")] - public string AnswerContent { get; set; } - - /// - /// 是否为正确答案 - /// - public bool? IsCorrect { get; set; } - - /// - /// 图片地址 - /// - [Display(Name = "ImageUrl"), Description("图片地址"), MaxLength(64, ErrorMessage = "图片地址 不能超过 128 个字符")] - public string ImageUrl { get; set; } - - /// - /// 图片宽度 - /// - public string ImageWidthPc { get; set; } - - /// - /// 图片宽度 - /// - public string ImageWidthApp { get; set; } - - /// - /// 排序号 - /// - public int? TaxisNo { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 题目ID + /// + public long? QuestionId { get; set; } + + /// + /// 题目编号 + /// + [Display(Name = "QuestionNo"), Description("题目编号"), MaxLength(32, ErrorMessage = "答案内容 不能超过 32 个字符")] + public string QuestionNo { get; set; } + + /// + /// 答案内容 + /// + [Display(Name = "AnswerContent"), Description("答案内容"), MaxLength(2000, ErrorMessage = "答案内容 不能超过 64 个字符")] + public string AnswerContent { get; set; } + + /// + /// 是否为正确答案 + /// + public bool? IsCorrect { get; set; } + + /// + /// 图片地址 + /// + [Display(Name = "ImageUrl"), Description("图片地址"), MaxLength(64, ErrorMessage = "图片地址 不能超过 128 个字符")] + public string ImageUrl { get; set; } + + /// + /// 图片宽度 + /// + public string ImageWidthPc { get; set; } + + /// + /// 图片宽度 + /// + public string ImageWidthApp { get; set; } + + /// + /// 排序号 + /// + public int? TaxisNo { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_Request.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_Request.Dto.Base.cs index 5f1ca259..b4a85925 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_Request.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_Request.Dto.Base.cs @@ -13,289 +13,284 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训需求 (Dto.Base) +/// +public class Ghre_RequestBase { /// - /// 培训需求 (Dto.Base) - /// - public class Ghre_RequestBase - { - - /// - /// 课程来源 - /// - [Display(Name = "CourseSource"), Description("课程来源"), MaxLength(32, ErrorMessage = "课程来源 不能超过 32 个字符")] - public string CourseSource { get; set; } - - /// - /// 需求编号 - /// - [Display(Name = "RequestNo"), Description("需求编号"), MaxLength(32, ErrorMessage = "需求编号 不能超过 32 个字符")] - public string RequestNo { get; set; } - - /// - /// 需求课程名 - /// - [Display(Name = "CourseName"), Description("需求课程名"), MaxLength(32, ErrorMessage = "需求课程名 不能超过 32 个字符")] - public string CourseName { get; set; } - - /// - /// 课程ID - /// - public long? CourseId { get; set; } - - /// - /// 培训月份 - /// - [Display(Name = "YearMonth"), Description("培训月份"), MaxLength(32, ErrorMessage = "培训月份 不能超过 32 个字符")] - public string YearMonth { get; set; } - - /// - /// 需求来源 - /// - [Display(Name = "RequestSource"), Description("需求来源"), MaxLength(32, ErrorMessage = "需求来源 不能超过 32 个字符")] - public string RequestSource { get; set; } - - /// - /// 需求部门 - /// - public long? DeptId { get; set; } - - /// - /// 申请人 - /// - public long? ApplicantId { get; set; } - - /// - /// 需求人数 - /// - public int? RequestNum { get; set; } - - /// - /// 培训对象 - /// - [Display(Name = "TrainStaffId"), Description("培训对象"), MaxLength(2000, ErrorMessage = "培训对象 不能超过 2000 个字符")] - public string TrainStaffId { get; set; } - - /// - /// 需求类别 - /// - [Display(Name = "TrainClass"), Description("需求类别"), MaxLength(32, ErrorMessage = "需求类别 不能超过 32 个字符")] - public string TrainClass { get; set; } - - /// - /// 需求程度 - /// - [Display(Name = "TrainLevel"), Description("需求程度"), MaxLength(32, ErrorMessage = "需求程度 不能超过 32 个字符")] - public string TrainLevel { get; set; } - - /// - /// 内外训 - /// - [Display(Name = "InOrOut"), Description("内外训"), MaxLength(32, ErrorMessage = "内外训 不能超过 32 个字符")] - public string InOrOut { get; set; } - - /// - /// 讲师分类 - /// - [Display(Name = "TeacherClass"), Description("讲师分类"), MaxLength(32, ErrorMessage = "讲师分类 不能超过 32 个字符")] - public string TeacherClass { get; set; } - - /// - /// 申请理由 - /// - [Display(Name = "Reason"), Description("申请理由"), MaxLength(256, ErrorMessage = "申请理由 不能超过 256 个字符")] - public string Reason { get; set; } - - /// - /// 人均预算 - /// - [Display(Name = "PerCapitaBudget"), Description("人均预算"), Column(TypeName = "decimal(20,2)")] - public decimal? PerCapitaBudget { get; set; } - - /// - /// 合计预算 - /// - [Display(Name = "TotalBudget"), Description("合计预算"), Column(TypeName = "decimal(20,2)")] - public decimal? TotalBudget { get; set; } - - /// - /// 发起人 - /// - public long? SponsorId { get; set; } - - /// - /// 状态 - /// - [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] - public string Status { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// 默认标志 - /// - public int? IsDefault { get; set; } - - /// - /// WorkID - /// - public int? WorkID { get; set; } - - /// - /// WorkNo - /// - [Display(Name = "WorkNo"), Description("WorkNo"), MaxLength(100, ErrorMessage = "WorkNo 不能超过 100 个字符")] - public string WorkNo { get; set; } - - /// - /// ToDoType - /// - [Display(Name = "ToDoType"), Description("ToDoType"), MaxLength(100, ErrorMessage = "ToDoType 不能超过 100 个字符")] - public string ToDoType { get; set; } - - /// - /// BatchSID - /// - [Display(Name = "BatchSID"), Description("BatchSID"), MaxLength(100, ErrorMessage = "BatchSID 不能超过 100 个字符")] - public string BatchSID { get; set; } - - /// - /// WorkState - /// - public int? WorkState { get; set; } - - /// - /// ShiftID - /// - public int? ShiftID { get; set; } - - /// - /// ConfirmUserID - /// - public int? ConfirmUserID { get; set; } - - /// - /// ConfirmTime - /// - public DateTime? ConfirmTime { get; set; } - - /// - /// ConfirmComment - /// - [Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")] - public string ConfirmComment { get; set; } - - /// - /// 同意人 - /// - public long? AgreeUserId { get; set; } - - /// - /// 同意时间 - /// - public DateTime? AgreeTime { get; set; } - - /// - /// 同意理由 - /// - [Display(Name = "AgreeReason"), Description("同意理由"), MaxLength(2000, ErrorMessage = "同意理由 不能超过 2000 个字符")] - public string AgreeReason { get; set; } - - /// - /// 拒绝人 - /// - public long? RefuseUserId { get; set; } - - /// - /// 拒绝时间 - /// - public DateTime? RefuseTime { get; set; } - - /// - /// 拒绝理由 - /// - [Display(Name = "RefuseReason"), Description("拒绝理由"), MaxLength(2000, ErrorMessage = "拒绝理由 不能超过 2000 个字符")] - public string RefuseReason { 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; } - } + /// 课程来源 + /// + [Display(Name = "CourseSource"), Description("课程来源"), MaxLength(32, ErrorMessage = "课程来源 不能超过 32 个字符")] + public string CourseSource { get; set; } + + /// + /// 需求编号 + /// + [Display(Name = "RequestNo"), Description("需求编号"), MaxLength(32, ErrorMessage = "需求编号 不能超过 32 个字符")] + public string RequestNo { get; set; } + + /// + /// 需求课程名 + /// + [Display(Name = "CourseName"), Description("需求课程名"), MaxLength(32, ErrorMessage = "需求课程名 不能超过 32 个字符")] + public string CourseName { get; set; } + + /// + /// 课程ID + /// + public long? CourseId { get; set; } + + /// + /// 培训月份 + /// + [Display(Name = "YearMonth"), Description("培训月份"), MaxLength(32, ErrorMessage = "培训月份 不能超过 32 个字符")] + public string YearMonth { get; set; } + + /// + /// 需求来源 + /// + [Display(Name = "RequestSource"), Description("需求来源"), MaxLength(32, ErrorMessage = "需求来源 不能超过 32 个字符")] + public string RequestSource { get; set; } + + /// + /// 需求部门 + /// + public long? DeptId { get; set; } + + /// + /// 申请人 + /// + public long? ApplicantId { get; set; } + + /// + /// 需求人数 + /// + public int? RequestNum { get; set; } + + /// + /// 培训对象 + /// + [Display(Name = "TrainStaffId"), Description("培训对象"), MaxLength(2000, ErrorMessage = "培训对象 不能超过 2000 个字符")] + public string TrainStaffId { get; set; } + + /// + /// 需求类别 + /// + [Display(Name = "TrainClass"), Description("需求类别"), MaxLength(32, ErrorMessage = "需求类别 不能超过 32 个字符")] + public string TrainClass { get; set; } + + /// + /// 需求程度 + /// + [Display(Name = "TrainLevel"), Description("需求程度"), MaxLength(32, ErrorMessage = "需求程度 不能超过 32 个字符")] + public string TrainLevel { get; set; } + + /// + /// 内外训 + /// + [Display(Name = "InOrOut"), Description("内外训"), MaxLength(32, ErrorMessage = "内外训 不能超过 32 个字符")] + public string InOrOut { get; set; } + + /// + /// 讲师分类 + /// + [Display(Name = "TeacherClass"), Description("讲师分类"), MaxLength(32, ErrorMessage = "讲师分类 不能超过 32 个字符")] + public string TeacherClass { get; set; } + + /// + /// 申请理由 + /// + [Display(Name = "Reason"), Description("申请理由"), MaxLength(256, ErrorMessage = "申请理由 不能超过 256 个字符")] + public string Reason { get; set; } + + /// + /// 人均预算 + /// + [Display(Name = "PerCapitaBudget"), Description("人均预算"), Column(TypeName = "decimal(20,2)")] + public decimal? PerCapitaBudget { get; set; } + + /// + /// 合计预算 + /// + [Display(Name = "TotalBudget"), Description("合计预算"), Column(TypeName = "decimal(20,2)")] + public decimal? TotalBudget { get; set; } + + /// + /// 发起人 + /// + public long? SponsorId { get; set; } + + /// + /// 状态 + /// + [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] + public string Status { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// 默认标志 + /// + public int? IsDefault { get; set; } + + /// + /// WorkID + /// + public int? WorkID { get; set; } + + /// + /// WorkNo + /// + [Display(Name = "WorkNo"), Description("WorkNo"), MaxLength(100, ErrorMessage = "WorkNo 不能超过 100 个字符")] + public string WorkNo { get; set; } + + /// + /// ToDoType + /// + [Display(Name = "ToDoType"), Description("ToDoType"), MaxLength(100, ErrorMessage = "ToDoType 不能超过 100 个字符")] + public string ToDoType { get; set; } + + /// + /// BatchSID + /// + [Display(Name = "BatchSID"), Description("BatchSID"), MaxLength(100, ErrorMessage = "BatchSID 不能超过 100 个字符")] + public string BatchSID { get; set; } + + /// + /// WorkState + /// + public int? WorkState { get; set; } + + /// + /// ShiftID + /// + public int? ShiftID { get; set; } + + /// + /// ConfirmUserID + /// + public int? ConfirmUserID { get; set; } + + /// + /// ConfirmTime + /// + public DateTime? ConfirmTime { get; set; } + + /// + /// ConfirmComment + /// + [Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")] + public string ConfirmComment { get; set; } + + /// + /// 同意人 + /// + public long? AgreeUserId { get; set; } + + /// + /// 同意时间 + /// + public DateTime? AgreeTime { get; set; } + + /// + /// 同意理由 + /// + [Display(Name = "AgreeReason"), Description("同意理由"), MaxLength(2000, ErrorMessage = "同意理由 不能超过 2000 个字符")] + public string AgreeReason { get; set; } + + /// + /// 拒绝人 + /// + public long? RefuseUserId { get; set; } + + /// + /// 拒绝时间 + /// + public DateTime? RefuseTime { get; set; } + + /// + /// 拒绝理由 + /// + [Display(Name = "RefuseReason"), Description("拒绝理由"), MaxLength(2000, ErrorMessage = "拒绝理由 不能超过 2000 个字符")] + public string RefuseReason { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_RequiredCourse.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_RequiredCourse.Dto.Base.cs index 25961dc9..b66d3c0a 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_RequiredCourse.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_RequiredCourse.Dto.Base.cs @@ -14,145 +14,141 @@ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ */ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 必选修查询 (Dto.Base) +/// +public class Ghre_RequiredCourseBase { /// - /// 必选修查询 (Dto.Base) - /// - public class Ghre_RequiredCourseBase - { - - /// - /// 员工ID - /// - public int? StaffId { get; set; } - - /// - /// 课程ID - /// - public long? CourseId { get; set; } - - /// - /// 必修分类 - /// - [Display(Name = "RequiredClass"), Description("必修分类"), MaxLength(32, ErrorMessage = "必修分类 不能超过 32 个字符")] - public string RequiredClass { get; set; } - - /// - /// 课程状态 - /// - [Display(Name = "CourseStatus"), Description("课程状态"), MaxLength(32, ErrorMessage = "课程状态 不能超过 32 个字符")] - public string CourseStatus { get; set; } - - /// - /// 学习状态 - /// - [Display(Name = "StudyStatus"), Description("学习状态"), MaxLength(32, ErrorMessage = "学习状态 不能超过 32 个字符")] - public string StudyStatus { get; set; } - - /// - /// 必须到期日 - /// - public DateTime? DueDate { get; set; } - - /// - /// 考试时间 - /// - public DateTime? ExamDate { get; set; } - - /// - /// 是否合格 - /// - public bool? IsPass { get; set; } - - /// - /// 获得学分 - /// - public int? CreditPoints { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 员工ID + /// + public int? StaffId { get; set; } + + /// + /// 课程ID + /// + public long? CourseId { get; set; } + + /// + /// 必修分类 + /// + [Display(Name = "RequiredClass"), Description("必修分类"), MaxLength(32, ErrorMessage = "必修分类 不能超过 32 个字符")] + public string RequiredClass { get; set; } + + /// + /// 课程状态 + /// + [Display(Name = "CourseStatus"), Description("课程状态"), MaxLength(32, ErrorMessage = "课程状态 不能超过 32 个字符")] + public string CourseStatus { get; set; } + + /// + /// 学习状态 + /// + [Display(Name = "StudyStatus"), Description("学习状态"), MaxLength(32, ErrorMessage = "学习状态 不能超过 32 个字符")] + public string StudyStatus { get; set; } + + /// + /// 必须到期日 + /// + public DateTime? DueDate { get; set; } + + /// + /// 考试时间 + /// + public DateTime? ExamDate { get; set; } + + /// + /// 是否合格 + /// + public bool? IsPass { get; set; } + + /// + /// 获得学分 + /// + public int? CreditPoints { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_School.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_School.Dto.Base.cs index 97d073ae..105ccc68 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_School.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_School.Dto.Base.cs @@ -13,150 +13,146 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训机构 (Dto.Base) +/// +public class Ghre_SchoolBase { /// - /// 培训机构 (Dto.Base) - /// - public class Ghre_SchoolBase - { - - /// - /// 机构编号 - /// - [Display(Name = "SchoolNo"), Description("机构编号"), MaxLength(32, ErrorMessage = "机构编号 不能超过 32 个字符")] - public string SchoolNo { get; set; } - - /// - /// 机构名称 - /// - [Display(Name = "SchoolName"), Description("机构名称"), MaxLength(32, ErrorMessage = "机构名称 不能超过 32 个字符")] - public string SchoolName { get; set; } - - /// - /// 联系人 - /// - [Display(Name = "Contacter"), Description("联系人"), MaxLength(32, ErrorMessage = "联系人 不能超过 32 个字符")] - public string Contacter { get; set; } - - /// - /// 手机号码 - /// - [Display(Name = "Mobile"), Description("手机号码"), MaxLength(32, ErrorMessage = "手机号码 不能超过 32 个字符")] - public string Mobile { get; set; } - - /// - /// 邮箱 - /// - [Display(Name = "Email"), Description("邮箱"), MaxLength(64, ErrorMessage = "邮箱 不能超过 64 个字符")] - public string Email { get; set; } - - /// - /// 地址 - /// - [Display(Name = "Address"), Description("地址"), MaxLength(256, ErrorMessage = "地址 不能超过 256 个字符")] - public string Address { get; set; } - - /// - /// 生效日期 - /// - public DateTime? EffectiveDate { get; set; } - - /// - /// 失效日期 - /// - public DateTime? ExpirationDate { get; set; } - - /// - /// 开票信息 - /// - [Display(Name = "InvoiceInfo"), Description("开票信息"), MaxLength(2000, ErrorMessage = "开票信息 不能超过 2000 个字符")] - public string InvoiceInfo { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 机构编号 + /// + [Display(Name = "SchoolNo"), Description("机构编号"), MaxLength(32, ErrorMessage = "机构编号 不能超过 32 个字符")] + public string SchoolNo { get; set; } + + /// + /// 机构名称 + /// + [Display(Name = "SchoolName"), Description("机构名称"), MaxLength(32, ErrorMessage = "机构名称 不能超过 32 个字符")] + public string SchoolName { get; set; } + + /// + /// 联系人 + /// + [Display(Name = "Contacter"), Description("联系人"), MaxLength(32, ErrorMessage = "联系人 不能超过 32 个字符")] + public string Contacter { get; set; } + + /// + /// 手机号码 + /// + [Display(Name = "Mobile"), Description("手机号码"), MaxLength(32, ErrorMessage = "手机号码 不能超过 32 个字符")] + public string Mobile { get; set; } + + /// + /// 邮箱 + /// + [Display(Name = "Email"), Description("邮箱"), MaxLength(64, ErrorMessage = "邮箱 不能超过 64 个字符")] + public string Email { get; set; } + + /// + /// 地址 + /// + [Display(Name = "Address"), Description("地址"), MaxLength(256, ErrorMessage = "地址 不能超过 256 个字符")] + public string Address { get; set; } + + /// + /// 生效日期 + /// + public DateTime? EffectiveDate { get; set; } + + /// + /// 失效日期 + /// + public DateTime? ExpirationDate { get; set; } + + /// + /// 开票信息 + /// + [Display(Name = "InvoiceInfo"), Description("开票信息"), MaxLength(2000, ErrorMessage = "开票信息 不能超过 2000 个字符")] + public string InvoiceInfo { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_SchoolAttachment.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_SchoolAttachment.Dto.Base.cs index 35d1c3dd..c404971d 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_SchoolAttachment.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_SchoolAttachment.Dto.Base.cs @@ -13,125 +13,121 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训机构附件 (Dto.Base) +/// +public class Ghre_SchoolAttachmentBase { /// - /// 培训机构附件 (Dto.Base) - /// - public class Ghre_SchoolAttachmentBase - { - - /// - /// 机构ID - /// - public long? SchoolId { get; set; } - - /// - /// 编号 - /// - [Display(Name = "AttachmentNo"), Description("编号"), MaxLength(32, ErrorMessage = "编号 不能超过 32 个字符")] - public string AttachmentNo { get; set; } - - /// - /// 名称 - /// - [Display(Name = "AttachmentName"), Description("名称"), MaxLength(32, ErrorMessage = "名称 不能超过 32 个字符")] - public string AttachmentName { get; set; } - - /// - /// 生效日期 - /// - public DateTime? EffectiveDate { get; set; } - - /// - /// 失效日期 - /// - public DateTime? ExpirationDate { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 机构ID + /// + public long? SchoolId { get; set; } + + /// + /// 编号 + /// + [Display(Name = "AttachmentNo"), Description("编号"), MaxLength(32, ErrorMessage = "编号 不能超过 32 个字符")] + public string AttachmentNo { get; set; } + + /// + /// 名称 + /// + [Display(Name = "AttachmentName"), Description("名称"), MaxLength(32, ErrorMessage = "名称 不能超过 32 个字符")] + public string AttachmentName { get; set; } + + /// + /// 生效日期 + /// + public DateTime? EffectiveDate { get; set; } + + /// + /// 失效日期 + /// + public DateTime? ExpirationDate { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRecord.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRecord.Dto.Base.cs index 6547b1b3..9f33fae1 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRecord.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRecord.Dto.Base.cs @@ -13,198 +13,194 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训记录 (Dto.Base) +/// +public class Ghre_StudyRecordBase { /// - /// 培训记录 (Dto.Base) - /// - public class Ghre_StudyRecordBase - { - - /// - /// 员工ID - /// - public int? StaffId { get; set; } - - /// - /// 考试ID - /// - public long? ExamId { get; set; } - - /// - /// 课程快照ID - /// - public long? CourseSnapId { get; set; } - - /// - /// 课程ID - /// - public long? CourseId { get; set; } - - /// - /// 课程场景ID - /// - public long? CourseSceneId { get; set; } - - - /// - /// 必选修规则ID - /// - public long? StudyRuleId { get; set; } - - /// - /// 加入时间 - /// - public DateTime? JoinTime { get; set; } - - /// - /// 课程结束时间 - /// - public DateTime? CourseBeginTime { get; set; } - - /// - /// 课程结束时间 - /// - public DateTime? CourseEndTime { get; set; } - - /// - /// 开始时间 - /// - public DateTime? BeginTime { get; set; } - - /// - /// 结束时间 - /// - public DateTime? EndTime { get; set; } - - /// - /// 学习进度 - /// - public int? StudyProgress { get; set; } - - /// - /// 学习时长(分钟) - /// - public decimal? StudyDuration { get; set; } - - /// - /// 课程标准时长(分钟) - /// - public decimal? StandardDuration { get; set; } - - /// - /// 课程类型 - /// - [Display(Name = "CourseType"), Description("课程类型"), MaxLength(32, ErrorMessage = "课程类型 不能超过 32 个字符")] - public string CourseType { get; set; } - - /// - /// 课程状态 - /// - [Display(Name = "CourseStatus"), Description("课程状态"), MaxLength(32, ErrorMessage = "课程状态 不能超过 32 个字符")] - public string CourseStatus { get; set; } - - /// - /// 学习状态 - /// - [Display(Name = "StudyStatus"), Description("学习状态"), MaxLength(32, ErrorMessage = "学习状态 不能超过 32 个字符")] - public string StudyStatus { get; set; } - - /// - /// 年度 - /// - [Display(Name = "Year"), Description("年度"), MaxLength(32, ErrorMessage = "年度 不能超过 32 个字符")] - public string Year { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - - /// - /// 员工培训ID - /// - public int? StaffTrainingId { get; set; } - } + /// 员工ID + /// + public int? StaffId { get; set; } + + /// + /// 考试ID + /// + public long? ExamId { get; set; } + + /// + /// 课程快照ID + /// + public long? CourseSnapId { get; set; } + + /// + /// 课程ID + /// + public long? CourseId { get; set; } + + /// + /// 课程场景ID + /// + public long? CourseSceneId { get; set; } + + + /// + /// 必选修规则ID + /// + public long? StudyRuleId { get; set; } + + /// + /// 加入时间 + /// + public DateTime? JoinTime { get; set; } + + /// + /// 课程结束时间 + /// + public DateTime? CourseBeginTime { get; set; } + + /// + /// 课程结束时间 + /// + public DateTime? CourseEndTime { get; set; } + + /// + /// 开始时间 + /// + public DateTime? BeginTime { get; set; } + + /// + /// 结束时间 + /// + public DateTime? EndTime { get; set; } + + /// + /// 学习进度 + /// + public int? StudyProgress { get; set; } + + /// + /// 学习时长(分钟) + /// + public decimal? StudyDuration { get; set; } + + /// + /// 课程标准时长(分钟) + /// + public decimal? StandardDuration { get; set; } + + /// + /// 课程类型 + /// + [Display(Name = "CourseType"), Description("课程类型"), MaxLength(32, ErrorMessage = "课程类型 不能超过 32 个字符")] + public string CourseType { get; set; } + + /// + /// 课程状态 + /// + [Display(Name = "CourseStatus"), Description("课程状态"), MaxLength(32, ErrorMessage = "课程状态 不能超过 32 个字符")] + public string CourseStatus { get; set; } + + /// + /// 学习状态 + /// + [Display(Name = "StudyStatus"), Description("学习状态"), MaxLength(32, ErrorMessage = "学习状态 不能超过 32 个字符")] + public string StudyStatus { get; set; } + + /// + /// 年度 + /// + [Display(Name = "Year"), Description("年度"), MaxLength(32, ErrorMessage = "年度 不能超过 32 个字符")] + public string Year { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } + + /// + /// 员工培训ID + /// + public int? StaffTrainingId { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRule.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRule.Dto.Base.cs index 959fb848..5524bc4a 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRule.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRule.Dto.Base.cs @@ -13,184 +13,180 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 必选修规则 (Dto.Base) +/// +public class Ghre_StudyRuleBase { /// - /// 必选修规则 (Dto.Base) - /// - public class Ghre_StudyRuleBase - { - - /// - /// 规则类型 - /// - [Display(Name = "RuleType"), Description("规则类型"), MaxLength(32, ErrorMessage = "规则类型 不能超过 32 个字符")] - public string RuleType { get; set; } - - /// - /// 培训种类 - /// - [Display(Name = "TrainType"), Description("培训种类"), MaxLength(32, ErrorMessage = "培训种类 不能超过 32 个字符")] - public string TrainType { get; set; } - - /// - /// 课程ID - /// - public long? CourseId { get; set; } - - /// - /// 课程场景ID - /// - public long? CourseSceneId { get; set; } - - /// - /// 厂区 - /// - [Display(Name = "ZoneId"), Description("厂区"), MaxLength(2000, ErrorMessage = "厂区 不能超过 2000 个字符")] - public string ZoneId { get; set; } - - /// - /// 部门 - /// - [Display(Name = "DeptId"), Description("部门"), MaxLength(2000, ErrorMessage = "部门 不能超过 2000 个字符")] - public string DeptId { get; set; } - - /// - /// 岗位 - /// - [Display(Name = "TitleId"), Description("岗位"), MaxLength(2000, ErrorMessage = "岗位 不能超过 2000 个字符")] - public string TitleId { get; set; } - - /// - /// 职等 - /// - [Display(Name = "GradeId"), Description("职等"), MaxLength(2000, ErrorMessage = "职等 不能超过 2000 个字符")] - public string GradeId { get; set; } - - /// - /// 职称 - /// - [Display(Name = "JobId"), Description("职称"), MaxLength(2000, ErrorMessage = "职称 不能超过 2000 个字符")] - public string JobId { get; set; } - - /// - /// 年度 - /// - [Display(Name = "Year"), Description("年度"), MaxLength(32, ErrorMessage = "年度 不能超过 32 个字符")] - public string Year { get; set; } - - /// - /// 完成期限 - /// - public int? DeadlineMonth { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// 结果 - /// - [Display(Name = "Result"), Description("结果"), MaxLength(2000, ErrorMessage = "结果 不能超过 2000 个字符")] - public string Result { 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; } - - /// - /// 规则编号 - /// - [Display(Name = "RuleNo"), Description("规则编号"), MaxLength(32, ErrorMessage = "规则编号 不能超过 32 个字符")] - public string RuleNo { get; set; } - - /// - /// 规则名称 - /// - [Display(Name = "RuleName"), Description("规则名称"), MaxLength(32, ErrorMessage = "规则名称 不能超过 32 个字符")] - public string RuleName { get; set; } - - /// - /// 部门是否含下阶 - /// - public bool? IsDeptLower { get; set; } - } + /// 规则类型 + /// + [Display(Name = "RuleType"), Description("规则类型"), MaxLength(32, ErrorMessage = "规则类型 不能超过 32 个字符")] + public string RuleType { get; set; } + + /// + /// 培训种类 + /// + [Display(Name = "TrainType"), Description("培训种类"), MaxLength(32, ErrorMessage = "培训种类 不能超过 32 个字符")] + public string TrainType { get; set; } + + /// + /// 课程ID + /// + public long? CourseId { get; set; } + + /// + /// 课程场景ID + /// + public long? CourseSceneId { get; set; } + + /// + /// 厂区 + /// + [Display(Name = "ZoneId"), Description("厂区"), MaxLength(2000, ErrorMessage = "厂区 不能超过 2000 个字符")] + public string ZoneId { get; set; } + + /// + /// 部门 + /// + [Display(Name = "DeptId"), Description("部门"), MaxLength(2000, ErrorMessage = "部门 不能超过 2000 个字符")] + public string DeptId { get; set; } + + /// + /// 岗位 + /// + [Display(Name = "TitleId"), Description("岗位"), MaxLength(2000, ErrorMessage = "岗位 不能超过 2000 个字符")] + public string TitleId { get; set; } + + /// + /// 职等 + /// + [Display(Name = "GradeId"), Description("职等"), MaxLength(2000, ErrorMessage = "职等 不能超过 2000 个字符")] + public string GradeId { get; set; } + + /// + /// 职称 + /// + [Display(Name = "JobId"), Description("职称"), MaxLength(2000, ErrorMessage = "职称 不能超过 2000 个字符")] + public string JobId { get; set; } + + /// + /// 年度 + /// + [Display(Name = "Year"), Description("年度"), MaxLength(32, ErrorMessage = "年度 不能超过 32 个字符")] + public string Year { get; set; } + + /// + /// 完成期限 + /// + public int? DeadlineMonth { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// 结果 + /// + [Display(Name = "Result"), Description("结果"), MaxLength(2000, ErrorMessage = "结果 不能超过 2000 个字符")] + public string Result { 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; } + + /// + /// 规则编号 + /// + [Display(Name = "RuleNo"), Description("规则编号"), MaxLength(32, ErrorMessage = "规则编号 不能超过 32 个字符")] + public string RuleNo { get; set; } + + /// + /// 规则名称 + /// + [Display(Name = "RuleName"), Description("规则名称"), MaxLength(32, ErrorMessage = "规则名称 不能超过 32 个字符")] + public string RuleName { get; set; } + + /// + /// 部门是否含下阶 + /// + public bool? IsDeptLower { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRuleResult.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRuleResult.Dto.Base.cs index 7f06089e..e70bc4e6 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRuleResult.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRuleResult.Dto.Base.cs @@ -13,126 +13,122 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 必选修规则结果 (Dto.Base) +/// +public class Ghre_StudyRuleResultBase { /// - /// 必选修规则结果 (Dto.Base) - /// - public class Ghre_StudyRuleResultBase - { - - /// - /// 必选修规则ID - /// - public long? StudyRuleId { get; set; } - - /// - /// 人员ID - /// - public int? StaffId { get; set; } - - /// - /// 工号 - /// - [Display(Name = "StaffNo"), Description("工号"), MaxLength(32, ErrorMessage = "工号 不能超过 32 个字符")] - public string StaffNo { get; set; } - - /// - /// 员工姓名 - /// - [Display(Name = "StaffName"), Description("员工姓名"), MaxLength(32, ErrorMessage = "员工姓名 不能超过 32 个字符")] - public string StaffName { get; set; } - - /// - /// 状态 - /// - [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] - public string Status { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 必选修规则ID + /// + public long? StudyRuleId { get; set; } + + /// + /// 人员ID + /// + public int? StaffId { get; set; } + + /// + /// 工号 + /// + [Display(Name = "StaffNo"), Description("工号"), MaxLength(32, ErrorMessage = "工号 不能超过 32 个字符")] + public string StaffNo { get; set; } + + /// + /// 员工姓名 + /// + [Display(Name = "StaffName"), Description("员工姓名"), MaxLength(32, ErrorMessage = "员工姓名 不能超过 32 个字符")] + public string StaffName { get; set; } + + /// + /// 状态 + /// + [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] + public string Status { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRuleStaff.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRuleStaff.Dto.Base.cs index f1556ffc..f003223b 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRuleStaff.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRuleStaff.Dto.Base.cs @@ -14,113 +14,109 @@ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ */ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 必选修规则人员 (Dto.Base) +/// +public class Ghre_StudyRuleStaffBase { /// - /// 必选修规则人员 (Dto.Base) - /// - public class Ghre_StudyRuleStaffBase - { - - /// - /// 必选修规则ID - /// - public long? StudyRuleId { get; set; } - - /// - /// 人员 - /// - public int? StaffId { get; set; } - - /// - /// 员工姓名 - /// - [Display(Name = "StaffName"), Description("员工姓名"), MaxLength(2000, ErrorMessage = "员工姓名 不能超过 32 个字符")] - public string StaffName { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 必选修规则ID + /// + public long? StudyRuleId { get; set; } + + /// + /// 人员 + /// + public int? StaffId { get; set; } + + /// + /// 员工姓名 + /// + [Display(Name = "StaffName"), Description("员工姓名"), MaxLength(2000, ErrorMessage = "员工姓名 不能超过 32 个字符")] + public string StaffName { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_Teacher.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_Teacher.Dto.Base.cs index d8408939..cf74d2a6 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_Teacher.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_Teacher.Dto.Base.cs @@ -13,272 +13,267 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训讲师 (Dto.Base) +/// +public class Ghre_TeacherBase { /// - /// 培训讲师 (Dto.Base) - /// - public class Ghre_TeacherBase - { - - /// - /// 机构Id - /// - public long? SchoolId { get; set; } - - /// - /// 部门ID - /// - public int? DeptID { get; set; } - - /// - /// 员工ID - /// - public int? StaffId { get; set; } - - /// - /// 讲师分类 - /// - [Display(Name = "TeacherType"), Description("讲师分类"), MaxLength(32, ErrorMessage = "讲师分类 不能超过 32 个字符")] - public string TeacherType { get; set; } - - /// - /// 机构编号 - /// - [Display(Name = "TeacherNo"), Description("机构编号"), MaxLength(32, ErrorMessage = "机构编号 不能超过 32 个字符")] - public string TeacherNo { get; set; } - - /// - /// 机构名称 - /// - [Display(Name = "TeacherName"), Description("机构名称"), MaxLength(32, ErrorMessage = "机构名称 不能超过 32 个字符")] - public string TeacherName { get; set; } - - /// - /// 员工照片 - /// - [Display(Name = "PhotoUrl"), Description("员工照片"), MaxLength(256, ErrorMessage = "员工照片 不能超过 256 个字符")] - public string PhotoUrl { get; set; } - - /// - /// 性别 - /// - [Display(Name = "Gender"), Description("性别"), MaxLength(32, ErrorMessage = "性别 不能超过 32 个字符")] - public string Gender { get; set; } - - /// - /// 邮箱 - /// - [Display(Name = "Email"), Description("邮箱"), MaxLength(64, ErrorMessage = "邮箱 不能超过 64 个字符")] - public string Email { get; set; } - - /// - /// 手机号码 - /// - [Display(Name = "Mobile"), Description("手机号码"), MaxLength(32, ErrorMessage = "手机号码 不能超过 32 个字符")] - public string Mobile { get; set; } - - /// - /// 讲师等级 - /// - [Display(Name = "TeacherLevel"), Description("讲师等级"), MaxLength(32, ErrorMessage = "讲师等级 不能超过 32 个字符")] - public string TeacherLevel { get; set; } - - /// - /// 课时费 - /// - [Display(Name = "Price"), Description("课时费"), Column(TypeName = "decimal(20,2)")] - public decimal? Price { get; set; } - - /// - /// 擅长领域 - /// - [Display(Name = "SkillPoints"), Description("擅长领域"), MaxLength(256, ErrorMessage = "擅长领域 不能超过 256 个字符")] - public string SkillPoints { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// 申请理由 - /// - [Display(Name = "ApplyReason"), Description("申请理由"), MaxLength(2000, ErrorMessage = "申请理由 不能超过 2000 个字符")] - public string ApplyReason { get; set; } - - /// - /// 默认标志 - /// - public int? IsDefault { get; set; } - - /// - /// 发起人 - /// - public long? SponsorId { get; set; } - - /// - /// 状态 - /// - [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] - public string Status { get; set; } - - /// - /// WorkID - /// - public int? WorkID { get; set; } - - /// - /// WorkNo - /// - [Display(Name = "WorkNo"), Description("WorkNo"), MaxLength(100, ErrorMessage = "WorkNo 不能超过 100 个字符")] - public string WorkNo { get; set; } - - /// - /// ToDoType - /// - [Display(Name = "ToDoType"), Description("ToDoType"), MaxLength(100, ErrorMessage = "ToDoType 不能超过 100 个字符")] - public string ToDoType { get; set; } - - /// - /// BatchSID - /// - [Display(Name = "BatchSID"), Description("BatchSID"), MaxLength(100, ErrorMessage = "BatchSID 不能超过 100 个字符")] - public string BatchSID { get; set; } - - /// - /// WorkState - /// - public int? WorkState { get; set; } - - /// - /// ShiftID - /// - public int? ShiftID { get; set; } - - /// - /// ConfirmUserID - /// - public int? ConfirmUserID { get; set; } - - /// - /// ConfirmTime - /// - public DateTime? ConfirmTime { get; set; } - - /// - /// ConfirmComment - /// - [Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")] - public string ConfirmComment { get; set; } - - /// - /// 同意人 - /// - public long? AgreeUserId { get; set; } - - /// - /// 同意时间 - /// - public DateTime? AgreeTime { get; set; } - - /// - /// 同意理由 - /// - [Display(Name = "AgreeReason"), Description("同意理由"), MaxLength(2000, ErrorMessage = "同意理由 不能超过 2000 个字符")] - public string AgreeReason { get; set; } - - /// - /// 拒绝人 - /// - public long? RefuseUserId { get; set; } - - /// - /// 拒绝时间 - /// - public DateTime? RefuseTime { get; set; } - - /// - /// 拒绝理由 - /// - [Display(Name = "RefuseReason"), Description("拒绝理由"), MaxLength(2000, ErrorMessage = "拒绝理由 不能超过 2000 个字符")] - public string RefuseReason { 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; } - } + /// 机构Id + /// + public long? SchoolId { get; set; } + + /// + /// 部门ID + /// + public int? DeptID { get; set; } + + /// + /// 员工ID + /// + public int? StaffId { get; set; } + + /// + /// 讲师分类 + /// + [Display(Name = "TeacherType"), Description("讲师分类"), MaxLength(32, ErrorMessage = "讲师分类 不能超过 32 个字符")] + public string TeacherType { get; set; } + + /// + /// 机构编号 + /// + [Display(Name = "TeacherNo"), Description("机构编号"), MaxLength(32, ErrorMessage = "机构编号 不能超过 32 个字符")] + public string TeacherNo { get; set; } + + /// + /// 机构名称 + /// + [Display(Name = "TeacherName"), Description("机构名称"), MaxLength(32, ErrorMessage = "机构名称 不能超过 32 个字符")] + public string TeacherName { get; set; } + + /// + /// 员工照片 + /// + [Display(Name = "PhotoUrl"), Description("员工照片"), MaxLength(256, ErrorMessage = "员工照片 不能超过 256 个字符")] + public string PhotoUrl { get; set; } + + /// + /// 性别 + /// + [Display(Name = "Gender"), Description("性别"), MaxLength(32, ErrorMessage = "性别 不能超过 32 个字符")] + public string Gender { get; set; } + + /// + /// 邮箱 + /// + [Display(Name = "Email"), Description("邮箱"), MaxLength(64, ErrorMessage = "邮箱 不能超过 64 个字符")] + public string Email { get; set; } + + /// + /// 手机号码 + /// + [Display(Name = "Mobile"), Description("手机号码"), MaxLength(32, ErrorMessage = "手机号码 不能超过 32 个字符")] + public string Mobile { get; set; } + + /// + /// 讲师等级 + /// + [Display(Name = "TeacherLevel"), Description("讲师等级"), MaxLength(32, ErrorMessage = "讲师等级 不能超过 32 个字符")] + public string TeacherLevel { get; set; } + + /// + /// 课时费 + /// + [Display(Name = "Price"), Description("课时费"), Column(TypeName = "decimal(20,2)")] + public decimal? Price { get; set; } + + /// + /// 擅长领域 + /// + [Display(Name = "SkillPoints"), Description("擅长领域"), MaxLength(256, ErrorMessage = "擅长领域 不能超过 256 个字符")] + public string SkillPoints { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// 申请理由 + /// + [Display(Name = "ApplyReason"), Description("申请理由"), MaxLength(2000, ErrorMessage = "申请理由 不能超过 2000 个字符")] + public string ApplyReason { get; set; } + + /// + /// 默认标志 + /// + public int? IsDefault { get; set; } + + /// + /// 发起人 + /// + public long? SponsorId { get; set; } + + /// + /// 状态 + /// + [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] + public string Status { get; set; } + + /// + /// WorkID + /// + public int? WorkID { get; set; } + + /// + /// WorkNo + /// + [Display(Name = "WorkNo"), Description("WorkNo"), MaxLength(100, ErrorMessage = "WorkNo 不能超过 100 个字符")] + public string WorkNo { get; set; } + + /// + /// ToDoType + /// + [Display(Name = "ToDoType"), Description("ToDoType"), MaxLength(100, ErrorMessage = "ToDoType 不能超过 100 个字符")] + public string ToDoType { get; set; } + + /// + /// BatchSID + /// + [Display(Name = "BatchSID"), Description("BatchSID"), MaxLength(100, ErrorMessage = "BatchSID 不能超过 100 个字符")] + public string BatchSID { get; set; } + + /// + /// WorkState + /// + public int? WorkState { get; set; } + + /// + /// ShiftID + /// + public int? ShiftID { get; set; } + + /// + /// ConfirmUserID + /// + public int? ConfirmUserID { get; set; } + + /// + /// ConfirmTime + /// + public DateTime? ConfirmTime { get; set; } + + /// + /// ConfirmComment + /// + [Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")] + public string ConfirmComment { get; set; } + + /// + /// 同意人 + /// + public long? AgreeUserId { get; set; } + + /// + /// 同意时间 + /// + public DateTime? AgreeTime { get; set; } + + /// + /// 同意理由 + /// + [Display(Name = "AgreeReason"), Description("同意理由"), MaxLength(2000, ErrorMessage = "同意理由 不能超过 2000 个字符")] + public string AgreeReason { get; set; } + + /// + /// 拒绝人 + /// + public long? RefuseUserId { get; set; } + + /// + /// 拒绝时间 + /// + public DateTime? RefuseTime { get; set; } + + /// + /// 拒绝理由 + /// + [Display(Name = "RefuseReason"), Description("拒绝理由"), MaxLength(2000, ErrorMessage = "拒绝理由 不能超过 2000 个字符")] + public string RefuseReason { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_TeacherAttachment.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_TeacherAttachment.Dto.Base.cs index 108197b7..5ad49604 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_TeacherAttachment.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_TeacherAttachment.Dto.Base.cs @@ -13,131 +13,127 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghre_TeacherAttachment (Dto.Base) +/// +public class Ghre_TeacherAttachmentBase { /// - /// Ghre_TeacherAttachment (Dto.Base) - /// - public class Ghre_TeacherAttachmentBase - { - - /// - /// 机构ID - /// - public long? TeacherId { get; set; } - - /// - /// 编号 - /// - [Display(Name = "CertificateNo"), Description("编号"), MaxLength(32, ErrorMessage = "编号 不能超过 32 个字符")] - public string CertificateNo { get; set; } - - /// - /// 名称 - /// - [Display(Name = "CertificateName"), Description("名称"), MaxLength(32, ErrorMessage = "名称 不能超过 32 个字符")] - public string CertificateName { get; set; } - - /// - /// 生效日期 - /// - public DateTime? EffectiveDate { get; set; } - - /// - /// 失效日期 - /// - public DateTime? ExpirationDate { get; set; } - - /// - /// 来源 - /// - [Display(Name = "Source"), Description("来源"), MaxLength(2000, ErrorMessage = "来源 不能超过 32 个字符")] - public string Source { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 机构ID + /// + public long? TeacherId { get; set; } + + /// + /// 编号 + /// + [Display(Name = "CertificateNo"), Description("编号"), MaxLength(32, ErrorMessage = "编号 不能超过 32 个字符")] + public string CertificateNo { get; set; } + + /// + /// 名称 + /// + [Display(Name = "CertificateName"), Description("名称"), MaxLength(32, ErrorMessage = "名称 不能超过 32 个字符")] + public string CertificateName { get; set; } + + /// + /// 生效日期 + /// + public DateTime? EffectiveDate { get; set; } + + /// + /// 失效日期 + /// + public DateTime? ExpirationDate { get; set; } + + /// + /// 来源 + /// + [Display(Name = "Source"), Description("来源"), MaxLength(2000, ErrorMessage = "来源 不能超过 32 个字符")] + public string Source { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_TeacherChange.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_TeacherChange.Dto.Base.cs index 796c597e..e241f78c 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_TeacherChange.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_TeacherChange.Dto.Base.cs @@ -13,317 +13,312 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训讲师异动 (Dto.Base) +/// +public class Ghre_TeacherChangeBase { /// - /// 培训讲师异动 (Dto.Base) - /// - public class Ghre_TeacherChangeBase - { - - /// - /// 机构ID - /// - public long? TeacherId { get; set; } - - /// - /// 机构Id - /// - public long? SchoolId { get; set; } - - /// - /// 原调动类别 - /// - [Display(Name = "OriginChangeType"), Description("原调动类别"), MaxLength(32, ErrorMessage = "原调动类别 不能超过 32 个字符")] - public string OriginChangeType { get; set; } - - /// - /// 调动类别 - /// - [Display(Name = "ChangeType"), Description("调动类别"), MaxLength(32, ErrorMessage = "调动类别 不能超过 32 个字符")] - public string ChangeType { get; set; } - - /// - /// 原调动日期 - /// - public DateTime? OriginChangeDate { get; set; } - - /// - /// 调动日期 - /// - public DateTime? ChangeDate { get; set; } - - /// - /// 部门ID - /// - public int? DeptID { get; set; } - - /// - /// 员工ID - /// - public int? StaffId { get; set; } - - /// - /// 讲师分类 - /// - [Display(Name = "TeacherType"), Description("讲师分类"), MaxLength(32, ErrorMessage = "讲师分类 不能超过 32 个字符")] - public string TeacherType { get; set; } - - /// - /// 机构编号 - /// - [Display(Name = "TeacherNo"), Description("机构编号"), MaxLength(32, ErrorMessage = "机构编号 不能超过 32 个字符")] - public string TeacherNo { get; set; } - - /// - /// 机构名称 - /// - [Display(Name = "TeacherName"), Description("机构名称"), MaxLength(32, ErrorMessage = "机构名称 不能超过 32 个字符")] - public string TeacherName { get; set; } - - /// - /// 员工照片 - /// - [Display(Name = "PhotoUrl"), Description("员工照片"), MaxLength(256, ErrorMessage = "员工照片 不能超过 256 个字符")] - public string PhotoUrl { get; set; } - - /// - /// 性别 - /// - [Display(Name = "Gender"), Description("性别"), MaxLength(32, ErrorMessage = "性别 不能超过 32 个字符")] - public string Gender { get; set; } - - /// - /// 邮箱 - /// - [Display(Name = "Email"), Description("邮箱"), MaxLength(64, ErrorMessage = "邮箱 不能超过 64 个字符")] - public string Email { get; set; } - - /// - /// 手机号码 - /// - [Display(Name = "Mobile"), Description("手机号码"), MaxLength(32, ErrorMessage = "手机号码 不能超过 32 个字符")] - public string Mobile { get; set; } - - /// - /// 讲师等级 - /// - [Display(Name = "OriginTeacherLevel"), Description("讲师等级"), MaxLength(32, ErrorMessage = "讲师等级 不能超过 32 个字符")] - public string OriginTeacherLevel { get; set; } - - /// - /// 讲师等级 - /// - [Display(Name = "TeacherLevel"), Description("讲师等级"), MaxLength(32, ErrorMessage = "讲师等级 不能超过 32 个字符")] - public string TeacherLevel { get; set; } - - /// - /// 课时费 - /// - [Display(Name = "OriginPrice"), Description("课时费"), Column(TypeName = "decimal(20,2)")] - public decimal? OriginPrice { get; set; } - - /// - /// 课时费 - /// - [Display(Name = "Price"), Description("课时费"), Column(TypeName = "decimal(20,2)")] - public decimal? Price { get; set; } - - /// - /// 擅长领域 - /// - [Display(Name = "OriginSkillPoints"), Description("擅长领域"), MaxLength(256, ErrorMessage = "擅长领域 不能超过 256 个字符")] - public string OriginSkillPoints { get; set; } - - /// - /// 擅长领域 - /// - [Display(Name = "SkillPoints"), Description("擅长领域"), MaxLength(256, ErrorMessage = "擅长领域 不能超过 256 个字符")] - public string SkillPoints { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// 申请理由 - /// - [Display(Name = "ApplyReason"), Description("申请理由"), MaxLength(2000, ErrorMessage = "申请理由 不能超过 2000 个字符")] - public string ApplyReason { get; set; } - - /// - /// 发起人 - /// - public long? SponsorId { get; set; } - - /// - /// 状态 - /// - [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] - public string Status { get; set; } - - /// - /// 默认标志 - /// - public int? IsDefault { get; set; } - - /// - /// WorkID - /// - public int? WorkID { get; set; } - - /// - /// WorkNo - /// - [Display(Name = "WorkNo"), Description("WorkNo"), MaxLength(100, ErrorMessage = "WorkNo 不能超过 100 个字符")] - public string WorkNo { get; set; } - - /// - /// ToDoType - /// - [Display(Name = "ToDoType"), Description("ToDoType"), MaxLength(100, ErrorMessage = "ToDoType 不能超过 100 个字符")] - public string ToDoType { get; set; } - - /// - /// BatchSID - /// - [Display(Name = "BatchSID"), Description("BatchSID"), MaxLength(100, ErrorMessage = "BatchSID 不能超过 100 个字符")] - public string BatchSID { get; set; } - - /// - /// WorkState - /// - public int? WorkState { get; set; } - - /// - /// ShiftID - /// - public int? ShiftID { get; set; } - - /// - /// ConfirmUserID - /// - public int? ConfirmUserID { get; set; } - - /// - /// ConfirmTime - /// - public DateTime? ConfirmTime { get; set; } - - /// - /// ConfirmComment - /// - [Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")] - public string ConfirmComment { get; set; } - - /// - /// 同意人 - /// - public long? AgreeUserId { get; set; } - - /// - /// 同意时间 - /// - public DateTime? AgreeTime { get; set; } - - /// - /// 同意理由 - /// - [Display(Name = "AgreeReason"), Description("同意理由"), MaxLength(2000, ErrorMessage = "同意理由 不能超过 2000 个字符")] - public string AgreeReason { get; set; } - - /// - /// 拒绝人 - /// - public long? RefuseUserId { get; set; } - - /// - /// 拒绝时间 - /// - public DateTime? RefuseTime { get; set; } - - /// - /// 拒绝理由 - /// - [Display(Name = "RefuseReason"), Description("拒绝理由"), MaxLength(2000, ErrorMessage = "拒绝理由 不能超过 2000 个字符")] - public string RefuseReason { 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; } - } + /// 机构ID + /// + public long? TeacherId { get; set; } + + /// + /// 机构Id + /// + public long? SchoolId { get; set; } + + /// + /// 原调动类别 + /// + [Display(Name = "OriginChangeType"), Description("原调动类别"), MaxLength(32, ErrorMessage = "原调动类别 不能超过 32 个字符")] + public string OriginChangeType { get; set; } + + /// + /// 调动类别 + /// + [Display(Name = "ChangeType"), Description("调动类别"), MaxLength(32, ErrorMessage = "调动类别 不能超过 32 个字符")] + public string ChangeType { get; set; } + + /// + /// 原调动日期 + /// + public DateTime? OriginChangeDate { get; set; } + + /// + /// 调动日期 + /// + public DateTime? ChangeDate { get; set; } + + /// + /// 部门ID + /// + public int? DeptID { get; set; } + + /// + /// 员工ID + /// + public int? StaffId { get; set; } + + /// + /// 讲师分类 + /// + [Display(Name = "TeacherType"), Description("讲师分类"), MaxLength(32, ErrorMessage = "讲师分类 不能超过 32 个字符")] + public string TeacherType { get; set; } + + /// + /// 机构编号 + /// + [Display(Name = "TeacherNo"), Description("机构编号"), MaxLength(32, ErrorMessage = "机构编号 不能超过 32 个字符")] + public string TeacherNo { get; set; } + + /// + /// 机构名称 + /// + [Display(Name = "TeacherName"), Description("机构名称"), MaxLength(32, ErrorMessage = "机构名称 不能超过 32 个字符")] + public string TeacherName { get; set; } + + /// + /// 员工照片 + /// + [Display(Name = "PhotoUrl"), Description("员工照片"), MaxLength(256, ErrorMessage = "员工照片 不能超过 256 个字符")] + public string PhotoUrl { get; set; } + + /// + /// 性别 + /// + [Display(Name = "Gender"), Description("性别"), MaxLength(32, ErrorMessage = "性别 不能超过 32 个字符")] + public string Gender { get; set; } + + /// + /// 邮箱 + /// + [Display(Name = "Email"), Description("邮箱"), MaxLength(64, ErrorMessage = "邮箱 不能超过 64 个字符")] + public string Email { get; set; } + + /// + /// 手机号码 + /// + [Display(Name = "Mobile"), Description("手机号码"), MaxLength(32, ErrorMessage = "手机号码 不能超过 32 个字符")] + public string Mobile { get; set; } + + /// + /// 讲师等级 + /// + [Display(Name = "OriginTeacherLevel"), Description("讲师等级"), MaxLength(32, ErrorMessage = "讲师等级 不能超过 32 个字符")] + public string OriginTeacherLevel { get; set; } + + /// + /// 讲师等级 + /// + [Display(Name = "TeacherLevel"), Description("讲师等级"), MaxLength(32, ErrorMessage = "讲师等级 不能超过 32 个字符")] + public string TeacherLevel { get; set; } + + /// + /// 课时费 + /// + [Display(Name = "OriginPrice"), Description("课时费"), Column(TypeName = "decimal(20,2)")] + public decimal? OriginPrice { get; set; } + + /// + /// 课时费 + /// + [Display(Name = "Price"), Description("课时费"), Column(TypeName = "decimal(20,2)")] + public decimal? Price { get; set; } + + /// + /// 擅长领域 + /// + [Display(Name = "OriginSkillPoints"), Description("擅长领域"), MaxLength(256, ErrorMessage = "擅长领域 不能超过 256 个字符")] + public string OriginSkillPoints { get; set; } + + /// + /// 擅长领域 + /// + [Display(Name = "SkillPoints"), Description("擅长领域"), MaxLength(256, ErrorMessage = "擅长领域 不能超过 256 个字符")] + public string SkillPoints { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// 申请理由 + /// + [Display(Name = "ApplyReason"), Description("申请理由"), MaxLength(2000, ErrorMessage = "申请理由 不能超过 2000 个字符")] + public string ApplyReason { get; set; } + + /// + /// 发起人 + /// + public long? SponsorId { get; set; } + + /// + /// 状态 + /// + [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] + public string Status { get; set; } + + /// + /// 默认标志 + /// + public int? IsDefault { get; set; } + + /// + /// WorkID + /// + public int? WorkID { get; set; } + + /// + /// WorkNo + /// + [Display(Name = "WorkNo"), Description("WorkNo"), MaxLength(100, ErrorMessage = "WorkNo 不能超过 100 个字符")] + public string WorkNo { get; set; } + + /// + /// ToDoType + /// + [Display(Name = "ToDoType"), Description("ToDoType"), MaxLength(100, ErrorMessage = "ToDoType 不能超过 100 个字符")] + public string ToDoType { get; set; } + + /// + /// BatchSID + /// + [Display(Name = "BatchSID"), Description("BatchSID"), MaxLength(100, ErrorMessage = "BatchSID 不能超过 100 个字符")] + public string BatchSID { get; set; } + + /// + /// WorkState + /// + public int? WorkState { get; set; } + + /// + /// ShiftID + /// + public int? ShiftID { get; set; } + + /// + /// ConfirmUserID + /// + public int? ConfirmUserID { get; set; } + + /// + /// ConfirmTime + /// + public DateTime? ConfirmTime { get; set; } + + /// + /// ConfirmComment + /// + [Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")] + public string ConfirmComment { get; set; } + + /// + /// 同意人 + /// + public long? AgreeUserId { get; set; } + + /// + /// 同意时间 + /// + public DateTime? AgreeTime { get; set; } + + /// + /// 同意理由 + /// + [Display(Name = "AgreeReason"), Description("同意理由"), MaxLength(2000, ErrorMessage = "同意理由 不能超过 2000 个字符")] + public string AgreeReason { get; set; } + + /// + /// 拒绝人 + /// + public long? RefuseUserId { get; set; } + + /// + /// 拒绝时间 + /// + public DateTime? RefuseTime { get; set; } + + /// + /// 拒绝理由 + /// + [Display(Name = "RefuseReason"), Description("拒绝理由"), MaxLength(2000, ErrorMessage = "拒绝理由 不能超过 2000 个字符")] + public string RefuseReason { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_TeacherChangeAttachment.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_TeacherChangeAttachment.Dto.Base.cs index d1ef6bb3..b434caf3 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_TeacherChangeAttachment.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_TeacherChangeAttachment.Dto.Base.cs @@ -13,125 +13,121 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训讲师异动附件 (Dto.Base) +/// +public class Ghre_TeacherChangeAttachmentBase { /// - /// 培训讲师异动附件 (Dto.Base) - /// - public class Ghre_TeacherChangeAttachmentBase - { - - /// - /// 讲师异动ID - /// - public long? TeacherChangeId { get; set; } - - /// - /// 编号 - /// - [Display(Name = "CertificateNo"), Description("编号"), MaxLength(32, ErrorMessage = "编号 不能超过 32 个字符")] - public string CertificateNo { get; set; } - - /// - /// 名称 - /// - [Display(Name = "CertificateName"), Description("名称"), MaxLength(32, ErrorMessage = "名称 不能超过 32 个字符")] - public string CertificateName { get; set; } - - /// - /// 生效日期 - /// - public DateTime? EffectiveDate { get; set; } - - /// - /// 失效日期 - /// - public DateTime? ExpirationDate { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 讲师异动ID + /// + public long? TeacherChangeId { get; set; } + + /// + /// 编号 + /// + [Display(Name = "CertificateNo"), Description("编号"), MaxLength(32, ErrorMessage = "编号 不能超过 32 个字符")] + public string CertificateNo { get; set; } + + /// + /// 名称 + /// + [Display(Name = "CertificateName"), Description("名称"), MaxLength(32, ErrorMessage = "名称 不能超过 32 个字符")] + public string CertificateName { get; set; } + + /// + /// 生效日期 + /// + public DateTime? EffectiveDate { get; set; } + + /// + /// 失效日期 + /// + public DateTime? ExpirationDate { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeHome.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeHome.Dto.Base.cs index c347a5cc..b78e3799 100644 --- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeHome.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeHome.Dto.Base.cs @@ -13,156 +13,152 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 家庭关系 (Dto.Base) +/// +public class Ghrh_ResumeHomeBase { /// - /// 家庭关系 (Dto.Base) - /// - public class Ghrh_ResumeHomeBase - { - - /// - /// 简历ID - /// - public long? ResumeId { get; set; } - - /// - /// 姓名 - /// - [Display(Name = "RelationName"), Description("姓名"), MaxLength(100, ErrorMessage = "姓名 不能超过 100 个字符")] - public string RelationName { get; set; } - - /// - /// 年龄 - /// - [Display(Name = "RelationAge"), Description("年龄"), MaxLength(100, ErrorMessage = "年龄 不能超过 100 个字符")] - public string RelationAge { get; set; } - - /// - /// 关系 - /// - [Display(Name = "RelationType"), Description("关系"), MaxLength(100, ErrorMessage = "关系 不能超过 100 个字符")] - public string RelationType { get; set; } - - /// - /// 工作单位 - /// - [Display(Name = "WorkCompany"), Description("工作单位"), MaxLength(100, ErrorMessage = "工作单位 不能超过 100 个字符")] - public string WorkCompany { get; set; } - - /// - /// 电话 - /// - [Display(Name = "Telephone"), Description("电话"), MaxLength(32, ErrorMessage = "电话 不能超过 32 个字符")] - public string Telephone { get; set; } - - /// - /// 性别 - /// - [Display(Name = "Telephone"), Description("性别"), MaxLength(32, ErrorMessage = "性别 不能超过 32 个字符")] - public string Gender { get; set; } - - /// - /// 身份证号码 - /// - [Display(Name = "IDCardNo"), Description("身份证号码"), MaxLength(100, ErrorMessage = "身份证号码 不能超过 100 个字符")] - public string IDCardNo { get; set; } - - /// - /// 出生日期 - /// - public DateTime? Birth { get; set; } - - /// - /// 地址 - /// - [Display(Name = "RelationAddress"), Description("地址"), MaxLength(2000, ErrorMessage = "地址 不能超过 2000 个字符")] - public string RelationAddress { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 简历ID + /// + public long? ResumeId { get; set; } + + /// + /// 姓名 + /// + [Display(Name = "RelationName"), Description("姓名"), MaxLength(100, ErrorMessage = "姓名 不能超过 100 个字符")] + public string RelationName { get; set; } + + /// + /// 年龄 + /// + [Display(Name = "RelationAge"), Description("年龄"), MaxLength(100, ErrorMessage = "年龄 不能超过 100 个字符")] + public string RelationAge { get; set; } + + /// + /// 关系 + /// + [Display(Name = "RelationType"), Description("关系"), MaxLength(100, ErrorMessage = "关系 不能超过 100 个字符")] + public string RelationType { get; set; } + + /// + /// 工作单位 + /// + [Display(Name = "WorkCompany"), Description("工作单位"), MaxLength(100, ErrorMessage = "工作单位 不能超过 100 个字符")] + public string WorkCompany { get; set; } + + /// + /// 电话 + /// + [Display(Name = "Telephone"), Description("电话"), MaxLength(32, ErrorMessage = "电话 不能超过 32 个字符")] + public string Telephone { get; set; } + + /// + /// 性别 + /// + [Display(Name = "Telephone"), Description("性别"), MaxLength(32, ErrorMessage = "性别 不能超过 32 个字符")] + public string Gender { get; set; } + + /// + /// 身份证号码 + /// + [Display(Name = "IDCardNo"), Description("身份证号码"), MaxLength(100, ErrorMessage = "身份证号码 不能超过 100 个字符")] + public string IDCardNo { get; set; } + + /// + /// 出生日期 + /// + public DateTime? Birth { get; set; } + + /// + /// 地址 + /// + [Display(Name = "RelationAddress"), Description("地址"), MaxLength(2000, ErrorMessage = "地址 不能超过 2000 个字符")] + public string RelationAddress { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeInfoGroup.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeInfoGroup.Dto.Base.cs index 37da4b3c..19943f25 100644 --- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeInfoGroup.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeInfoGroup.Dto.Base.cs @@ -13,155 +13,151 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 简历组别 (Dto.Base) +/// +public class Ghrh_ResumeInfoGroupBase { /// - /// 简历组别 (Dto.Base) - /// - public class Ghrh_ResumeInfoGroupBase - { - - /// - /// 组别编号 - /// - [Display(Name = "GroupNo"), Description("组别编号"), MaxLength(100, ErrorMessage = "组别编号 不能超过 100 个字符")] - public string GroupNo { get; set; } - - /// - /// 组别名 - /// - [Display(Name = "GroupName"), Description("组别名"), MaxLength(100, ErrorMessage = "组别名 不能超过 100 个字符")] - public string GroupName { get; set; } - - /// - /// 多语Key - /// - [Display(Name = "MKey"), Description("多语Key"), MaxLength(100, ErrorMessage = "多语Key 不能超过 100 个字符")] - public string MKey { get; set; } - - /// - /// 组别类型 - /// - [Display(Name = "GroupType"), Description("组别类型"), MaxLength(100, ErrorMessage = "组别类型 不能超过 100 个字符")] - public string GroupType { get; set; } - - /// - /// 表名 - /// - [Display(Name = "TableName"), Description("表名"), MaxLength(100, ErrorMessage = "表名 不能超过 100 个字符")] - public string TableName { get; set; } - - /// - /// 主键名 - /// - [Display(Name = "TablePKIDName"), Description("主键名"), MaxLength(100, ErrorMessage = "主键名 不能超过 100 个字符")] - public string TablePKIDName { get; set; } - - /// - /// 多表名 - /// - [Display(Name = "TableNames"), Description("多表名"), MaxLength(1000, ErrorMessage = "多表名 不能超过 1000 个字符")] - public string TableNames { get; set; } - - /// - /// 排序号 - /// - public int? SortNo { get; set; } - - /// - /// 员工可修改 - /// - public int? CanModifyBySelf { get; set; } - - /// - /// ESS 显示 - /// - public int? CanEssDisplay { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 组别编号 + /// + [Display(Name = "GroupNo"), Description("组别编号"), MaxLength(100, ErrorMessage = "组别编号 不能超过 100 个字符")] + public string GroupNo { get; set; } + + /// + /// 组别名 + /// + [Display(Name = "GroupName"), Description("组别名"), MaxLength(100, ErrorMessage = "组别名 不能超过 100 个字符")] + public string GroupName { get; set; } + + /// + /// 多语Key + /// + [Display(Name = "MKey"), Description("多语Key"), MaxLength(100, ErrorMessage = "多语Key 不能超过 100 个字符")] + public string MKey { get; set; } + + /// + /// 组别类型 + /// + [Display(Name = "GroupType"), Description("组别类型"), MaxLength(100, ErrorMessage = "组别类型 不能超过 100 个字符")] + public string GroupType { get; set; } + + /// + /// 表名 + /// + [Display(Name = "TableName"), Description("表名"), MaxLength(100, ErrorMessage = "表名 不能超过 100 个字符")] + public string TableName { get; set; } + + /// + /// 主键名 + /// + [Display(Name = "TablePKIDName"), Description("主键名"), MaxLength(100, ErrorMessage = "主键名 不能超过 100 个字符")] + public string TablePKIDName { get; set; } + + /// + /// 多表名 + /// + [Display(Name = "TableNames"), Description("多表名"), MaxLength(1000, ErrorMessage = "多表名 不能超过 1000 个字符")] + public string TableNames { get; set; } + + /// + /// 排序号 + /// + public int? SortNo { get; set; } + + /// + /// 员工可修改 + /// + public int? CanModifyBySelf { get; set; } + + /// + /// ESS 显示 + /// + public int? CanEssDisplay { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeLicence.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeLicence.Dto.Base.cs index f2f42aa9..9aba4e33 100644 --- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeLicence.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeLicence.Dto.Base.cs @@ -13,125 +13,121 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 证件 (Dto.Base) +/// +public class Ghrh_ResumeLicenceBase { /// - /// 证件 (Dto.Base) - /// - public class Ghrh_ResumeLicenceBase - { - - /// - /// 简历ID - /// - public long? ResumeId { get; set; } - - /// - /// 生效日 - /// - public DateTime? BeginDate { get; set; } - - /// - /// 失效日 - /// - public DateTime? EndDate { get; set; } - - /// - /// 证件名称 - /// - [Display(Name = "LicenceName"), Description("证件名称"), MaxLength(100, ErrorMessage = "证件名称 不能超过 100 个字符")] - public string LicenceName { get; set; } - - /// - /// 证件编号 - /// - [Display(Name = "LicenceNo"), Description("证件编号"), MaxLength(100, ErrorMessage = "证件编号 不能超过 100 个字符")] - public string LicenceNo { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 简历ID + /// + public long? ResumeId { get; set; } + + /// + /// 生效日 + /// + public DateTime? BeginDate { get; set; } + + /// + /// 失效日 + /// + public DateTime? EndDate { get; set; } + + /// + /// 证件名称 + /// + [Display(Name = "LicenceName"), Description("证件名称"), MaxLength(100, ErrorMessage = "证件名称 不能超过 100 个字符")] + public string LicenceName { get; set; } + + /// + /// 证件编号 + /// + [Display(Name = "LicenceNo"), Description("证件编号"), MaxLength(100, ErrorMessage = "证件编号 不能超过 100 个字符")] + public string LicenceNo { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeStatement.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeStatement.Dto.Base.cs index 9200fb2d..c4ed54bf 100644 --- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeStatement.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeStatement.Dto.Base.cs @@ -13,119 +13,115 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 简历声明 (Dto.Base) +/// +public class Ghrh_ResumeStatementBase { /// - /// 简历声明 (Dto.Base) - /// - public class Ghrh_ResumeStatementBase - { - - /// - /// 简历ID - /// - public long? ResumeId { get; set; } - - /// - /// 声明ID - /// - public long? StatementId { get; set; } - - /// - /// 声明代码 - /// - [Display(Name = "StatementCode"), Description("声明代码"), MaxLength(2000, ErrorMessage = "声明代码 不能超过 32 个字符")] - public string StatementCode { get; set; } - - /// - /// 是否 - /// - public bool? TrueOrFalse { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 简历ID + /// + public long? ResumeId { get; set; } + + /// + /// 声明ID + /// + public long? StatementId { get; set; } + + /// + /// 声明代码 + /// + [Display(Name = "StatementCode"), Description("声明代码"), MaxLength(2000, ErrorMessage = "声明代码 不能超过 32 个字符")] + public string StatementCode { get; set; } + + /// + /// 是否 + /// + public bool? TrueOrFalse { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeTag.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeTag.Dto.Base.cs index 3eea44d5..f7752e8f 100644 --- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeTag.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeTag.Dto.Base.cs @@ -13,110 +13,106 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 简历标签 (Dto.Base) +/// +public class Ghrh_ResumeTagBase { /// - /// 简历标签 (Dto.Base) - /// - public class Ghrh_ResumeTagBase - { - - /// - /// 标签分类 - /// - [Display(Name = "TagClass"), Description("标签分类"), MaxLength(32, ErrorMessage = "标签分类 不能超过 32 个字符")] - public string TagClass { get; set; } - - /// - /// 标签名称 - /// - [Display(Name = "TagName"), Description("标签名称"), MaxLength(100, ErrorMessage = "标签名称 不能超过 100 个字符")] - public string TagName { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 标签分类 + /// + [Display(Name = "TagClass"), Description("标签分类"), MaxLength(32, ErrorMessage = "标签分类 不能超过 32 个字符")] + public string TagClass { get; set; } + + /// + /// 标签名称 + /// + [Display(Name = "TagName"), Description("标签名称"), MaxLength(100, ErrorMessage = "标签名称 不能超过 100 个字符")] + public string TagName { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeTemplate.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeTemplate.Dto.Base.cs index cb7a74db..877c2b63 100644 --- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeTemplate.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeTemplate.Dto.Base.cs @@ -13,137 +13,133 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 简历模板 (Dto.Base) +/// +public class Ghrh_ResumeTemplateBase { /// - /// 简历模板 (Dto.Base) - /// - public class Ghrh_ResumeTemplateBase - { - - /// - /// 模板编号 - /// - [Display(Name = "TemplateNo"), Description("模板编号"), MaxLength(100, ErrorMessage = "模板编号 不能超过 100 个字符")] - public string TemplateNo { get; set; } - - /// - /// 模板名称 - /// - [Display(Name = "TemplateName"), Description("模板名称"), MaxLength(1000, ErrorMessage = "模板名称 不能超过 1000 个字符")] - public string TemplateName { get; set; } - - /// - /// 模板类型 - /// - [Display(Name = "TemplateType"), Description("模板类型"), MaxLength(100, ErrorMessage = "模板类型 不能超过 100 个字符")] - public string TemplateType { get; set; } - - /// - /// 照片类型 - /// - public int? PhotoType { get; set; } - - /// - /// 多语Key - /// - [Display(Name = "MKey"), Description("多语Key"), MaxLength(100, ErrorMessage = "多语Key 不能超过 100 个字符")] - public string MKey { get; set; } - - /// - /// 是否发布 - /// - public int? IsPublish { get; set; } - - /// - /// 排序号 - /// - public int? SortNo { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 模板编号 + /// + [Display(Name = "TemplateNo"), Description("模板编号"), MaxLength(100, ErrorMessage = "模板编号 不能超过 100 个字符")] + public string TemplateNo { get; set; } + + /// + /// 模板名称 + /// + [Display(Name = "TemplateName"), Description("模板名称"), MaxLength(1000, ErrorMessage = "模板名称 不能超过 1000 个字符")] + public string TemplateName { get; set; } + + /// + /// 模板类型 + /// + [Display(Name = "TemplateType"), Description("模板类型"), MaxLength(100, ErrorMessage = "模板类型 不能超过 100 个字符")] + public string TemplateType { get; set; } + + /// + /// 照片类型 + /// + public int? PhotoType { get; set; } + + /// + /// 多语Key + /// + [Display(Name = "MKey"), Description("多语Key"), MaxLength(100, ErrorMessage = "多语Key 不能超过 100 个字符")] + public string MKey { get; set; } + + /// + /// 是否发布 + /// + public int? IsPublish { get; set; } + + /// + /// 排序号 + /// + public int? SortNo { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeTraining.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeTraining.Dto.Base.cs index dcce50db..f3f35248 100644 --- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeTraining.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeTraining.Dto.Base.cs @@ -13,137 +13,132 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 简历培训记录 (Dto.Base) +/// +public class Ghrh_ResumeTrainingBase { /// - /// 简历培训记录 (Dto.Base) - /// - public class Ghrh_ResumeTrainingBase - { - - /// - /// 简历ID - /// - public long? ResumeId { get; set; } - - /// - /// 开始日期 - /// - public DateTime? BeginDate { get; set; } - - /// - /// 结束日期 - /// - public DateTime? EndDate { get; set; } - - /// - /// 培训机构 - /// - [Display(Name = "TrainingOrgName"), Description("培训机构"), MaxLength(100, ErrorMessage = "培训机构 不能超过 100 个字符")] - public string TrainingOrgName { get; set; } - - /// - /// 课程名 - /// - [Display(Name = "CourseName"), Description("课程名"), MaxLength(100, ErrorMessage = "课程名 不能超过 100 个字符")] - public string CourseName { get; set; } - - /// - /// 课时 - /// - [Display(Name = "ClassHour"), Description("课时"), Column(TypeName = "decimal(20,2)")] - public decimal? ClassHour { get; set; } - - /// - /// 合格 - /// - public bool? IsPass { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 简历ID + /// + public long? ResumeId { get; set; } + + /// + /// 开始日期 + /// + public DateTime? BeginDate { get; set; } + + /// + /// 结束日期 + /// + public DateTime? EndDate { get; set; } + + /// + /// 培训机构 + /// + [Display(Name = "TrainingOrgName"), Description("培训机构"), MaxLength(100, ErrorMessage = "培训机构 不能超过 100 个字符")] + public string TrainingOrgName { get; set; } + + /// + /// 课程名 + /// + [Display(Name = "CourseName"), Description("课程名"), MaxLength(100, ErrorMessage = "课程名 不能超过 100 个字符")] + public string CourseName { get; set; } + + /// + /// 课时 + /// + [Display(Name = "ClassHour"), Description("课时"), Column(TypeName = "decimal(20,2)")] + public decimal? ClassHour { get; set; } + + /// + /// 合格 + /// + public bool? IsPass { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeWorkExp.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeWorkExp.Dto.Base.cs index 87cacb41..8fb95b31 100644 --- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeWorkExp.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeWorkExp.Dto.Base.cs @@ -13,144 +13,139 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 工作经历 (Dto.Base) +/// +public class Ghrh_ResumeWorkExpBase { /// - /// 工作经历 (Dto.Base) - /// - public class Ghrh_ResumeWorkExpBase - { - - /// - /// 简历ID - /// - public long? ResumeId { get; set; } - - /// - /// 公司名称 - /// - [Display(Name = "CompanyName"), Description("公司名称"), MaxLength(100, ErrorMessage = "公司名称 不能超过 100 个字符")] - public string CompanyName { get; set; } - - /// - /// 部门 - /// - [Display(Name = "DeptName"), Description("部门"), MaxLength(100, ErrorMessage = "部门 不能超过 100 个字符")] - public string DeptName { get; set; } - - /// - /// 离职原因 - /// - [Display(Name = "SeparationReason"), Description("离职原因"), MaxLength(256, ErrorMessage = "离职原因 不能超过 256 个字符")] - public string SeparationReason { get; set; } - - /// - /// 开始日期 - /// - public DateTime? BeginDate { get; set; } - - /// - /// 结束日期 - /// - public DateTime? EndDate { get; set; } - - /// - /// 岗位 - /// - [Display(Name = "TitleName"), Description("岗位"), MaxLength(100, ErrorMessage = "岗位 不能超过 100 个字符")] - public string TitleName { get; set; } - - /// - /// 年资 - /// - [Display(Name = "SalaryAmount"), Description("年资"), Column(TypeName = "decimal(20,2)")] - public decimal? SalaryAmount { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 简历ID + /// + public long? ResumeId { get; set; } + + /// + /// 公司名称 + /// + [Display(Name = "CompanyName"), Description("公司名称"), MaxLength(100, ErrorMessage = "公司名称 不能超过 100 个字符")] + public string CompanyName { get; set; } + + /// + /// 部门 + /// + [Display(Name = "DeptName"), Description("部门"), MaxLength(100, ErrorMessage = "部门 不能超过 100 个字符")] + public string DeptName { get; set; } + + /// + /// 离职原因 + /// + [Display(Name = "SeparationReason"), Description("离职原因"), MaxLength(256, ErrorMessage = "离职原因 不能超过 256 个字符")] + public string SeparationReason { get; set; } + + /// + /// 开始日期 + /// + public DateTime? BeginDate { get; set; } + + /// + /// 结束日期 + /// + public DateTime? EndDate { get; set; } + + /// + /// 岗位 + /// + [Display(Name = "TitleName"), Description("岗位"), MaxLength(100, ErrorMessage = "岗位 不能超过 100 个字符")] + public string TitleName { get; set; } + + /// + /// 年资 + /// + [Display(Name = "SalaryAmount"), Description("年资"), Column(TypeName = "decimal(20,2)")] + public decimal? SalaryAmount { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_Statement.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_Statement.Dto.Base.cs index 066584ae..6600c385 100644 --- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_Statement.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_Statement.Dto.Base.cs @@ -13,125 +13,121 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 声明 (Dto.Base) +/// +public class Ghrh_StatementBase { /// - /// 声明 (Dto.Base) - /// - public class Ghrh_StatementBase - { - - /// - /// 简称 - /// - [Display(Name = "ShortContent"), Description("简称"), MaxLength(100, ErrorMessage = "简称 不能超过 100 个字符")] - public string ShortContent { get; set; } - - /// - /// 内容 - /// - [Display(Name = "Content"), Description("内容"), MaxLength(2000, ErrorMessage = "内容 不能超过 2000 个字符")] - public string Content { get; set; } - - /// - /// 是否显示 - /// - public bool? IsDisplay { get; set; } - - /// - /// 是否作废 - /// - public bool? IsInvalid { get; set; } - - /// - /// 是否必填 - /// - public bool? IsRequire { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 简称 + /// + [Display(Name = "ShortContent"), Description("简称"), MaxLength(100, ErrorMessage = "简称 不能超过 100 个字符")] + public string ShortContent { get; set; } + + /// + /// 内容 + /// + [Display(Name = "Content"), Description("内容"), MaxLength(2000, ErrorMessage = "内容 不能超过 2000 个字符")] + public string Content { get; set; } + + /// + /// 是否显示 + /// + public bool? IsDisplay { get; set; } + + /// + /// 是否作废 + /// + public bool? IsInvalid { get; set; } + + /// + /// 是否必填 + /// + public bool? IsRequire { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Base/Ghro/Ghro_Dept.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghro/Ghro_Dept.Dto.Base.cs index a0b7aac4..eed76975 100644 --- a/Tiobon.Core.Model/Base/Ghro/Ghro_Dept.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghro/Ghro_Dept.Dto.Base.cs @@ -13,193 +13,189 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghro_Dept (Dto.Base) +/// +public class Ghro_DeptBase { /// - /// Ghro_Dept (Dto.Base) - /// - public class Ghro_DeptBase - { - - /// - /// DeptID - /// - public int? DeptID { get; set; } - - /// - /// DeptNo - /// - [Display(Name = "DeptNo"), Description("DeptNo"), MaxLength(100, ErrorMessage = "DeptNo 不能超过 100 个字符")] - public string DeptNo { get; set; } - - /// - /// DeptName - /// - [Display(Name = "DeptName"), Description("DeptName"), MaxLength(200, ErrorMessage = "DeptName 不能超过 200 个字符")] - public string DeptName { get; set; } - - /// - /// DeptEname - /// - [Display(Name = "DeptEname"), Description("DeptEname"), MaxLength(200, ErrorMessage = "DeptEname 不能超过 200 个字符")] - public string DeptEname { get; set; } - - /// - /// BeginDate - /// - public DateTime? BeginDate { get; set; } - - /// - /// EndDate - /// - public DateTime? EndDate { get; set; } - - /// - /// DataBelongID - /// - [Display(Name = "DataBelongID"), Description("DataBelongID"), MaxLength(-1, ErrorMessage = "DataBelongID 不能超过 -1 个字符")] - public string DataBelongID { get; set; } - - /// - /// Mkey - /// - [Display(Name = "Mkey"), Description("Mkey"), MaxLength(1000, ErrorMessage = "Mkey 不能超过 1000 个字符")] - public string Mkey { get; set; } - - /// - /// DeptType - /// - [Display(Name = "DeptType"), Description("DeptType"), MaxLength(100, ErrorMessage = "DeptType 不能超过 100 个字符")] - public string DeptType { get; set; } - - /// - /// DeptType1 - /// - [Display(Name = "DeptType1"), Description("DeptType1"), MaxLength(100, ErrorMessage = "DeptType1 不能超过 100 个字符")] - public string DeptType1 { get; set; } - - /// - /// DeptType2 - /// - [Display(Name = "DeptType2"), Description("DeptType2"), MaxLength(100, ErrorMessage = "DeptType2 不能超过 100 个字符")] - public string DeptType2 { get; set; } - - /// - /// DeptLevel - /// - [Display(Name = "DeptLevel"), Description("DeptLevel"), MaxLength(100, ErrorMessage = "DeptLevel 不能超过 100 个字符")] - public string DeptLevel { get; set; } - - /// - /// DeptManagerID - /// - public int? DeptManagerID { get; set; } - - /// - /// DeptManagerID2 - /// - public int? DeptManagerID2 { get; set; } - - /// - /// DeptAssID - /// - public int? DeptAssID { get; set; } - - /// - /// ParentDeptID - /// - public int? ParentDeptID { get; set; } - - /// - /// ParentDeptID2 - /// - public int? ParentDeptID2 { get; set; } - - /// - /// RemarkSz - /// - [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// SortNo - /// - public int? SortNo { get; set; } - - /// - /// IsDefault - /// - public int? IsDefault { get; set; } - - /// - /// AttachmentIDs - /// - [Display(Name = "AttachmentIDs"), Description("AttachmentIDs"), MaxLength(-1, ErrorMessage = "AttachmentIDs 不能超过 -1 个字符")] - public string AttachmentIDs { get; set; } - - /// - /// Reverse1 - /// - [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// Reverse2 - /// - [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// Reverse3 - /// - [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// Reverse4 - /// - [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// Reverse5 - /// - [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - - /// - /// DisplayDirection - /// - [Display(Name = "DisplayDirection"), Description("DisplayDirection"), MaxLength(100, ErrorMessage = "DisplayDirection 不能超过 100 个字符")] - public string DisplayDirection { get; set; } - - /// - /// DeptColor - /// - [Display(Name = "DeptColor"), Description("DeptColor"), MaxLength(100, ErrorMessage = "DeptColor 不能超过 100 个字符")] - public string DeptColor { get; set; } - - /// - /// DeptIcon - /// - [Display(Name = "DeptIcon"), Description("DeptIcon"), MaxLength(100, ErrorMessage = "DeptIcon 不能超过 100 个字符")] - public string DeptIcon { get; set; } - - /// - /// ShortName - /// - [Display(Name = "ShortName"), Description("ShortName"), MaxLength(200, ErrorMessage = "ShortName 不能超过 200 个字符")] - public string ShortName { get; set; } - - /// - /// DeptDataType - /// - [Display(Name = "DeptDataType"), Description("DeptDataType"), MaxLength(100, ErrorMessage = "DeptDataType 不能超过 100 个字符")] - public string DeptDataType { get; set; } - } + /// DeptID + /// + public int? DeptID { get; set; } + + /// + /// DeptNo + /// + [Display(Name = "DeptNo"), Description("DeptNo"), MaxLength(100, ErrorMessage = "DeptNo 不能超过 100 个字符")] + public string DeptNo { get; set; } + + /// + /// DeptName + /// + [Display(Name = "DeptName"), Description("DeptName"), MaxLength(200, ErrorMessage = "DeptName 不能超过 200 个字符")] + public string DeptName { get; set; } + + /// + /// DeptEname + /// + [Display(Name = "DeptEname"), Description("DeptEname"), MaxLength(200, ErrorMessage = "DeptEname 不能超过 200 个字符")] + public string DeptEname { get; set; } + + /// + /// BeginDate + /// + public DateTime? BeginDate { get; set; } + + /// + /// EndDate + /// + public DateTime? EndDate { get; set; } + + /// + /// DataBelongID + /// + [Display(Name = "DataBelongID"), Description("DataBelongID"), MaxLength(-1, ErrorMessage = "DataBelongID 不能超过 -1 个字符")] + public string DataBelongID { get; set; } + + /// + /// Mkey + /// + [Display(Name = "Mkey"), Description("Mkey"), MaxLength(1000, ErrorMessage = "Mkey 不能超过 1000 个字符")] + public string Mkey { get; set; } + + /// + /// DeptType + /// + [Display(Name = "DeptType"), Description("DeptType"), MaxLength(100, ErrorMessage = "DeptType 不能超过 100 个字符")] + public string DeptType { get; set; } + + /// + /// DeptType1 + /// + [Display(Name = "DeptType1"), Description("DeptType1"), MaxLength(100, ErrorMessage = "DeptType1 不能超过 100 个字符")] + public string DeptType1 { get; set; } + + /// + /// DeptType2 + /// + [Display(Name = "DeptType2"), Description("DeptType2"), MaxLength(100, ErrorMessage = "DeptType2 不能超过 100 个字符")] + public string DeptType2 { get; set; } + + /// + /// DeptLevel + /// + [Display(Name = "DeptLevel"), Description("DeptLevel"), MaxLength(100, ErrorMessage = "DeptLevel 不能超过 100 个字符")] + public string DeptLevel { get; set; } + + /// + /// DeptManagerID + /// + public int? DeptManagerID { get; set; } + + /// + /// DeptManagerID2 + /// + public int? DeptManagerID2 { get; set; } + + /// + /// DeptAssID + /// + public int? DeptAssID { get; set; } + + /// + /// ParentDeptID + /// + public int? ParentDeptID { get; set; } + + /// + /// ParentDeptID2 + /// + public int? ParentDeptID2 { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// AttachmentIDs + /// + [Display(Name = "AttachmentIDs"), Description("AttachmentIDs"), MaxLength(-1, ErrorMessage = "AttachmentIDs 不能超过 -1 个字符")] + public string AttachmentIDs { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// DisplayDirection + /// + [Display(Name = "DisplayDirection"), Description("DisplayDirection"), MaxLength(100, ErrorMessage = "DisplayDirection 不能超过 100 个字符")] + public string DisplayDirection { get; set; } + + /// + /// DeptColor + /// + [Display(Name = "DeptColor"), Description("DeptColor"), MaxLength(100, ErrorMessage = "DeptColor 不能超过 100 个字符")] + public string DeptColor { get; set; } + + /// + /// DeptIcon + /// + [Display(Name = "DeptIcon"), Description("DeptIcon"), MaxLength(100, ErrorMessage = "DeptIcon 不能超过 100 个字符")] + public string DeptIcon { get; set; } + + /// + /// ShortName + /// + [Display(Name = "ShortName"), Description("ShortName"), MaxLength(200, ErrorMessage = "ShortName 不能超过 200 个字符")] + public string ShortName { get; set; } + + /// + /// DeptDataType + /// + [Display(Name = "DeptDataType"), Description("DeptDataType"), MaxLength(100, ErrorMessage = "DeptDataType 不能超过 100 个字符")] + public string DeptDataType { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghrs/Ghrs_Attachment.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrs/Ghrs_Attachment.Dto.Base.cs index 4146cb62..5f4e60c0 100644 --- a/Tiobon.Core.Model/Base/Ghrs/Ghrs_Attachment.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrs/Ghrs_Attachment.Dto.Base.cs @@ -13,173 +13,169 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghrs_Attachment (Dto.Base) +/// +public class Ghrs_AttachmentBase { /// - /// Ghrs_Attachment (Dto.Base) - /// - public class Ghrs_AttachmentBase - { - - /// - /// Ghr附件记录ID - /// - public int? AttachmentID { get; set; } - - /// - /// 文件编号 - /// - [Display(Name = "AttachmentNo"), Description("文件编号"), MaxLength(100, ErrorMessage = "文件编号 不能超过 100 个字符")] - public string AttachmentNo { get; set; } - - /// - /// 说明 - /// - [Display(Name = "AttachmentName"), Description("说明"), MaxLength(200, ErrorMessage = "说明 不能超过 200 个字符")] - public string AttachmentName { get; set; } - - /// - /// 英文说明 - /// - [Display(Name = "AttachmentEname"), Description("英文说明"), MaxLength(500, ErrorMessage = "英文说明 不能超过 500 个字符")] - public string AttachmentEname { get; set; } - - /// - /// TableName - /// - [Display(Name = "TableName"), Description("TableName"), MaxLength(200, ErrorMessage = "TableName 不能超过 200 个字符")] - public string TableName { get; set; } - - /// - /// TableKeyID - /// - public int? TableKeyID { get; set; } - - /// - /// StaffID - /// - public int? StaffID { get; set; } - - /// - /// 文件类别 (基本资料/证照/加班/请假....) - /// - [Display(Name = "AttachmentType"), Description("文件类别 (基本资料/证照/加班/请假....)"), MaxLength(100, ErrorMessage = "文件类别 (基本资料/证照/加班/请假....) 不能超过 100 个字符")] - public string AttachmentType { get; set; } - - /// - /// AttachmentGroupID - /// - public int? AttachmentGroupID { get; set; } - - /// - /// 文件名 - /// - [Display(Name = "AttachFileName"), Description("文件名"), MaxLength(200, ErrorMessage = "文件名 不能超过 200 个字符")] - public string AttachFileName { get; set; } - - /// - /// AttachBinary - /// - - /// - /// 扩展名 - /// - [Display(Name = "AttachFileExtension"), Description("扩展名"), MaxLength(100, ErrorMessage = "扩展名 不能超过 100 个字符")] - public string AttachFileExtension { get; set; } - - /// - /// 大小 - /// - public int? AttachFileSize { get; set; } - - /// - /// 物理路径 - /// - [Display(Name = "PhysicsPath"), Description("物理路径"), MaxLength(500, ErrorMessage = "物理路径 不能超过 500 个字符")] - public string PhysicsPath { get; set; } - - /// - /// 相对路径 - /// - [Display(Name = "RelativePath"), Description("相对路径"), MaxLength(500, ErrorMessage = "相对路径 不能超过 500 个字符")] - public string RelativePath { get; set; } - - /// - /// ThumbnailPath - /// - [Display(Name = "ThumbnailPath"), Description("ThumbnailPath"), MaxLength(500, ErrorMessage = "ThumbnailPath 不能超过 500 个字符")] - public string ThumbnailPath { get; set; } - - /// - /// 附件网页链接地址 - /// - [Display(Name = "FileURL"), Description("附件网页链接地址"), MaxLength(500, ErrorMessage = "附件网页链接地址 不能超过 500 个字符")] - public string FileURL { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// SortNo - /// - public int? SortNo { get; set; } - - /// - /// IsDefault - /// - public int? IsDefault { get; set; } - - /// - /// CompanyID - /// - public int? CompanyID { get; set; } - - /// - /// ReverseN1 - /// - public int? ReverseN1 { get; set; } - - /// - /// ReverseD1 - /// - public DateTime? ReverseD1 { get; set; } - - /// - /// Reverse1 - /// - [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// Reverse2 - /// - [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// Reverse3 - /// - [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// Reverse4 - /// - [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// Reverse5 - /// - [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - } + /// Ghr附件记录ID + /// + public int? AttachmentID { get; set; } + + /// + /// 文件编号 + /// + [Display(Name = "AttachmentNo"), Description("文件编号"), MaxLength(100, ErrorMessage = "文件编号 不能超过 100 个字符")] + public string AttachmentNo { get; set; } + + /// + /// 说明 + /// + [Display(Name = "AttachmentName"), Description("说明"), MaxLength(200, ErrorMessage = "说明 不能超过 200 个字符")] + public string AttachmentName { get; set; } + + /// + /// 英文说明 + /// + [Display(Name = "AttachmentEname"), Description("英文说明"), MaxLength(500, ErrorMessage = "英文说明 不能超过 500 个字符")] + public string AttachmentEname { get; set; } + + /// + /// TableName + /// + [Display(Name = "TableName"), Description("TableName"), MaxLength(200, ErrorMessage = "TableName 不能超过 200 个字符")] + public string TableName { get; set; } + + /// + /// TableKeyID + /// + public int? TableKeyID { get; set; } + + /// + /// StaffID + /// + public int? StaffID { get; set; } + + /// + /// 文件类别 (基本资料/证照/加班/请假....) + /// + [Display(Name = "AttachmentType"), Description("文件类别 (基本资料/证照/加班/请假....)"), MaxLength(100, ErrorMessage = "文件类别 (基本资料/证照/加班/请假....) 不能超过 100 个字符")] + public string AttachmentType { get; set; } + + /// + /// AttachmentGroupID + /// + public int? AttachmentGroupID { get; set; } + + /// + /// 文件名 + /// + [Display(Name = "AttachFileName"), Description("文件名"), MaxLength(200, ErrorMessage = "文件名 不能超过 200 个字符")] + public string AttachFileName { get; set; } + + /// + /// AttachBinary + /// + + /// + /// 扩展名 + /// + [Display(Name = "AttachFileExtension"), Description("扩展名"), MaxLength(100, ErrorMessage = "扩展名 不能超过 100 个字符")] + public string AttachFileExtension { get; set; } + + /// + /// 大小 + /// + public int? AttachFileSize { get; set; } + + /// + /// 物理路径 + /// + [Display(Name = "PhysicsPath"), Description("物理路径"), MaxLength(500, ErrorMessage = "物理路径 不能超过 500 个字符")] + public string PhysicsPath { get; set; } + + /// + /// 相对路径 + /// + [Display(Name = "RelativePath"), Description("相对路径"), MaxLength(500, ErrorMessage = "相对路径 不能超过 500 个字符")] + public string RelativePath { get; set; } + + /// + /// ThumbnailPath + /// + [Display(Name = "ThumbnailPath"), Description("ThumbnailPath"), MaxLength(500, ErrorMessage = "ThumbnailPath 不能超过 500 个字符")] + public string ThumbnailPath { get; set; } + + /// + /// 附件网页链接地址 + /// + [Display(Name = "FileURL"), Description("附件网页链接地址"), MaxLength(500, ErrorMessage = "附件网页链接地址 不能超过 500 个字符")] + public string FileURL { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// CompanyID + /// + public int? CompanyID { get; set; } + + /// + /// ReverseN1 + /// + public int? ReverseN1 { get; set; } + + /// + /// ReverseD1 + /// + public DateTime? ReverseD1 { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghrs/Ghrs_DataRoleDetail.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrs/Ghrs_DataRoleDetail.Dto.Base.cs index 43a5ca98..d26b1616 100644 --- a/Tiobon.Core.Model/Base/Ghrs/Ghrs_DataRoleDetail.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrs/Ghrs_DataRoleDetail.Dto.Base.cs @@ -13,106 +13,102 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghrs_DataRoleDetail (Dto.Base) +/// +public class Ghrs_DataRoleDetailBase { /// - /// Ghrs_DataRoleDetail (Dto.Base) - /// - public class Ghrs_DataRoleDetailBase - { - - /// - /// DataRoleDetailId - /// - public int? DataRoleDetailId { get; set; } - - /// - /// DataRoleId - /// - public int? DataRoleId { get; set; } - - /// - /// DataTypeID - /// - public int? DataTypeID { get; set; } - - /// - /// DataID - /// - public int? DataID { get; set; } - - /// - /// DataNo - /// - [Display(Name = "DataNo"), Description("DataNo"), MaxLength(200, ErrorMessage = "DataNo 不能超过 200 个字符")] - public string DataNo { get; set; } - - /// - /// IncludeSub - /// - public int? IncludeSub { get; set; } - - /// - /// TableName - /// - [Display(Name = "TableName"), Description("TableName"), MaxLength(100, ErrorMessage = "TableName 不能超过 100 个字符")] - public string TableName { get; set; } - - /// - /// TableIDName - /// - [Display(Name = "TableIDName"), Description("TableIDName"), MaxLength(100, ErrorMessage = "TableIDName 不能超过 100 个字符")] - public string TableIDName { get; set; } - - /// - /// RemarkSz - /// - [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// SortNo - /// - public int? SortNo { get; set; } - - /// - /// IsDefault - /// - public int? IsDefault { get; set; } - - /// - /// Reverse1 - /// - [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// Reverse2 - /// - [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// Reverse3 - /// - [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// Reverse4 - /// - [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// Reverse5 - /// - [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - } + /// DataRoleDetailId + /// + public int? DataRoleDetailId { get; set; } + + /// + /// DataRoleId + /// + public int? DataRoleId { get; set; } + + /// + /// DataTypeID + /// + public int? DataTypeID { get; set; } + + /// + /// DataID + /// + public int? DataID { get; set; } + + /// + /// DataNo + /// + [Display(Name = "DataNo"), Description("DataNo"), MaxLength(200, ErrorMessage = "DataNo 不能超过 200 个字符")] + public string DataNo { get; set; } + + /// + /// IncludeSub + /// + public int? IncludeSub { get; set; } + + /// + /// TableName + /// + [Display(Name = "TableName"), Description("TableName"), MaxLength(100, ErrorMessage = "TableName 不能超过 100 个字符")] + public string TableName { get; set; } + + /// + /// TableIDName + /// + [Display(Name = "TableIDName"), Description("TableIDName"), MaxLength(100, ErrorMessage = "TableIDName 不能超过 100 个字符")] + public string TableIDName { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghrs/Ghrs_Menu.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrs/Ghrs_Menu.Dto.Base.cs index bee4740b..be5dbf2f 100644 --- a/Tiobon.Core.Model/Base/Ghrs/Ghrs_Menu.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrs/Ghrs_Menu.Dto.Base.cs @@ -13,433 +13,429 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghrs_Menu (Dto.Base) +/// +public class Ghrs_MenuBase { /// - /// Ghrs_Menu (Dto.Base) - /// - public class Ghrs_MenuBase - { - - /// - /// MenuId - /// - public int? MenuId { get; set; } - - /// - /// MenuNo - /// - [Display(Name = "MenuNo"), Description("MenuNo"), MaxLength(100, ErrorMessage = "MenuNo 不能超过 100 个字符")] - public string MenuNo { get; set; } - - /// - /// MenuName - /// - [Display(Name = "MenuName"), Description("MenuName"), MaxLength(1000, ErrorMessage = "MenuName 不能超过 1000 个字符")] - public string MenuName { get; set; } - - /// - /// MKey - /// - [Display(Name = "MKey"), Description("MKey"), MaxLength(200, ErrorMessage = "MKey 不能超过 200 个字符")] - public string MKey { get; set; } - - /// - /// IconType - /// - [Display(Name = "IconType"), Description("IconType"), MaxLength(200, ErrorMessage = "IconType 不能超过 200 个字符")] - public string IconType { get; set; } - - /// - /// MenuUrl - /// - [Display(Name = "MenuUrl"), Description("MenuUrl"), MaxLength(500, ErrorMessage = "MenuUrl 不能超过 500 个字符")] - public string MenuUrl { get; set; } - - /// - /// MenuComponent - /// - [Display(Name = "MenuComponent"), Description("MenuComponent"), MaxLength(100, ErrorMessage = "MenuComponent 不能超过 100 个字符")] - public string MenuComponent { get; set; } - - /// - /// ParentMenuId - /// - public int? ParentMenuId { get; set; } - - /// - /// MenuType - /// - [Display(Name = "MenuType"), Description("MenuType"), MaxLength(10, ErrorMessage = "MenuType 不能超过 10 个字符")] - public string MenuType { get; set; } - - /// - /// MenuType2 - /// - [Display(Name = "MenuType2"), Description("MenuType2"), MaxLength(100, ErrorMessage = "MenuType2 不能超过 100 个字符")] - public string MenuType2 { get; set; } - - /// - /// FormType - /// - [Display(Name = "FormType"), Description("FormType"), MaxLength(100, ErrorMessage = "FormType 不能超过 100 个字符")] - public string FormType { get; set; } - - /// - /// DataPrivType - /// - [Display(Name = "DataPrivType"), Description("DataPrivType"), MaxLength(100, ErrorMessage = "DataPrivType 不能超过 100 个字符")] - public string DataPrivType { get; set; } - - /// - /// FlowID - /// - public int? FlowID { get; set; } - - /// - /// MenuColDisplayType - /// - [Display(Name = "MenuColDisplayType"), Description("MenuColDisplayType"), MaxLength(100, ErrorMessage = "MenuColDisplayType 不能超过 100 个字符")] - public string MenuColDisplayType { get; set; } - - /// - /// MenuGroupTitle - /// - [Display(Name = "MenuGroupTitle"), Description("MenuGroupTitle"), MaxLength(100, ErrorMessage = "MenuGroupTitle 不能超过 100 个字符")] - public string MenuGroupTitle { get; set; } - - /// - /// QueryProcedure - /// - [Display(Name = "QueryProcedure"), Description("QueryProcedure"), MaxLength(200, ErrorMessage = "QueryProcedure 不能超过 200 个字符")] - public string QueryProcedure { get; set; } - - /// - /// EditProcedure - /// - [Display(Name = "EditProcedure"), Description("EditProcedure"), MaxLength(200, ErrorMessage = "EditProcedure 不能超过 200 个字符")] - public string EditProcedure { get; set; } - - /// - /// IUDProcedure - /// - [Display(Name = "IUDProcedure"), Description("IUDProcedure"), MaxLength(200, ErrorMessage = "IUDProcedure 不能超过 200 个字符")] - public string IUDProcedure { get; set; } - - /// - /// IsSTDMenu - /// - public int? IsSTDMenu { get; set; } - - /// - /// IsWaterMark - /// - public int? IsWaterMark { get; set; } - - /// - /// IsPWDAgain - /// - public int? IsPWDAgain { get; set; } - - /// - /// IsFromExcel - /// - public int? IsFromExcel { get; set; } - - /// - /// IsToExcel - /// - public int? IsToExcel { get; set; } - - /// - /// IsNew - /// - public int? IsNew { get; set; } - - /// - /// IsDetail - /// - public int? IsDetail { get; set; } - - /// - /// IsUpdate - /// - public int? IsUpdate { get; set; } - - /// - /// IsDel - /// - public int? IsDel { get; set; } - - /// - /// IsQuery - /// - public int? IsQuery { get; set; } - - /// - /// IsPrint - /// - public int? IsPrint { get; set; } - - /// - /// IsLog - /// - public int? IsLog { get; set; } - - /// - /// IsManual - /// - public int? IsManual { get; set; } - - /// - /// IsCopy - /// - public int? IsCopy { get; set; } - - /// - /// IsTBD1 - /// - public int? IsTBD1 { get; set; } - - /// - /// TBD1MKey - /// - [Display(Name = "TBD1MKey"), Description("TBD1MKey"), MaxLength(200, ErrorMessage = "TBD1MKey 不能超过 200 个字符")] - public string TBD1MKey { get; set; } - - /// - /// IsTBD2 - /// - public int? IsTBD2 { get; set; } - - /// - /// TBD2MKey - /// - [Display(Name = "TBD2MKey"), Description("TBD2MKey"), MaxLength(200, ErrorMessage = "TBD2MKey 不能超过 200 个字符")] - public string TBD2MKey { get; set; } - - /// - /// IsTBD3 - /// - public int? IsTBD3 { get; set; } - - /// - /// TBD3MKey - /// - [Display(Name = "TBD3MKey"), Description("TBD3MKey"), MaxLength(200, ErrorMessage = "TBD3MKey 不能超过 200 个字符")] - public string TBD3MKey { get; set; } - - /// - /// IsTBD4 - /// - public int? IsTBD4 { get; set; } - - /// - /// TBD4MKey - /// - [Display(Name = "TBD4MKey"), Description("TBD4MKey"), MaxLength(200, ErrorMessage = "TBD4MKey 不能超过 200 个字符")] - public string TBD4MKey { get; set; } - - /// - /// IsTBD5 - /// - public int? IsTBD5 { get; set; } - - /// - /// TBD5MKey - /// - [Display(Name = "TBD5MKey"), Description("TBD5MKey"), MaxLength(200, ErrorMessage = "TBD5MKey 不能超过 200 个字符")] - public string TBD5MKey { get; set; } - - /// - /// IsTBD6 - /// - public int? IsTBD6 { get; set; } - - /// - /// TBD6MKey - /// - [Display(Name = "TBD6MKey"), Description("TBD6MKey"), MaxLength(200, ErrorMessage = "TBD6MKey 不能超过 200 个字符")] - public string TBD6MKey { get; set; } - - /// - /// IsTBD7 - /// - public int? IsTBD7 { get; set; } - - /// - /// TBD7MKey - /// - [Display(Name = "TBD7MKey"), Description("TBD7MKey"), MaxLength(200, ErrorMessage = "TBD7MKey 不能超过 200 个字符")] - public string TBD7MKey { get; set; } - - /// - /// IsTBD8 - /// - public int? IsTBD8 { get; set; } - - /// - /// TBD8MKey - /// - [Display(Name = "TBD8MKey"), Description("TBD8MKey"), MaxLength(200, ErrorMessage = "TBD8MKey 不能超过 200 个字符")] - public string TBD8MKey { get; set; } - - /// - /// IsTBD9 - /// - public int? IsTBD9 { get; set; } - - /// - /// TBD9MKey - /// - [Display(Name = "TBD9MKey"), Description("TBD9MKey"), MaxLength(200, ErrorMessage = "TBD9MKey 不能超过 200 个字符")] - public string TBD9MKey { get; set; } - - /// - /// IsTBD10 - /// - public int? IsTBD10 { get; set; } - - /// - /// TBD10MKey - /// - [Display(Name = "TBD10MKey"), Description("TBD10MKey"), MaxLength(200, ErrorMessage = "TBD10MKey 不能超过 200 个字符")] - public string TBD10MKey { get; set; } - - /// - /// IsTBD11 - /// - public int? IsTBD11 { get; set; } - - /// - /// TBD11MKey - /// - [Display(Name = "TBD11MKey"), Description("TBD11MKey"), MaxLength(200, ErrorMessage = "TBD11MKey 不能超过 200 个字符")] - public string TBD11MKey { get; set; } - - /// - /// IsTBD12 - /// - public int? IsTBD12 { get; set; } - - /// - /// TBD12MKey - /// - [Display(Name = "TBD12MKey"), Description("TBD12MKey"), MaxLength(200, ErrorMessage = "TBD12MKey 不能超过 200 个字符")] - public string TBD12MKey { get; set; } - - /// - /// IsTBD13 - /// - public int? IsTBD13 { get; set; } - - /// - /// TBD13MKey - /// - [Display(Name = "TBD13MKey"), Description("TBD13MKey"), MaxLength(200, ErrorMessage = "TBD13MKey 不能超过 200 个字符")] - public string TBD13MKey { get; set; } - - /// - /// IsTBD14 - /// - public int? IsTBD14 { get; set; } - - /// - /// TBD14MKey - /// - [Display(Name = "TBD14MKey"), Description("TBD14MKey"), MaxLength(200, ErrorMessage = "TBD14MKey 不能超过 200 个字符")] - public string TBD14MKey { get; set; } - - /// - /// IsTBD15 - /// - public int? IsTBD15 { get; set; } - - /// - /// TBD15MKey - /// - [Display(Name = "TBD15MKey"), Description("TBD15MKey"), MaxLength(200, ErrorMessage = "TBD15MKey 不能超过 200 个字符")] - public string TBD15MKey { get; set; } - - /// - /// RemarkSz - /// - [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// SortNo - /// - public int? SortNo { get; set; } - - /// - /// IsDefault - /// - public int? IsDefault { get; set; } - - /// - /// Reverse1 - /// - [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// Reverse2 - /// - [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// Reverse3 - /// - [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// Reverse4 - /// - [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// Reverse5 - /// - [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - - /// - /// Reverse6 - /// - [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] - public string Reverse6 { get; set; } - - /// - /// Reverse7 - /// - [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] - public string Reverse7 { get; set; } - - /// - /// Reverse8 - /// - [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] - public string Reverse8 { get; set; } - - /// - /// Reverse9 - /// - [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] - public string Reverse9 { get; set; } - - /// - /// AppUrl - /// - [Display(Name = "AppUrl"), Description("AppUrl"), MaxLength(200, ErrorMessage = "AppUrl 不能超过 200 个字符")] - public string AppUrl { get; set; } - } + /// MenuId + /// + public int? MenuId { get; set; } + + /// + /// MenuNo + /// + [Display(Name = "MenuNo"), Description("MenuNo"), MaxLength(100, ErrorMessage = "MenuNo 不能超过 100 个字符")] + public string MenuNo { get; set; } + + /// + /// MenuName + /// + [Display(Name = "MenuName"), Description("MenuName"), MaxLength(1000, ErrorMessage = "MenuName 不能超过 1000 个字符")] + public string MenuName { get; set; } + + /// + /// MKey + /// + [Display(Name = "MKey"), Description("MKey"), MaxLength(200, ErrorMessage = "MKey 不能超过 200 个字符")] + public string MKey { get; set; } + + /// + /// IconType + /// + [Display(Name = "IconType"), Description("IconType"), MaxLength(200, ErrorMessage = "IconType 不能超过 200 个字符")] + public string IconType { get; set; } + + /// + /// MenuUrl + /// + [Display(Name = "MenuUrl"), Description("MenuUrl"), MaxLength(500, ErrorMessage = "MenuUrl 不能超过 500 个字符")] + public string MenuUrl { get; set; } + + /// + /// MenuComponent + /// + [Display(Name = "MenuComponent"), Description("MenuComponent"), MaxLength(100, ErrorMessage = "MenuComponent 不能超过 100 个字符")] + public string MenuComponent { get; set; } + + /// + /// ParentMenuId + /// + public int? ParentMenuId { get; set; } + + /// + /// MenuType + /// + [Display(Name = "MenuType"), Description("MenuType"), MaxLength(10, ErrorMessage = "MenuType 不能超过 10 个字符")] + public string MenuType { get; set; } + + /// + /// MenuType2 + /// + [Display(Name = "MenuType2"), Description("MenuType2"), MaxLength(100, ErrorMessage = "MenuType2 不能超过 100 个字符")] + public string MenuType2 { get; set; } + + /// + /// FormType + /// + [Display(Name = "FormType"), Description("FormType"), MaxLength(100, ErrorMessage = "FormType 不能超过 100 个字符")] + public string FormType { get; set; } + + /// + /// DataPrivType + /// + [Display(Name = "DataPrivType"), Description("DataPrivType"), MaxLength(100, ErrorMessage = "DataPrivType 不能超过 100 个字符")] + public string DataPrivType { get; set; } + + /// + /// FlowID + /// + public int? FlowID { get; set; } + + /// + /// MenuColDisplayType + /// + [Display(Name = "MenuColDisplayType"), Description("MenuColDisplayType"), MaxLength(100, ErrorMessage = "MenuColDisplayType 不能超过 100 个字符")] + public string MenuColDisplayType { get; set; } + + /// + /// MenuGroupTitle + /// + [Display(Name = "MenuGroupTitle"), Description("MenuGroupTitle"), MaxLength(100, ErrorMessage = "MenuGroupTitle 不能超过 100 个字符")] + public string MenuGroupTitle { get; set; } + + /// + /// QueryProcedure + /// + [Display(Name = "QueryProcedure"), Description("QueryProcedure"), MaxLength(200, ErrorMessage = "QueryProcedure 不能超过 200 个字符")] + public string QueryProcedure { get; set; } + + /// + /// EditProcedure + /// + [Display(Name = "EditProcedure"), Description("EditProcedure"), MaxLength(200, ErrorMessage = "EditProcedure 不能超过 200 个字符")] + public string EditProcedure { get; set; } + + /// + /// IUDProcedure + /// + [Display(Name = "IUDProcedure"), Description("IUDProcedure"), MaxLength(200, ErrorMessage = "IUDProcedure 不能超过 200 个字符")] + public string IUDProcedure { get; set; } + + /// + /// IsSTDMenu + /// + public int? IsSTDMenu { get; set; } + + /// + /// IsWaterMark + /// + public int? IsWaterMark { get; set; } + + /// + /// IsPWDAgain + /// + public int? IsPWDAgain { get; set; } + + /// + /// IsFromExcel + /// + public int? IsFromExcel { get; set; } + + /// + /// IsToExcel + /// + public int? IsToExcel { get; set; } + + /// + /// IsNew + /// + public int? IsNew { get; set; } + + /// + /// IsDetail + /// + public int? IsDetail { get; set; } + + /// + /// IsUpdate + /// + public int? IsUpdate { get; set; } + + /// + /// IsDel + /// + public int? IsDel { get; set; } + + /// + /// IsQuery + /// + public int? IsQuery { get; set; } + + /// + /// IsPrint + /// + public int? IsPrint { get; set; } + + /// + /// IsLog + /// + public int? IsLog { get; set; } + + /// + /// IsManual + /// + public int? IsManual { get; set; } + + /// + /// IsCopy + /// + public int? IsCopy { get; set; } + + /// + /// IsTBD1 + /// + public int? IsTBD1 { get; set; } + + /// + /// TBD1MKey + /// + [Display(Name = "TBD1MKey"), Description("TBD1MKey"), MaxLength(200, ErrorMessage = "TBD1MKey 不能超过 200 个字符")] + public string TBD1MKey { get; set; } + + /// + /// IsTBD2 + /// + public int? IsTBD2 { get; set; } + + /// + /// TBD2MKey + /// + [Display(Name = "TBD2MKey"), Description("TBD2MKey"), MaxLength(200, ErrorMessage = "TBD2MKey 不能超过 200 个字符")] + public string TBD2MKey { get; set; } + + /// + /// IsTBD3 + /// + public int? IsTBD3 { get; set; } + + /// + /// TBD3MKey + /// + [Display(Name = "TBD3MKey"), Description("TBD3MKey"), MaxLength(200, ErrorMessage = "TBD3MKey 不能超过 200 个字符")] + public string TBD3MKey { get; set; } + + /// + /// IsTBD4 + /// + public int? IsTBD4 { get; set; } + + /// + /// TBD4MKey + /// + [Display(Name = "TBD4MKey"), Description("TBD4MKey"), MaxLength(200, ErrorMessage = "TBD4MKey 不能超过 200 个字符")] + public string TBD4MKey { get; set; } + + /// + /// IsTBD5 + /// + public int? IsTBD5 { get; set; } + + /// + /// TBD5MKey + /// + [Display(Name = "TBD5MKey"), Description("TBD5MKey"), MaxLength(200, ErrorMessage = "TBD5MKey 不能超过 200 个字符")] + public string TBD5MKey { get; set; } + + /// + /// IsTBD6 + /// + public int? IsTBD6 { get; set; } + + /// + /// TBD6MKey + /// + [Display(Name = "TBD6MKey"), Description("TBD6MKey"), MaxLength(200, ErrorMessage = "TBD6MKey 不能超过 200 个字符")] + public string TBD6MKey { get; set; } + + /// + /// IsTBD7 + /// + public int? IsTBD7 { get; set; } + + /// + /// TBD7MKey + /// + [Display(Name = "TBD7MKey"), Description("TBD7MKey"), MaxLength(200, ErrorMessage = "TBD7MKey 不能超过 200 个字符")] + public string TBD7MKey { get; set; } + + /// + /// IsTBD8 + /// + public int? IsTBD8 { get; set; } + + /// + /// TBD8MKey + /// + [Display(Name = "TBD8MKey"), Description("TBD8MKey"), MaxLength(200, ErrorMessage = "TBD8MKey 不能超过 200 个字符")] + public string TBD8MKey { get; set; } + + /// + /// IsTBD9 + /// + public int? IsTBD9 { get; set; } + + /// + /// TBD9MKey + /// + [Display(Name = "TBD9MKey"), Description("TBD9MKey"), MaxLength(200, ErrorMessage = "TBD9MKey 不能超过 200 个字符")] + public string TBD9MKey { get; set; } + + /// + /// IsTBD10 + /// + public int? IsTBD10 { get; set; } + + /// + /// TBD10MKey + /// + [Display(Name = "TBD10MKey"), Description("TBD10MKey"), MaxLength(200, ErrorMessage = "TBD10MKey 不能超过 200 个字符")] + public string TBD10MKey { get; set; } + + /// + /// IsTBD11 + /// + public int? IsTBD11 { get; set; } + + /// + /// TBD11MKey + /// + [Display(Name = "TBD11MKey"), Description("TBD11MKey"), MaxLength(200, ErrorMessage = "TBD11MKey 不能超过 200 个字符")] + public string TBD11MKey { get; set; } + + /// + /// IsTBD12 + /// + public int? IsTBD12 { get; set; } + + /// + /// TBD12MKey + /// + [Display(Name = "TBD12MKey"), Description("TBD12MKey"), MaxLength(200, ErrorMessage = "TBD12MKey 不能超过 200 个字符")] + public string TBD12MKey { get; set; } + + /// + /// IsTBD13 + /// + public int? IsTBD13 { get; set; } + + /// + /// TBD13MKey + /// + [Display(Name = "TBD13MKey"), Description("TBD13MKey"), MaxLength(200, ErrorMessage = "TBD13MKey 不能超过 200 个字符")] + public string TBD13MKey { get; set; } + + /// + /// IsTBD14 + /// + public int? IsTBD14 { get; set; } + + /// + /// TBD14MKey + /// + [Display(Name = "TBD14MKey"), Description("TBD14MKey"), MaxLength(200, ErrorMessage = "TBD14MKey 不能超过 200 个字符")] + public string TBD14MKey { get; set; } + + /// + /// IsTBD15 + /// + public int? IsTBD15 { get; set; } + + /// + /// TBD15MKey + /// + [Display(Name = "TBD15MKey"), Description("TBD15MKey"), MaxLength(200, ErrorMessage = "TBD15MKey 不能超过 200 个字符")] + public string TBD15MKey { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// Reverse6 + /// + [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// Reverse7 + /// + [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// Reverse8 + /// + [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// Reverse9 + /// + [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } + + /// + /// AppUrl + /// + [Display(Name = "AppUrl"), Description("AppUrl"), MaxLength(200, ErrorMessage = "AppUrl 不能超过 200 个字符")] + public string AppUrl { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghrs/Ghrs_ParaDetail.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrs/Ghrs_ParaDetail.Dto.Base.cs index 3de15ebd..84d88c5c 100644 --- a/Tiobon.Core.Model/Base/Ghrs/Ghrs_ParaDetail.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrs/Ghrs_ParaDetail.Dto.Base.cs @@ -13,149 +13,145 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghrs_ParaDetail (Dto.Base) +/// +public class Ghrs_ParaDetailBase { /// - /// Ghrs_ParaDetail (Dto.Base) - /// - public class Ghrs_ParaDetailBase - { - - /// - /// ParaDetailId - /// - public int? ParaDetailId { get; set; } - - /// - /// ParaTypeId - /// - public int? ParaTypeId { get; set; } - - /// - /// ParaMasterId - /// - public int? ParaMasterId { get; set; } - - /// - /// ParaTypeNo - /// - [Display(Name = "ParaTypeNo"), Description("ParaTypeNo"), MaxLength(100, ErrorMessage = "ParaTypeNo 不能超过 100 个字符")] - public string ParaTypeNo { get; set; } - - /// - /// ParaMasterNo - /// - [Display(Name = "ParaMasterNo"), Description("ParaMasterNo"), MaxLength(100, ErrorMessage = "ParaMasterNo 不能超过 100 个字符")] - public string ParaMasterNo { get; set; } - - /// - /// ParaDetailNo - /// - [Display(Name = "ParaDetailNo"), Description("ParaDetailNo"), MaxLength(100, ErrorMessage = "ParaDetailNo 不能超过 100 个字符")] - public string ParaDetailNo { get; set; } - - /// - /// ParaDetailName - /// - [Display(Name = "ParaDetailName"), Description("ParaDetailName"), MaxLength(1000, ErrorMessage = "ParaDetailName 不能超过 1000 个字符")] - public string ParaDetailName { get; set; } - - /// - /// ParaDetailEname - /// - [Display(Name = "ParaDetailEname"), Description("ParaDetailEname"), MaxLength(1000, ErrorMessage = "ParaDetailEname 不能超过 1000 个字符")] - public string ParaDetailEname { get; set; } - - /// - /// IsBuildIn - /// - public int? IsBuildIn { get; set; } - - /// - /// MKey - /// - [Display(Name = "MKey"), Description("MKey"), MaxLength(200, ErrorMessage = "MKey 不能超过 200 个字符")] - public string MKey { get; set; } - - /// - /// SqlFunction - /// - [Display(Name = "SqlFunction"), Description("SqlFunction"), MaxLength(2000, ErrorMessage = "SqlFunction 不能超过 2000 个字符")] - public string SqlFunction { get; set; } - - /// - /// RemarkSz - /// - [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// SortNo - /// - public int? SortNo { get; set; } - - /// - /// IsDefault - /// - public int? IsDefault { get; set; } - - /// - /// Reverse1 - /// - [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// Reverse2 - /// - [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// Reverse3 - /// - [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// Reverse4 - /// - [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// Reverse5 - /// - [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - - /// - /// Reverse6 - /// - [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] - public string Reverse6 { get; set; } - - /// - /// Reverse7 - /// - [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] - public string Reverse7 { get; set; } - - /// - /// Reverse8 - /// - [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] - public string Reverse8 { get; set; } - - /// - /// Reverse9 - /// - [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] - public string Reverse9 { get; set; } - } + /// ParaDetailId + /// + public int? ParaDetailId { get; set; } + + /// + /// ParaTypeId + /// + public int? ParaTypeId { get; set; } + + /// + /// ParaMasterId + /// + public int? ParaMasterId { get; set; } + + /// + /// ParaTypeNo + /// + [Display(Name = "ParaTypeNo"), Description("ParaTypeNo"), MaxLength(100, ErrorMessage = "ParaTypeNo 不能超过 100 个字符")] + public string ParaTypeNo { get; set; } + + /// + /// ParaMasterNo + /// + [Display(Name = "ParaMasterNo"), Description("ParaMasterNo"), MaxLength(100, ErrorMessage = "ParaMasterNo 不能超过 100 个字符")] + public string ParaMasterNo { get; set; } + + /// + /// ParaDetailNo + /// + [Display(Name = "ParaDetailNo"), Description("ParaDetailNo"), MaxLength(100, ErrorMessage = "ParaDetailNo 不能超过 100 个字符")] + public string ParaDetailNo { get; set; } + + /// + /// ParaDetailName + /// + [Display(Name = "ParaDetailName"), Description("ParaDetailName"), MaxLength(1000, ErrorMessage = "ParaDetailName 不能超过 1000 个字符")] + public string ParaDetailName { get; set; } + + /// + /// ParaDetailEname + /// + [Display(Name = "ParaDetailEname"), Description("ParaDetailEname"), MaxLength(1000, ErrorMessage = "ParaDetailEname 不能超过 1000 个字符")] + public string ParaDetailEname { get; set; } + + /// + /// IsBuildIn + /// + public int? IsBuildIn { get; set; } + + /// + /// MKey + /// + [Display(Name = "MKey"), Description("MKey"), MaxLength(200, ErrorMessage = "MKey 不能超过 200 个字符")] + public string MKey { get; set; } + + /// + /// SqlFunction + /// + [Display(Name = "SqlFunction"), Description("SqlFunction"), MaxLength(2000, ErrorMessage = "SqlFunction 不能超过 2000 个字符")] + public string SqlFunction { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// Reverse6 + /// + [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// Reverse7 + /// + [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// Reverse8 + /// + [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// Reverse9 + /// + [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } } diff --git a/Tiobon.Core.Model/Base/Ghrs/Ghrs_User.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrs/Ghrs_User.Dto.Base.cs index 4cdae3ab..12f01a0c 100644 --- a/Tiobon.Core.Model/Base/Ghrs/Ghrs_User.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrs/Ghrs_User.Dto.Base.cs @@ -13,212 +13,208 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 系统用户 (Dto.Base) +/// +public class Ghrs_UserBase { /// - /// 系统用户 (Dto.Base) - /// - public class Ghrs_UserBase - { - - /// - /// UserId - /// - public int? UserId { get; set; } - - /// - /// UserNo - /// - [Display(Name = "UserNo"), Description("UserNo"), MaxLength(100, ErrorMessage = "UserNo 不能超过 100 个字符")] - public string UserNo { get; set; } - - /// - /// UserName - /// - [Display(Name = "UserName"), Description("UserName"), MaxLength(1000, ErrorMessage = "UserName 不能超过 1000 个字符")] - public string UserName { get; set; } - - /// - /// UserEname - /// - [Display(Name = "UserEname"), Description("UserEname"), MaxLength(1000, ErrorMessage = "UserEname 不能超过 1000 个字符")] - public string UserEname { get; set; } - - /// - /// Email - /// - [Display(Name = "Email"), Description("Email"), MaxLength(100, ErrorMessage = "Email 不能超过 100 个字符")] - public string Email { get; set; } - - /// - /// Mobile - /// - [Display(Name = "Mobile"), Description("Mobile"), MaxLength(100, ErrorMessage = "Mobile 不能超过 100 个字符")] - public string Mobile { get; set; } - - /// - /// UserStaffID - /// - public int? UserStaffID { get; set; } - - /// - /// PwdComplexityRuleID - /// - public int? PwdComplexityRuleID { get; set; } - - /// - /// UserPhotoUrl - /// - [Display(Name = "UserPhotoUrl"), Description("UserPhotoUrl"), MaxLength(200, ErrorMessage = "UserPhotoUrl 不能超过 200 个字符")] - public string UserPhotoUrl { get; set; } - - /// - /// APPID - /// - [Display(Name = "APPID"), Description("APPID"), MaxLength(100, ErrorMessage = "APPID 不能超过 100 个字符")] - public string APPID { get; set; } - - /// - /// DingID - /// - [Display(Name = "DingID"), Description("DingID"), MaxLength(100, ErrorMessage = "DingID 不能超过 100 个字符")] - public string DingID { get; set; } - - /// - /// EWeChatID - /// - [Display(Name = "EWeChatID"), Description("EWeChatID"), MaxLength(100, ErrorMessage = "EWeChatID 不能超过 100 个字符")] - public string EWeChatID { get; set; } - - /// - /// WeChatID - /// - [Display(Name = "WeChatID"), Description("WeChatID"), MaxLength(100, ErrorMessage = "WeChatID 不能超过 100 个字符")] - public string WeChatID { get; set; } - - /// - /// OtherID - /// - [Display(Name = "OtherID"), Description("OtherID"), MaxLength(100, ErrorMessage = "OtherID 不能超过 100 个字符")] - public string OtherID { get; set; } - - /// - /// UserLangID - /// - public int? UserLangID { get; set; } - - /// - /// PageStyle - /// - [Display(Name = "PageStyle"), Description("PageStyle"), MaxLength(100, ErrorMessage = "PageStyle 不能超过 100 个字符")] - public string PageStyle { get; set; } - - /// - /// UserType - /// - [Display(Name = "UserType"), Description("UserType"), MaxLength(100, ErrorMessage = "UserType 不能超过 100 个字符")] - public string UserType { get; set; } - - /// - /// BeginDate - /// - public DateTime? BeginDate { get; set; } - - /// - /// EndDate - /// - public DateTime? EndDate { get; set; } - - /// - /// SalaryPwd - /// - - /// - /// Pwd - /// - - /// - /// TempPwd - /// - - /// - /// TimeZoneID - /// - public int? TimeZoneID { get; set; } - - /// - /// TimeZoneGapMinute - /// - public int? TimeZoneGapMinute { get; set; } - - /// - /// Reverse1 - /// - [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// Reverse2 - /// - [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// Reverse3 - /// - [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// Reverse4 - /// - [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// Reverse5 - /// - [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - - /// - /// Reverse6 - /// - [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] - public string Reverse6 { get; set; } - - /// - /// Reverse7 - /// - [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] - public string Reverse7 { get; set; } - - /// - /// Reverse8 - /// - [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] - public string Reverse8 { get; set; } - - /// - /// Reverse9 - /// - [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] - public string Reverse9 { get; set; } - - /// - /// LockTime - /// - public DateTime? LockTime { get; set; } - - /// - /// APPID2 - /// - [Display(Name = "APPID2"), Description("APPID2"), MaxLength(100, ErrorMessage = "APPID2 不能超过 100 个字符")] - public string APPID2 { get; set; } - } + /// UserId + /// + public int? UserId { get; set; } + + /// + /// UserNo + /// + [Display(Name = "UserNo"), Description("UserNo"), MaxLength(100, ErrorMessage = "UserNo 不能超过 100 个字符")] + public string UserNo { get; set; } + + /// + /// UserName + /// + [Display(Name = "UserName"), Description("UserName"), MaxLength(1000, ErrorMessage = "UserName 不能超过 1000 个字符")] + public string UserName { get; set; } + + /// + /// UserEname + /// + [Display(Name = "UserEname"), Description("UserEname"), MaxLength(1000, ErrorMessage = "UserEname 不能超过 1000 个字符")] + public string UserEname { get; set; } + + /// + /// Email + /// + [Display(Name = "Email"), Description("Email"), MaxLength(100, ErrorMessage = "Email 不能超过 100 个字符")] + public string Email { get; set; } + + /// + /// Mobile + /// + [Display(Name = "Mobile"), Description("Mobile"), MaxLength(100, ErrorMessage = "Mobile 不能超过 100 个字符")] + public string Mobile { get; set; } + + /// + /// UserStaffID + /// + public int? UserStaffID { get; set; } + + /// + /// PwdComplexityRuleID + /// + public int? PwdComplexityRuleID { get; set; } + + /// + /// UserPhotoUrl + /// + [Display(Name = "UserPhotoUrl"), Description("UserPhotoUrl"), MaxLength(200, ErrorMessage = "UserPhotoUrl 不能超过 200 个字符")] + public string UserPhotoUrl { get; set; } + + /// + /// APPID + /// + [Display(Name = "APPID"), Description("APPID"), MaxLength(100, ErrorMessage = "APPID 不能超过 100 个字符")] + public string APPID { get; set; } + + /// + /// DingID + /// + [Display(Name = "DingID"), Description("DingID"), MaxLength(100, ErrorMessage = "DingID 不能超过 100 个字符")] + public string DingID { get; set; } + + /// + /// EWeChatID + /// + [Display(Name = "EWeChatID"), Description("EWeChatID"), MaxLength(100, ErrorMessage = "EWeChatID 不能超过 100 个字符")] + public string EWeChatID { get; set; } + + /// + /// WeChatID + /// + [Display(Name = "WeChatID"), Description("WeChatID"), MaxLength(100, ErrorMessage = "WeChatID 不能超过 100 个字符")] + public string WeChatID { get; set; } + + /// + /// OtherID + /// + [Display(Name = "OtherID"), Description("OtherID"), MaxLength(100, ErrorMessage = "OtherID 不能超过 100 个字符")] + public string OtherID { get; set; } + + /// + /// UserLangID + /// + public int? UserLangID { get; set; } + + /// + /// PageStyle + /// + [Display(Name = "PageStyle"), Description("PageStyle"), MaxLength(100, ErrorMessage = "PageStyle 不能超过 100 个字符")] + public string PageStyle { get; set; } + + /// + /// UserType + /// + [Display(Name = "UserType"), Description("UserType"), MaxLength(100, ErrorMessage = "UserType 不能超过 100 个字符")] + public string UserType { get; set; } + + /// + /// BeginDate + /// + public DateTime? BeginDate { get; set; } + + /// + /// EndDate + /// + public DateTime? EndDate { get; set; } + + /// + /// SalaryPwd + /// + + /// + /// Pwd + /// + + /// + /// TempPwd + /// + + /// + /// TimeZoneID + /// + public int? TimeZoneID { get; set; } + + /// + /// TimeZoneGapMinute + /// + public int? TimeZoneGapMinute { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// Reverse6 + /// + [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// Reverse7 + /// + [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// Reverse8 + /// + [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// Reverse9 + /// + [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } + + /// + /// LockTime + /// + public DateTime? LockTime { get; set; } + + /// + /// APPID2 + /// + [Display(Name = "APPID2"), Description("APPID2"), MaxLength(100, ErrorMessage = "APPID2 不能超过 100 个字符")] + public string APPID2 { get; set; } } diff --git a/Tiobon.Core.Model/Entity/AttributeManager/EntityAttribute.cs b/Tiobon.Core.Model/Entity/AttributeManager/EntityAttribute.cs index c31604a3..cdc2d700 100644 --- a/Tiobon.Core.Model/Entity/AttributeManager/EntityAttribute.cs +++ b/Tiobon.Core.Model/Entity/AttributeManager/EntityAttribute.cs @@ -1,40 +1,39 @@ -namespace Tiobon.Core.Model +namespace Tiobon.Core.Model; + +public class EntityAttribute : Attribute { - public class EntityAttribute : Attribute - { - /// - /// 真实表名(数据库表名,若没有填写默认实体为表名) - /// - public string TableName { get; set; } - /// - /// 表中文名 - /// - public string TableCnName { get; set; } - ///// - ///// 子表 - ///// - //public Type[] DetailTable { get; set; } - ///// - ///// 子表中文名 - ///// - //public string DetailTableCnName { get; set; } - ///// - ///// 数据库 - ///// - //public string DBServer { get; set; } + /// + /// 真实表名(数据库表名,若没有填写默认实体为表名) + /// + public string TableName { get; set; } + /// + /// 表中文名 + /// + public string TableCnName { get; set; } + ///// + ///// 子表 + ///// + //public Type[] DetailTable { get; set; } + ///// + ///// 子表中文名 + ///// + //public string DetailTableCnName { get; set; } + ///// + ///// 数据库 + ///// + //public string DBServer { get; set; } - ////是否开启用户数据权限,true=用户只能操作自己(及下级角色)创建的数据,如:查询、删除、修改等操作 - //public bool CurrentUserPermission { get; set; } + ////是否开启用户数据权限,true=用户只能操作自己(及下级角色)创建的数据,如:查询、删除、修改等操作 + //public bool CurrentUserPermission { get; set; } - //public Type ApiInput { get; set; } - //public Type ApiOutput { get; set; } - } + //public Type ApiInput { get; set; } + //public Type ApiOutput { get; set; } +} - public class EntityColumnAttribute : Attribute - { - /// - /// 是否校验唯一性 - /// - public bool Unique { get; set; } = true; - } +public class EntityColumnAttribute : Attribute +{ + /// + /// 是否校验唯一性 + /// + public bool Unique { get; set; } = true; } diff --git a/Tiobon.Core.Model/GlobalUsings.cs b/Tiobon.Core.Model/GlobalUsings.cs index 78bc57a9..247ac136 100644 --- a/Tiobon.Core.Model/GlobalUsings.cs +++ b/Tiobon.Core.Model/GlobalUsings.cs @@ -1,4 +1,5 @@ -global using System.ComponentModel; +global using SqlSugar; +global using System.ComponentModel; global using System.ComponentModel.DataAnnotations; global using System.ComponentModel.DataAnnotations.Schema; -global using SqlSugar; \ No newline at end of file +global using Tiobon.Core.Model.Base; \ No newline at end of file diff --git a/Tiobon.Core.Model/IDS4DbModels/ApplicationRole.cs b/Tiobon.Core.Model/IDS4DbModels/ApplicationRole.cs index c3ac96bf..a477fb25 100644 --- a/Tiobon.Core.Model/IDS4DbModels/ApplicationRole.cs +++ b/Tiobon.Core.Model/IDS4DbModels/ApplicationRole.cs @@ -1,49 +1,45 @@ -using SqlSugar; -using System; +namespace Tiobon.Core.Model.IDS4DbModels; -namespace Tiobon.Core.Model.IDS4DbModels +/// +/// 以下model 来自ids4项目,多库模式,为了调取ids4数据 +/// 角色表 +/// +[SugarTable("ApplicationRole", "角色表")] //('数据库表名','数据库表备注') +[TenantAttribute("WMTiobon_MYSQL_2")] //('代表是哪个数据库,名字是appsettings.json 的 ConnId') +public class ApplicationRole { + public bool IsDeleted { get; set; } + public string Description { get; set; } /// - /// 以下model 来自ids4项目,多库模式,为了调取ids4数据 - /// 角色表 - /// - [SugarTable("ApplicationRole", "角色表")] //('数据库表名','数据库表备注') - [TenantAttribute("WMTiobon_MYSQL_2")] //('代表是哪个数据库,名字是appsettings.json 的 ConnId') - public class ApplicationRole - { - public bool IsDeleted { get; set; } - public string Description { get; set; } - /// - ///排序 - /// - public int OrderSort { get; set; } - /// - /// 是否激活 - /// - public bool Enabled { get; set; } - /// - /// 创建ID - /// - public int? CreateId { get; set; } - /// - /// 创建者 - /// - public string CreateBy { get; set; } - /// - /// 创建时间 - /// - public DateTime? CreateTime { get; set; } = DateTime.Now; - /// - /// 修改ID - /// - public int? ModifyId { get; set; } - /// - /// 修改者 - /// - public string ModifyBy { get; set; } - /// - /// 修改时间 - /// - public DateTime? ModifyTime { get; set; } = DateTime.Now; - } + ///排序 + /// + public int OrderSort { get; set; } + /// + /// 是否激活 + /// + public bool Enabled { get; set; } + /// + /// 创建ID + /// + public int? CreateId { get; set; } + /// + /// 创建者 + /// + public string CreateBy { get; set; } + /// + /// 创建时间 + /// + public DateTime? CreateTime { get; set; } = DateTime.Now; + /// + /// 修改ID + /// + public int? ModifyId { get; set; } + /// + /// 修改者 + /// + public string ModifyBy { get; set; } + /// + /// 修改时间 + /// + public DateTime? ModifyTime { get; set; } = DateTime.Now; } diff --git a/Tiobon.Core.Model/Logs/AuditSqlLog.cs b/Tiobon.Core.Model/Logs/AuditSqlLog.cs index 672e5130..554af0be 100644 --- a/Tiobon.Core.Model/Logs/AuditSqlLog.cs +++ b/Tiobon.Core.Model/Logs/AuditSqlLog.cs @@ -1,7 +1,4 @@ -using Tiobon.Core.Model.Base; -using SqlSugar; - -namespace Tiobon.Core.Model.Logs; +namespace Tiobon.Core.Model.Logs; [Tenant("log")] [SplitTable(SplitType.Month)] //按月分表 (自带分表支持 年、季、月、周、日) diff --git a/Tiobon.Core.Model/Logs/GlobalErrorLog.cs b/Tiobon.Core.Model/Logs/GlobalErrorLog.cs index a808001b..067ca515 100644 --- a/Tiobon.Core.Model/Logs/GlobalErrorLog.cs +++ b/Tiobon.Core.Model/Logs/GlobalErrorLog.cs @@ -1,7 +1,4 @@ -using Tiobon.Core.Model.Base; -using SqlSugar; - -namespace Tiobon.Core.Model.Logs; +namespace Tiobon.Core.Model.Logs; [Tenant("log")] [SplitTable(SplitType.Month)] //按月分表 (自带分表支持 年、季、月、周、日) diff --git a/Tiobon.Core.Model/Logs/GlobalInformationLog.cs b/Tiobon.Core.Model/Logs/GlobalInformationLog.cs index ac715521..87e805e5 100644 --- a/Tiobon.Core.Model/Logs/GlobalInformationLog.cs +++ b/Tiobon.Core.Model/Logs/GlobalInformationLog.cs @@ -1,7 +1,4 @@ -using Tiobon.Core.Model.Base; -using SqlSugar; - -namespace Tiobon.Core.Model.Logs; +namespace Tiobon.Core.Model.Logs; [Tenant("log")] [SplitTable(SplitType.Month)] //按月分表 (自带分表支持 年、季、月、周、日) diff --git a/Tiobon.Core.Model/Logs/GlobalWarningLog.cs b/Tiobon.Core.Model/Logs/GlobalWarningLog.cs index 540ca1ad..0a5f875a 100644 --- a/Tiobon.Core.Model/Logs/GlobalWarningLog.cs +++ b/Tiobon.Core.Model/Logs/GlobalWarningLog.cs @@ -1,7 +1,4 @@ -using Tiobon.Core.Model.Base; -using SqlSugar; - -namespace Tiobon.Core.Model.Logs; +namespace Tiobon.Core.Model.Logs; [Tenant("log")] [SplitTable(SplitType.Month)] //按月分表 (自带分表支持 年、季、月、周、日) diff --git a/Tiobon.Core.Model/Models/BlogArticle.cs b/Tiobon.Core.Model/Models/BlogArticle.cs index 9fd44a2c..bd8e86be 100644 --- a/Tiobon.Core.Model/Models/BlogArticle.cs +++ b/Tiobon.Core.Model/Models/BlogArticle.cs @@ -1,85 +1,80 @@ -using SqlSugar; -using System; -using System.Collections.Generic; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models +/// +/// 博客文章 +/// +public class TiobonArticle { /// - /// 博客文章 + /// 主键 /// - public class TiobonArticle - { - /// - /// 主键 - /// - /// 这里之所以没用RootEntity,是想保持和之前的数据库一致,主键是bID,不是Id - [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false)] - public long bID { get; set; } + /// 这里之所以没用RootEntity,是想保持和之前的数据库一致,主键是bID,不是Id + [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false)] + public long bID { get; set; } - /// - /// 创建人 - /// - [SugarColumn(Length = 600, IsNullable = true)] - public string bsubmitter { get; set; } + /// + /// 创建人 + /// + [SugarColumn(Length = 600, IsNullable = true)] + public string bsubmitter { get; set; } - [Navigate(NavigateType.OneToOne, nameof(bsubmitter))] - public SysUserInfo User { get; set; } + [Navigate(NavigateType.OneToOne, nameof(bsubmitter))] + public SysUserInfo User { get; set; } - /// - /// 标题Tiobon - /// - [SugarColumn(Length = 256, IsNullable = true)] - public string btitle { get; set; } + /// + /// 标题Tiobon + /// + [SugarColumn(Length = 256, IsNullable = true)] + public string btitle { get; set; } - /// - /// 类别 - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string bcategory { get; set; } + /// + /// 类别 + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string bcategory { get; set; } - /// - /// 内容 - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string bcontent { get; set; } + /// + /// 内容 + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string bcontent { get; set; } - /// - /// 访问量 - /// - public int btraffic { get; set; } + /// + /// 访问量 + /// + public int btraffic { get; set; } - /// - /// 评论数量 - /// - public int bcommentNum { get; set; } + /// + /// 评论数量 + /// + public int bcommentNum { get; set; } - /// - /// 修改时间 - /// - public DateTime bUpdateTime { get; set; } + /// + /// 修改时间 + /// + public DateTime bUpdateTime { get; set; } - /// - /// 创建时间 - /// - public System.DateTime bCreateTime { get; set; } + /// + /// 创建时间 + /// + public System.DateTime bCreateTime { get; set; } - /// - /// 备注 - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string bRemark { get; set; } + /// + /// 备注 + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string bRemark { get; set; } - /// - /// 逻辑删除 - /// - [SugarColumn(IsNullable = true)] - public bool? IsDeleted { get; set; } + /// + /// 逻辑删除 + /// + [SugarColumn(IsNullable = true)] + public bool? IsDeleted { get; set; } - /// - /// 评论 - /// - [Navigate(NavigateType.OneToMany, nameof(TiobonArticleComment.bID))] - public List Comments { get; set; } - } + /// + /// 评论 + /// + [Navigate(NavigateType.OneToMany, nameof(TiobonArticleComment.bID))] + public List Comments { get; set; } } \ No newline at end of file diff --git a/Tiobon.Core.Model/Models/BlogArticleComment.cs b/Tiobon.Core.Model/Models/BlogArticleComment.cs index e9827b3f..3c09d9a3 100644 --- a/Tiobon.Core.Model/Models/BlogArticleComment.cs +++ b/Tiobon.Core.Model/Models/BlogArticleComment.cs @@ -1,6 +1,4 @@ -using SqlSugar; - -namespace Tiobon.Core.Model.Models; +namespace Tiobon.Core.Model.Models; /// /// 博客文章 评论 diff --git a/Tiobon.Core.Model/Models/Department.cs b/Tiobon.Core.Model/Models/Department.cs index 64fd9f47..1b289ccf 100644 --- a/Tiobon.Core.Model/Models/Department.cs +++ b/Tiobon.Core.Model/Models/Department.cs @@ -1,83 +1,78 @@ -using SqlSugar; -using System; +namespace Tiobon.Core.Model.Models; - -namespace Tiobon.Core.Model.Models +/// +/// 部门表 +/// +public class Department : DepartmentRoot { - /// - /// 部门表 - /// - public class Department : DepartmentRoot - { - /// - /// Desc:部门关系编码 - /// Default: - /// Nullable:True - /// - public string CodeRelationship { get; set; } - /// - /// Desc:部门名称 - /// Default: - /// Nullable:True - /// - public string Name { get; set; } - /// - /// Desc:负责人 - /// Default: - /// Nullable:True - /// - [SugarColumn(IsNullable = true)] - public string Leader { get; set; } - /// - /// Desc:排序 - /// Default: - /// Nullable:True - /// - public int OrderSort { get; set; } = 0; - /// - /// Desc:部门状态(0正常 1停用) - /// Default:0 - /// Nullable:True - /// - public bool Status { get; set; } = false; - /// - /// Desc:删除标志(0代表存在 2代表删除) - /// Default:0 - /// Nullable:True - /// - public bool IsDeleted { get; set; } = false; - /// - /// Desc:创建者 - /// Default: - /// Nullable:True - /// - [SugarColumn(IsNullable = true)] - public string CreateBy { get; set; } - /// - /// Desc:创建时间 - /// Default: - /// Nullable:True - /// - [SugarColumn(IsNullable = true)] - public DateTime? CreateTime { get; set; } - /// - /// Desc:更新者 - /// Default: - /// Nullable:True - /// - [SugarColumn(IsNullable = true)] - public string ModifyBy { get; set; } - /// - /// Desc:更新时间 - /// Default: - /// Nullable:True - /// - [SugarColumn(IsNullable = true)] - public DateTime? ModifyTime { get; set; } + /// + /// Desc:部门关系编码 + /// Default: + /// Nullable:True + /// + public string CodeRelationship { get; set; } + /// + /// Desc:部门名称 + /// Default: + /// Nullable:True + /// + public string Name { get; set; } + /// + /// Desc:负责人 + /// Default: + /// Nullable:True + /// + [SugarColumn(IsNullable = true)] + public string Leader { get; set; } + /// + /// Desc:排序 + /// Default: + /// Nullable:True + /// + public int OrderSort { get; set; } = 0; + /// + /// Desc:部门状态(0正常 1停用) + /// Default:0 + /// Nullable:True + /// + public bool Status { get; set; } = false; + /// + /// Desc:删除标志(0代表存在 2代表删除) + /// Default:0 + /// Nullable:True + /// + public bool IsDeleted { get; set; } = false; + /// + /// Desc:创建者 + /// Default: + /// Nullable:True + /// + [SugarColumn(IsNullable = true)] + public string CreateBy { get; set; } + /// + /// Desc:创建时间 + /// Default: + /// Nullable:True + /// + [SugarColumn(IsNullable = true)] + public DateTime? CreateTime { get; set; } + /// + /// Desc:更新者 + /// Default: + /// Nullable:True + /// + [SugarColumn(IsNullable = true)] + public string ModifyBy { get; set; } + /// + /// Desc:更新时间 + /// Default: + /// Nullable:True + /// + [SugarColumn(IsNullable = true)] + public DateTime? ModifyTime { get; set; } - [SugarColumn(IsIgnore = true)] - public bool hasChildren { get; set; } = true; - } + [SugarColumn(IsIgnore = true)] + public bool hasChildren { get; set; } = true; } \ No newline at end of file diff --git a/Tiobon.Core.Model/Models/GblLogAudit.cs b/Tiobon.Core.Model/Models/GblLogAudit.cs index 7ece38f7..53ae6527 100644 --- a/Tiobon.Core.Model/Models/GblLogAudit.cs +++ b/Tiobon.Core.Model/Models/GblLogAudit.cs @@ -1,70 +1,66 @@ -using SqlSugar; -using System; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models +/// +/// 用户团队表 +/// +[SugarTable("GblLogAudit", TableDescription = "日志审计")] +public class GblLogAudit { - /// - /// 用户团队表 - /// - [SugarTable("GblLogAudit", TableDescription = "日志审计")] - public class GblLogAudit - { - /// - ///ID - /// - [SugarColumn(ColumnDescription = "ID", IsNullable = false, IsPrimaryKey = true, IsIdentity = false)] - public long Id { get; set; } + /// + ///ID + /// + [SugarColumn(ColumnDescription = "ID", IsNullable = false, IsPrimaryKey = true, IsIdentity = false)] + public long Id { get; set; } - /// - ///HttpContext.TraceIdentifier 事件链路ID(获取或设置一个唯一标识符,用于在跟踪日志中表示此请求。) - /// - [SugarColumn(ColumnDescription = "事件链路ID", IsNullable = false, IsPrimaryKey = false, IsIdentity = false, Length = 255)] - public string TraceId { get; set; } + /// + ///HttpContext.TraceIdentifier 事件链路ID(获取或设置一个唯一标识符,用于在跟踪日志中表示此请求。) + /// + [SugarColumn(ColumnDescription = "事件链路ID", IsNullable = false, IsPrimaryKey = false, IsIdentity = false, Length = 255)] + public string TraceId { get; set; } - /// - ///时间 - /// - [SugarColumn(ColumnDescription = "时间", IsNullable = false, IsPrimaryKey = false, IsIdentity = false)] - public DateTime Date { get; set; } = DateTime.Now; + /// + ///时间 + /// + [SugarColumn(ColumnDescription = "时间", IsNullable = false, IsPrimaryKey = false, IsIdentity = false)] + public DateTime Date { get; set; } = DateTime.Now; - /// - ///线程 - /// - [SugarColumn(ColumnDescription = "线程", IsNullable = false, IsPrimaryKey = false, IsIdentity = false, Length = 255)] - public string Thread { get; set; } + /// + ///线程 + /// + [SugarColumn(ColumnDescription = "线程", IsNullable = false, IsPrimaryKey = false, IsIdentity = false, Length = 255)] + public string Thread { get; set; } - /// - ///等级 - /// - [SugarColumn(ColumnDescription = "等级", IsNullable = false, IsPrimaryKey = false, IsIdentity = false, Length = 255)] - public string Level { get; set; } - /// - ///记录器 - /// - [SugarColumn(ColumnDescription = "记录器", IsNullable = false, IsPrimaryKey = false, IsIdentity = false, Length = 255)] - public string Logger { get; set; } - /// - ///日志类型 - /// - [SugarColumn(ColumnDescription = "日志类型", IsNullable = false, IsPrimaryKey = false, IsIdentity = false, Length = 255)] - public string LogType { get; set; } - /// - ///数据类型 - /// - [SugarColumn(ColumnDescription = "数据类型", IsNullable = false, IsPrimaryKey = false, IsIdentity = false, Length = 255)] - public string DataType { get; set; } + /// + ///等级 + /// + [SugarColumn(ColumnDescription = "等级", IsNullable = false, IsPrimaryKey = false, IsIdentity = false, Length = 255)] + public string Level { get; set; } + /// + ///记录器 + /// + [SugarColumn(ColumnDescription = "记录器", IsNullable = false, IsPrimaryKey = false, IsIdentity = false, Length = 255)] + public string Logger { get; set; } + /// + ///日志类型 + /// + [SugarColumn(ColumnDescription = "日志类型", IsNullable = false, IsPrimaryKey = false, IsIdentity = false, Length = 255)] + public string LogType { get; set; } + /// + ///数据类型 + /// + [SugarColumn(ColumnDescription = "数据类型", IsNullable = false, IsPrimaryKey = false, IsIdentity = false, Length = 255)] + public string DataType { get; set; } - /// - ///错误信息 - /// - [SugarColumn(ColumnDescription = "错误信息", IsNullable = false, IsPrimaryKey = false, IsIdentity = false, Length = 2000)] - public string Message { get; set; } + /// + ///错误信息 + /// + [SugarColumn(ColumnDescription = "错误信息", IsNullable = false, IsPrimaryKey = false, IsIdentity = false, Length = 2000)] + public string Message { get; set; } - /// - ///异常 - /// - [SugarColumn(ColumnDescription = "异常", IsNullable = true, IsPrimaryKey = false, IsIdentity = false, Length = 2000)] - public string Exception { get; set; } + /// + ///异常 + /// + [SugarColumn(ColumnDescription = "异常", IsNullable = true, IsPrimaryKey = false, IsIdentity = false, Length = 2000)] + public string Exception { get; set; } - } } \ No newline at end of file diff --git a/Tiobon.Core.Model/Models/Ghra/Ghra_StaffSocialRelation.cs b/Tiobon.Core.Model/Models/Ghra/Ghra_StaffSocialRelation.cs index 35c472ab..37747014 100644 --- a/Tiobon.Core.Model/Models/Ghra/Ghra_StaffSocialRelation.cs +++ b/Tiobon.Core.Model/Models/Ghra/Ghra_StaffSocialRelation.cs @@ -27,7 +27,7 @@ public class Ghra_StaffSocialRelation : BasePoco1 /// /// StaffSocialRelationID /// -[SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = true), Display(Name = "表主键")] + [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = true), Display(Name = "表主键")] public int? StaffSocialRelationID { get; set; } /// diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_CourseWareAttachment.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_CourseWareAttachment.cs index 11899bc1..121a7b4e 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_CourseWareAttachment.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_CourseWareAttachment.cs @@ -14,133 +14,132 @@ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models +namespace Tiobon.Core.Model.Models; + + +/// +/// 课件附件 (Model) +/// +[SugarTable("Ghre_CourseWareAttachment", "Ghre_CourseWareAttachment"), Entity(TableCnName = "课件附件", TableName = "Ghre_CourseWareAttachment")] +public class Ghre_CourseWareAttachment : BasePoco { /// - /// 课件附件 (Model) - /// - [SugarTable("Ghre_CourseWareAttachment", "Ghre_CourseWareAttachment"), Entity(TableCnName = "课件附件", TableName = "Ghre_CourseWareAttachment")] - public class Ghre_CourseWareAttachment : BasePoco - { - - /// - /// 课件ID - /// - public long? CourseWareId { get; set; } - - /// - /// 附件名 - /// - [Display(Name = "AttachmentName"), Description("附件名"), MaxLength(64, ErrorMessage = "附件名 不能超过 64 个字符")] - public string AttachmentName { get; set; } - - /// - /// 扩展名 - /// - [Display(Name = "AttachFileExtension"), Description("扩展名"), MaxLength(256, ErrorMessage = "扩展名 不能超过 256 个字符")] - public string AttachFileExtension { get; set; } - - /// - /// 路径 - /// - [Display(Name = "RelativePath"), Description("路径"), MaxLength(2000, ErrorMessage = "路径 不能超过 2000 个字符")] - public string RelativePath { get; set; } - - /// - /// 大小 - /// - public int? AttachFileSize { get; set; } - - /// - /// 是否允许下载 - /// - public bool? IsAllowDownload { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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? SortNo { get; set; } - } + /// 课件ID + /// + public long? CourseWareId { get; set; } + + /// + /// 附件名 + /// + [Display(Name = "AttachmentName"), Description("附件名"), MaxLength(64, ErrorMessage = "附件名 不能超过 64 个字符")] + public string AttachmentName { get; set; } + + /// + /// 扩展名 + /// + [Display(Name = "AttachFileExtension"), Description("扩展名"), MaxLength(256, ErrorMessage = "扩展名 不能超过 256 个字符")] + public string AttachFileExtension { get; set; } + + /// + /// 路径 + /// + [Display(Name = "RelativePath"), Description("路径"), MaxLength(2000, ErrorMessage = "路径 不能超过 2000 个字符")] + public string RelativePath { get; set; } + + /// + /// 大小 + /// + public int? AttachFileSize { get; set; } + + /// + /// 是否允许下载 + /// + public bool? IsAllowDownload { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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? SortNo { get; set; } } diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecordDetail.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecordDetail.cs index fe37081a..9a0d7880 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecordDetail.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecordDetail.cs @@ -14,142 +14,141 @@ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models +namespace Tiobon.Core.Model.Models; + + +/// +/// Ghre_ExamRecordDetail (Model) +/// +[SugarTable("Ghre_ExamRecordDetail", "Ghre_ExamRecordDetail"), Entity(TableCnName = "Ghre_ExamRecordDetail", TableName = "Ghre_ExamRecordDetail")] +public class Ghre_ExamRecordDetail : BasePoco { /// - /// Ghre_ExamRecordDetail (Model) - /// - [SugarTable("Ghre_ExamRecordDetail", "Ghre_ExamRecordDetail"), Entity(TableCnName = "Ghre_ExamRecordDetail", TableName = "Ghre_ExamRecordDetail")] - public class Ghre_ExamRecordDetail : BasePoco - { - - /// - /// 答题记录ID - /// - public long? ExamRecordId { get; set; } - - /// - /// 试卷ID - /// - public long? ExamPaperId { get; set; } - - /// - /// 试卷题目ID - /// - public long? ExamPaperQuestionId { get; set; } - - /// - /// 题目ID - /// - public long? QuestionId { get; set; } - - /// - /// 员工ID - /// - public long? StaffId { get; set; } - - /// - /// 得分 - /// - [Display(Name = "Score"), Description("得分"), Column(TypeName = "decimal(20,2)")] - public decimal? Score { get; set; } - - /// - /// 调整得分 - /// - [Display(Name = "AdjustScore"), Description("调整得分"), Column(TypeName = "decimal(20,2)")] - public decimal? AdjustScore { get; set; } - - /// - /// 是否正确 - /// - public bool? IsCorrect { get; set; } - - /// - /// 排序号 - /// - public int? TaxisNo { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { 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; } - } + /// 答题记录ID + /// + public long? ExamRecordId { get; set; } + + /// + /// 试卷ID + /// + public long? ExamPaperId { get; set; } + + /// + /// 试卷题目ID + /// + public long? ExamPaperQuestionId { get; set; } + + /// + /// 题目ID + /// + public long? QuestionId { get; set; } + + /// + /// 员工ID + /// + public long? StaffId { get; set; } + + /// + /// 得分 + /// + [Display(Name = "Score"), Description("得分"), Column(TypeName = "decimal(20,2)")] + public decimal? Score { get; set; } + + /// + /// 调整得分 + /// + [Display(Name = "AdjustScore"), Description("调整得分"), Column(TypeName = "decimal(20,2)")] + public decimal? AdjustScore { get; set; } + + /// + /// 是否正确 + /// + public bool? IsCorrect { get; set; } + + /// + /// 排序号 + /// + public int? TaxisNo { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { 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; } } diff --git a/Tiobon.Core.Model/Models/Guestbook.cs b/Tiobon.Core.Model/Models/Guestbook.cs index 0e10c125..346fd5b2 100644 --- a/Tiobon.Core.Model/Models/Guestbook.cs +++ b/Tiobon.Core.Model/Models/Guestbook.cs @@ -1,51 +1,47 @@ -using SqlSugar; -using System; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models +public class Guestbook : RootEntityTkey { - public class Guestbook : RootEntityTkey - { - /// 博客ID - /// - /// - public long? TiobonId { get; set; } - /// 创建时间 - /// - /// - public DateTime createdate { get; set; } + /// 博客ID + /// + /// + public long? TiobonId { get; set; } + /// 创建时间 + /// + /// + public DateTime createdate { get; set; } - [SugarColumn(Length = 2000, IsNullable = true)] - public string username { get; set; } + [SugarColumn(Length = 2000, IsNullable = true)] + public string username { get; set; } - /// 手机 - /// - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string phone { get; set; } - /// qq - /// - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string QQ { get; set; } + /// 手机 + /// + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string phone { get; set; } + /// qq + /// + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string QQ { get; set; } - /// 留言内容 - /// - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string body { get; set; } - /// ip地址 - /// - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string ip { get; set; } + /// 留言内容 + /// + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string body { get; set; } + /// ip地址 + /// + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string ip { get; set; } - /// 是否显示在前台,0否1是 - /// - /// - public bool isshow { get; set; } + /// 是否显示在前台,0否1是 + /// + /// + public bool isshow { get; set; } - [SugarColumn(IsIgnore = true)] - public TiobonArticle Tiobonarticle { get; set; } - } + [SugarColumn(IsIgnore = true)] + public TiobonArticle Tiobonarticle { get; set; } } diff --git a/Tiobon.Core.Model/Models/Modules.cs b/Tiobon.Core.Model/Models/Modules.cs index 93a8ad6c..ec59a62f 100644 --- a/Tiobon.Core.Model/Models/Modules.cs +++ b/Tiobon.Core.Model/Models/Modules.cs @@ -1,113 +1,109 @@ -using SqlSugar; -using System; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models +/// +/// 接口API地址信息表 +/// +public class Modules : ModulesRoot { - /// - /// 接口API地址信息表 - /// - public class Modules : ModulesRoot + public Modules() { - public Modules() - { - //this.ChildModule = new List(); - //this.ModulePermission = new List(); - //this.RoleModulePermission = new List(); - } + //this.ChildModule = new List(); + //this.ModulePermission = new List(); + //this.RoleModulePermission = new List(); + } - /// - ///获取或设置是否禁用,逻辑上的删除,非物理删除 - /// - [SugarColumn(IsNullable = true)] - public bool? IsDeleted { get; set; } + /// + ///获取或设置是否禁用,逻辑上的删除,非物理删除 + /// + [SugarColumn(IsNullable = true)] + public bool? IsDeleted { get; set; } - /// - /// 名称 - /// - [SugarColumn(Length = 50, IsNullable = true)] - public string Name { get; set; } - /// - /// 菜单链接地址 - /// - [SugarColumn(Length = 100, IsNullable = true)] - public string LinkUrl { get; set; } - /// - /// 区域名称 - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string Area { get; set; } - /// - /// 控制器名称 - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string Controller { get; set; } - /// - /// Action名称 - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string Action { get; set; } - /// - /// 图标 - /// - [SugarColumn(Length = 100, IsNullable = true)] - public string Icon { get; set; } - /// - /// 菜单编号 - /// - [SugarColumn(Length = 10, IsNullable = true)] - public string Code { get; set; } - /// - /// 排序 - /// - public int OrderSort { get; set; } - /// - /// /描述 - /// - [SugarColumn(Length = 100, IsNullable = true)] - public string Description { get; set; } - /// - /// 是否是右侧菜单 - /// - public bool IsMenu { get; set; } - /// - /// 是否激活 - /// - public bool Enabled { get; set; } - /// - /// 创建ID - /// - [SugarColumn(IsNullable = true)] - public long? CreateId { get; set; } - /// - /// 创建者 - /// - [SugarColumn(Length = 50, IsNullable = true)] - public string CreateBy { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(IsNullable = true)] - public DateTime CreateTime { get; set; } = DateTime.Now; - /// - /// 修改ID - /// - [SugarColumn(IsNullable = true)] - public long? ModifyId { get; set; } - /// - /// 修改者 - /// - [SugarColumn(Length = 100, IsNullable = true)] - public string ModifyBy { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(IsNullable = true)] - public DateTime? ModifyTime { get; set; } = DateTime.Now; + /// + /// 名称 + /// + [SugarColumn(Length = 50, IsNullable = true)] + public string Name { get; set; } + /// + /// 菜单链接地址 + /// + [SugarColumn(Length = 100, IsNullable = true)] + public string LinkUrl { get; set; } + /// + /// 区域名称 + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string Area { get; set; } + /// + /// 控制器名称 + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string Controller { get; set; } + /// + /// Action名称 + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string Action { get; set; } + /// + /// 图标 + /// + [SugarColumn(Length = 100, IsNullable = true)] + public string Icon { get; set; } + /// + /// 菜单编号 + /// + [SugarColumn(Length = 10, IsNullable = true)] + public string Code { get; set; } + /// + /// 排序 + /// + public int OrderSort { get; set; } + /// + /// /描述 + /// + [SugarColumn(Length = 100, IsNullable = true)] + public string Description { get; set; } + /// + /// 是否是右侧菜单 + /// + public bool IsMenu { get; set; } + /// + /// 是否激活 + /// + public bool Enabled { get; set; } + /// + /// 创建ID + /// + [SugarColumn(IsNullable = true)] + public long? CreateId { get; set; } + /// + /// 创建者 + /// + [SugarColumn(Length = 50, IsNullable = true)] + public string CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(IsNullable = true)] + public DateTime CreateTime { get; set; } = DateTime.Now; + /// + /// 修改ID + /// + [SugarColumn(IsNullable = true)] + public long? ModifyId { get; set; } + /// + /// 修改者 + /// + [SugarColumn(Length = 100, IsNullable = true)] + public string ModifyBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(IsNullable = true)] + public DateTime? ModifyTime { get; set; } = DateTime.Now; - //public virtual Module ParentModule { get; set; } - //public virtual ICollection ChildModule { get; set; } - //public virtual ICollection ModulePermission { get; set; } - //public virtual ICollection RoleModulePermission { get; set; } - } + //public virtual Module ParentModule { get; set; } + //public virtual ICollection ChildModule { get; set; } + //public virtual ICollection ModulePermission { get; set; } + //public virtual ICollection RoleModulePermission { get; set; } } diff --git a/Tiobon.Core.Model/Models/OperateLog.cs b/Tiobon.Core.Model/Models/OperateLog.cs index 0221351b..1782b358 100644 --- a/Tiobon.Core.Model/Models/OperateLog.cs +++ b/Tiobon.Core.Model/Models/OperateLog.cs @@ -1,60 +1,56 @@ -using SqlSugar; -using System; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models +/// +/// 日志记录 +/// +public class OperateLog : RootEntityTkey { + /// - /// 日志记录 + ///获取或设置是否禁用,逻辑上的删除,非物理删除 /// - public class OperateLog : RootEntityTkey - { - - /// - ///获取或设置是否禁用,逻辑上的删除,非物理删除 - /// - [SugarColumn(IsNullable = true)] - public bool? IsDeleted { get; set; } - /// - /// 区域名 - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string Area { get; set; } - /// - /// 区域控制器名 - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string Controller { get; set; } - /// - /// Action名称 - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string Action { get; set; } - /// - /// IP地址 - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string IPAddress { get; set; } - /// - /// 描述 - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string Description { get; set; } - /// - /// 登录时间 - /// - [SugarColumn(IsNullable = true)] - public DateTime? LogTime { get; set; } - /// - /// 登录名称 - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string LoginName { get; set; } - /// - /// 用户ID - /// - public int UserId { get; set; } + [SugarColumn(IsNullable = true)] + public bool? IsDeleted { get; set; } + /// + /// 区域名 + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string Area { get; set; } + /// + /// 区域控制器名 + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string Controller { get; set; } + /// + /// Action名称 + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string Action { get; set; } + /// + /// IP地址 + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string IPAddress { get; set; } + /// + /// 描述 + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string Description { get; set; } + /// + /// 登录时间 + /// + [SugarColumn(IsNullable = true)] + public DateTime? LogTime { get; set; } + /// + /// 登录名称 + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string LoginName { get; set; } + /// + /// 用户ID + /// + public int UserId { get; set; } - [SugarColumn(IsIgnore = true)] - public virtual SysUserInfo User { get; set; } - } + [SugarColumn(IsIgnore = true)] + public virtual SysUserInfo User { get; set; } } diff --git a/Tiobon.Core.Model/Models/PasswordLib.cs b/Tiobon.Core.Model/Models/PasswordLib.cs index 26983e09..a86b0444 100644 --- a/Tiobon.Core.Model/Models/PasswordLib.cs +++ b/Tiobon.Core.Model/Models/PasswordLib.cs @@ -1,57 +1,53 @@ -using SqlSugar; -using System; - -namespace Tiobon.Core.Model.Models +namespace Tiobon.Core.Model.Models; + +/// +/// 密码库表 +/// +[SugarTable("PasswordLib", "密码库表")]//('数据库表名','数据库表备注') +//[TenantAttribute("WMTiobon_MYSQL_2")] //('代表是哪个数据库,名字是appsettings.json 的 ConnId') +public class PasswordLib { + [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false)] + public long PLID { get; set; } + /// - /// 密码库表 + ///获取或设置是否禁用,逻辑上的删除,非物理删除 /// - [SugarTable("PasswordLib", "密码库表")]//('数据库表名','数据库表备注') - //[TenantAttribute("WMTiobon_MYSQL_2")] //('代表是哪个数据库,名字是appsettings.json 的 ConnId') - public class PasswordLib - { - [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false)] - public long PLID { get; set; } - - /// - ///获取或设置是否禁用,逻辑上的删除,非物理删除 - /// - [SugarColumn(IsNullable = true)] - public bool? IsDeleted { get; set; } + [SugarColumn(IsNullable = true)] + public bool? IsDeleted { get; set; } - [SugarColumn(Length = 200, IsNullable = true)] - public string plURL { get; set; } + [SugarColumn(Length = 200, IsNullable = true)] + public string plURL { get; set; } - [SugarColumn(Length = 100, IsNullable = true)] - public string plPWD { get; set; } + [SugarColumn(Length = 100, IsNullable = true)] + public string plPWD { get; set; } - [SugarColumn(Length = 200, IsNullable = true)] - public string plAccountName { get; set; } + [SugarColumn(Length = 200, IsNullable = true)] + public string plAccountName { get; set; } - [SugarColumn(IsNullable = true)] - public int? plStatus { get; set; } + [SugarColumn(IsNullable = true)] + public int? plStatus { get; set; } - [SugarColumn(IsNullable = true)] - public int? plErrorCount { get; set; } + [SugarColumn(IsNullable = true)] + public int? plErrorCount { get; set; } - [SugarColumn(Length = 200, IsNullable = true)] - public string plHintPwd { get; set; } + [SugarColumn(Length = 200, IsNullable = true)] + public string plHintPwd { get; set; } - [SugarColumn(Length = 200, IsNullable = true)] - public string plHintquestion { get; set; } + [SugarColumn(Length = 200, IsNullable = true)] + public string plHintquestion { get; set; } - [SugarColumn(IsNullable = true)] - public DateTime? plCreateTime { get; set; } + [SugarColumn(IsNullable = true)] + public DateTime? plCreateTime { get; set; } - [SugarColumn(IsNullable = true)] - public DateTime? plUpdateTime { get; set; } + [SugarColumn(IsNullable = true)] + public DateTime? plUpdateTime { get; set; } - [SugarColumn(IsNullable = true)] - public DateTime? plLastErrTime { get; set; } + [SugarColumn(IsNullable = true)] + public DateTime? plLastErrTime { get; set; } - [SugarColumn(Length = 200, IsNullable = true)] - public string test { get; set; } + [SugarColumn(Length = 200, IsNullable = true)] + public string test { get; set; } - } } diff --git a/Tiobon.Core.Model/Models/Permission.cs b/Tiobon.Core.Model/Models/Permission.cs index 36a21732..1f764b5d 100644 --- a/Tiobon.Core.Model/Models/Permission.cs +++ b/Tiobon.Core.Model/Models/Permission.cs @@ -1,125 +1,120 @@ -using SqlSugar; -using System; -using System.Collections.Generic; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models +/// +/// 路由菜单表 +/// +public class Permission : PermissionRoot { - /// - /// 路由菜单表 - /// - public class Permission : PermissionRoot + public Permission() { - public Permission() - { - //this.ModulePermission = new List(); - //this.RoleModulePermission = new List(); - } + //this.ModulePermission = new List(); + //this.RoleModulePermission = new List(); + } - /// - /// 菜单执行Action名 - /// - [SugarColumn(Length = 50, IsNullable = true)] - public string Code { get; set; } - /// - /// 菜单显示名(如用户页、编辑(按钮)、删除(按钮)) - /// - [SugarColumn(Length = 50, IsNullable = true)] - public string Name { get; set; } - /// - /// 是否是按钮 - /// - public bool IsButton { get; set; } = false; - /// - /// 是否是隐藏菜单 - /// - [SugarColumn(IsNullable = true)] - public bool? IsHide { get; set; } = false; - /// - /// 是否keepAlive - /// - [SugarColumn(IsNullable = true)] - public bool? IskeepAlive { get; set; } = false; + /// + /// 菜单执行Action名 + /// + [SugarColumn(Length = 50, IsNullable = true)] + public string Code { get; set; } + /// + /// 菜单显示名(如用户页、编辑(按钮)、删除(按钮)) + /// + [SugarColumn(Length = 50, IsNullable = true)] + public string Name { get; set; } + /// + /// 是否是按钮 + /// + public bool IsButton { get; set; } = false; + /// + /// 是否是隐藏菜单 + /// + [SugarColumn(IsNullable = true)] + public bool? IsHide { get; set; } = false; + /// + /// 是否keepAlive + /// + [SugarColumn(IsNullable = true)] + public bool? IskeepAlive { get; set; } = false; - /// - /// 按钮事件 - /// - [SugarColumn(Length = 100, IsNullable = true)] - public string Func { get; set; } + /// + /// 按钮事件 + /// + [SugarColumn(Length = 100, IsNullable = true)] + public string Func { get; set; } - /// - /// 排序 - /// - public int OrderSort { get; set; } - /// - /// 菜单图标 - /// - [SugarColumn(Length = 100, IsNullable = true)] - public string Icon { get; set; } - /// - /// 菜单描述 - /// - [SugarColumn(Length = 100, IsNullable = true)] - public string Description { get; set; } - /// - /// 激活状态 - /// - public bool Enabled { get; set; } - /// - /// 创建ID - /// - [SugarColumn(IsNullable = true)] - public long? CreateId { get; set; } - /// - /// 创建者 - /// - [SugarColumn(Length = 50, IsNullable = true)] - public string CreateBy { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(IsNullable = true)] - public DateTime? CreateTime { get; set; } = DateTime.Now; - /// - /// 修改ID - /// - [SugarColumn(IsNullable = true)] - public long? ModifyId { get; set; } - /// - /// 修改者 - /// - [SugarColumn(Length = 50, IsNullable = true)] - public string ModifyBy { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(IsNullable = true)] - public DateTime? ModifyTime { get; set; } = DateTime.Now; + /// + /// 排序 + /// + public int OrderSort { get; set; } + /// + /// 菜单图标 + /// + [SugarColumn(Length = 100, IsNullable = true)] + public string Icon { get; set; } + /// + /// 菜单描述 + /// + [SugarColumn(Length = 100, IsNullable = true)] + public string Description { get; set; } + /// + /// 激活状态 + /// + public bool Enabled { get; set; } + /// + /// 创建ID + /// + [SugarColumn(IsNullable = true)] + public long? CreateId { get; set; } + /// + /// 创建者 + /// + [SugarColumn(Length = 50, IsNullable = true)] + public string CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(IsNullable = true)] + public DateTime? CreateTime { get; set; } = DateTime.Now; + /// + /// 修改ID + /// + [SugarColumn(IsNullable = true)] + public long? ModifyId { get; set; } + /// + /// 修改者 + /// + [SugarColumn(Length = 50, IsNullable = true)] + public string ModifyBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(IsNullable = true)] + public DateTime? ModifyTime { get; set; } = DateTime.Now; - /// - ///获取或设置是否禁用,逻辑上的删除,非物理删除 - /// - [SugarColumn(IsNullable = true)] - public bool? IsDeleted { get; set; } + /// + ///获取或设置是否禁用,逻辑上的删除,非物理删除 + /// + [SugarColumn(IsNullable = true)] + public bool? IsDeleted { get; set; } - [SugarColumn(IsIgnore = true)] - public List PnameArr { get; set; } = new List(); - [SugarColumn(IsIgnore = true)] - public List PCodeArr { get; set; } = new List(); - [SugarColumn(IsIgnore = true)] - public string MName { get; set; } + [SugarColumn(IsIgnore = true)] + public List PnameArr { get; set; } = new List(); + [SugarColumn(IsIgnore = true)] + public List PCodeArr { get; set; } = new List(); + [SugarColumn(IsIgnore = true)] + public string MName { get; set; } - [SugarColumn(IsIgnore = true)] - public bool hasChildren { get; set; } = true; + [SugarColumn(IsIgnore = true)] + public bool hasChildren { get; set; } = true; - [SugarColumn(IsIgnore = true)] - public List Children { get; set; } = new List(); + [SugarColumn(IsIgnore = true)] + public List Children { get; set; } = new List(); - [SugarColumn(IsIgnore = true)] - public Modules Module { get; set; } + [SugarColumn(IsIgnore = true)] + public Modules Module { get; set; } - //public virtual ICollection ModulePermission { get; set; } - //public virtual ICollection RoleModulePermission { get; set; } - } + //public virtual ICollection ModulePermission { get; set; } + //public virtual ICollection RoleModulePermission { get; set; } } diff --git a/Tiobon.Core.Model/Models/Role.cs b/Tiobon.Core.Model/Models/Role.cs index 29c4cccf..9e9ca67f 100644 --- a/Tiobon.Core.Model/Models/Role.cs +++ b/Tiobon.Core.Model/Models/Role.cs @@ -1,96 +1,92 @@ -using SqlSugar; -using System; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models +/// +/// 角色表 +/// +public class Role : RootEntityTkey { - /// - /// 角色表 - /// - public class Role : RootEntityTkey + public Role() + { + OrderSort = 1; + CreateTime = DateTime.Now; + ModifyTime = DateTime.Now; + IsDeleted = false; + } + public Role(string name) { - public Role() - { - OrderSort = 1; - CreateTime = DateTime.Now; - ModifyTime = DateTime.Now; - IsDeleted = false; - } - public Role(string name) - { - Name = name; - Description = ""; - OrderSort = 1; - Enabled = true; - CreateTime = DateTime.Now; - ModifyTime = DateTime.Now; + Name = name; + Description = ""; + OrderSort = 1; + Enabled = true; + CreateTime = DateTime.Now; + ModifyTime = DateTime.Now; - } + } - /// - ///获取或设置是否禁用,逻辑上的删除,非物理删除 - /// - [SugarColumn(IsNullable = true)] - public bool? IsDeleted { get; set; } - /// - /// 角色名 - /// - [SugarColumn(Length = 50, IsNullable = true)] - public string Name { get; set; } - /// - ///描述 - /// - [SugarColumn(Length = 100, IsNullable = true)] - public string Description { get; set; } - /// - ///排序 - /// - public int OrderSort { get; set; } - /// - /// 自定义权限的部门ids - /// - [SugarColumn(Length = 500, IsNullable = true)] - public string Dids { get; set; } - /// - /// 权限范围 - /// -1 无任何权限;1 自定义权限;2 本部门;3 本部门及以下;4 仅自己;9 全部; - /// - [SugarColumn(IsNullable = true)] - public int AuthorityScope { get; set; } = -1; - /// - /// 是否激活 - /// - public bool Enabled { get; set; } - /// - /// 创建ID - /// - [SugarColumn(IsNullable = true)] - public long? CreateId { get; set; } - /// - /// 创建者 - /// - [SugarColumn(Length = 50, IsNullable = true)] - public string CreateBy { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(IsNullable = true)] - public DateTime? CreateTime { get; set; } = DateTime.Now; - /// - /// 修改ID - /// - [SugarColumn(IsNullable = true)] - public long? ModifyId { get; set; } - /// - /// 修改者 - /// - [SugarColumn(IsNullable = true)] - public string ModifyBy { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(IsNullable = true)] - public DateTime? ModifyTime { get; set; } = DateTime.Now; + /// + ///获取或设置是否禁用,逻辑上的删除,非物理删除 + /// + [SugarColumn(IsNullable = true)] + public bool? IsDeleted { get; set; } + /// + /// 角色名 + /// + [SugarColumn(Length = 50, IsNullable = true)] + public string Name { get; set; } + /// + ///描述 + /// + [SugarColumn(Length = 100, IsNullable = true)] + public string Description { get; set; } + /// + ///排序 + /// + public int OrderSort { get; set; } + /// + /// 自定义权限的部门ids + /// + [SugarColumn(Length = 500, IsNullable = true)] + public string Dids { get; set; } + /// + /// 权限范围 + /// -1 无任何权限;1 自定义权限;2 本部门;3 本部门及以下;4 仅自己;9 全部; + /// + [SugarColumn(IsNullable = true)] + public int AuthorityScope { get; set; } = -1; + /// + /// 是否激活 + /// + public bool Enabled { get; set; } + /// + /// 创建ID + /// + [SugarColumn(IsNullable = true)] + public long? CreateId { get; set; } + /// + /// 创建者 + /// + [SugarColumn(Length = 50, IsNullable = true)] + public string CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(IsNullable = true)] + public DateTime? CreateTime { get; set; } = DateTime.Now; + /// + /// 修改ID + /// + [SugarColumn(IsNullable = true)] + public long? ModifyId { get; set; } + /// + /// 修改者 + /// + [SugarColumn(IsNullable = true)] + public string ModifyBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(IsNullable = true)] + public DateTime? ModifyTime { get; set; } = DateTime.Now; - } } diff --git a/Tiobon.Core.Model/Models/RoleModulePermission.cs b/Tiobon.Core.Model/Models/RoleModulePermission.cs index 046e2284..76cbd658 100644 --- a/Tiobon.Core.Model/Models/RoleModulePermission.cs +++ b/Tiobon.Core.Model/Models/RoleModulePermission.cs @@ -1,64 +1,60 @@ -using SqlSugar; -using System; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models +/// +/// 按钮跟权限关联表 +/// +public class RoleModulePermission : RoleModulePermissionRoot { - /// - /// 按钮跟权限关联表 - /// - public class RoleModulePermission : RoleModulePermissionRoot + public RoleModulePermission() { - public RoleModulePermission() - { - //this.Role = new Role(); - //this.Module = new Module(); - //this.Permission = new Permission(); + //this.Role = new Role(); + //this.Module = new Module(); + //this.Permission = new Permission(); - } + } - /// - ///获取或设置是否禁用,逻辑上的删除,非物理删除 - /// - [SugarColumn(IsNullable = true)] - public bool? IsDeleted { get; set; } - - /// - /// 创建ID - /// - [SugarColumn(IsNullable = true)] - public long? CreateId { get; set; } - /// - /// 创建者 - /// - [SugarColumn(Length = 50, IsNullable = true)] - public string CreateBy { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(IsNullable = true)] - public DateTime? CreateTime { get; set; } = DateTime.Now; - /// - /// 修改ID - /// - [SugarColumn(IsNullable = true)] - public long? ModifyId { get; set; } - /// - /// 修改者 - /// - [SugarColumn(Length = 50, IsNullable = true)] - public string ModifyBy { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(IsNullable = true)] - public DateTime? ModifyTime { get; set; } = DateTime.Now; + /// + ///获取或设置是否禁用,逻辑上的删除,非物理删除 + /// + [SugarColumn(IsNullable = true)] + public bool? IsDeleted { get; set; } + + /// + /// 创建ID + /// + [SugarColumn(IsNullable = true)] + public long? CreateId { get; set; } + /// + /// 创建者 + /// + [SugarColumn(Length = 50, IsNullable = true)] + public string CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(IsNullable = true)] + public DateTime? CreateTime { get; set; } = DateTime.Now; + /// + /// 修改ID + /// + [SugarColumn(IsNullable = true)] + public long? ModifyId { get; set; } + /// + /// 修改者 + /// + [SugarColumn(Length = 50, IsNullable = true)] + public string ModifyBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(IsNullable = true)] + public DateTime? ModifyTime { get; set; } = DateTime.Now; - // 下边三个实体参数,只是做传参作用,所以忽略下 - [SugarColumn(IsIgnore = true)] - public Role Role { get; set; } - [SugarColumn(IsIgnore = true)] - public Modules Module { get; set; } - [SugarColumn(IsIgnore = true)] - public Permission Permission { get; set; } - } + // 下边三个实体参数,只是做传参作用,所以忽略下 + [SugarColumn(IsIgnore = true)] + public Role Role { get; set; } + [SugarColumn(IsIgnore = true)] + public Modules Module { get; set; } + [SugarColumn(IsIgnore = true)] + public Permission Permission { get; set; } } diff --git a/Tiobon.Core.Model/Models/RootTkey/BaseEntity.cs b/Tiobon.Core.Model/Models/RootTkey/BaseEntity.cs index 0c9bf1af..cfbcad8b 100644 --- a/Tiobon.Core.Model/Models/RootTkey/BaseEntity.cs +++ b/Tiobon.Core.Model/Models/RootTkey/BaseEntity.cs @@ -1,6 +1,4 @@ using Tiobon.Core.Model.Models.RootTkey.Interface; -using SqlSugar; -using System; namespace Tiobon.Core.Model.Models.RootTkey; diff --git a/Tiobon.Core.Model/Models/RootTkey/DepartmentRoot.cs b/Tiobon.Core.Model/Models/RootTkey/DepartmentRoot.cs index fab3953e..2ca04272 100644 --- a/Tiobon.Core.Model/Models/RootTkey/DepartmentRoot.cs +++ b/Tiobon.Core.Model/Models/RootTkey/DepartmentRoot.cs @@ -1,20 +1,15 @@ -using SqlSugar; -using System; -using System.Collections.Generic; +namespace Tiobon.Core.Model; -namespace Tiobon.Core.Model +/// +/// 部门表 +/// +public class DepartmentRoot : RootEntityTkey where Tkey : IEquatable { /// - /// 部门表 + /// 上一级(0表示无上一级) /// - public class DepartmentRoot : RootEntityTkey where Tkey : IEquatable - { - /// - /// 上一级(0表示无上一级) - /// - public Tkey Pid { get; set; } + public Tkey Pid { get; set; } - [SugarColumn(IsIgnore = true)] - public List PidArr { get; set; } - } + [SugarColumn(IsIgnore = true)] + public List PidArr { get; set; } } diff --git a/Tiobon.Core.Model/Models/RootTkey/ModulesRoot.cs b/Tiobon.Core.Model/Models/RootTkey/ModulesRoot.cs index 476c2560..3b6de8fa 100644 --- a/Tiobon.Core.Model/Models/RootTkey/ModulesRoot.cs +++ b/Tiobon.Core.Model/Models/RootTkey/ModulesRoot.cs @@ -1,19 +1,15 @@ -using SqlSugar; -using System; +namespace Tiobon.Core.Model; -namespace Tiobon.Core.Model +/// +/// 接口API地址信息表 +/// 父类 +/// +public class ModulesRoot : RootEntityTkey where Tkey : IEquatable { /// - /// 接口API地址信息表 - /// 父类 + /// 父ID /// - public class ModulesRoot : RootEntityTkey where Tkey : IEquatable - { - /// - /// 父ID - /// - [SugarColumn(IsNullable = true)] - public Tkey ParentId { get; set; } - - } + [SugarColumn(IsNullable = true)] + public Tkey ParentId { get; set; } + } diff --git a/Tiobon.Core.Model/Models/RootTkey/PermissionRoot.cs b/Tiobon.Core.Model/Models/RootTkey/PermissionRoot.cs index ac73b673..339083d0 100644 --- a/Tiobon.Core.Model/Models/RootTkey/PermissionRoot.cs +++ b/Tiobon.Core.Model/Models/RootTkey/PermissionRoot.cs @@ -1,27 +1,22 @@ -using SqlSugar; -using System; -using System.Collections.Generic; +namespace Tiobon.Core.Model; -namespace Tiobon.Core.Model +/// +/// 路由菜单表 +/// +public class PermissionRoot : RootEntityTkey where Tkey : IEquatable { + /// - /// 路由菜单表 + /// 上一级菜单(0表示上一级无菜单) /// - public class PermissionRoot : RootEntityTkey where Tkey : IEquatable - { - - /// - /// 上一级菜单(0表示上一级无菜单) - /// - public Tkey Pid { get; set; } + public Tkey Pid { get; set; } - /// - /// 接口api - /// - public Tkey Mid { get; set; } + /// + /// 接口api + /// + public Tkey Mid { get; set; } - [SugarColumn(IsIgnore = true)] - public List PidArr { get; set; } + [SugarColumn(IsIgnore = true)] + public List PidArr { get; set; } - } } diff --git a/Tiobon.Core.Model/Models/RootTkey/RoleModulePermissionRoot.cs b/Tiobon.Core.Model/Models/RootTkey/RoleModulePermissionRoot.cs index a6660b98..2a235ee0 100644 --- a/Tiobon.Core.Model/Models/RootTkey/RoleModulePermissionRoot.cs +++ b/Tiobon.Core.Model/Models/RootTkey/RoleModulePermissionRoot.cs @@ -1,28 +1,24 @@ -using SqlSugar; -using System; +namespace Tiobon.Core.Model; -namespace Tiobon.Core.Model +/// +/// 按钮跟权限关联表 +/// 父类 +/// +public class RoleModulePermissionRoot : RootEntityTkey where Tkey : IEquatable { + /// - /// 按钮跟权限关联表 - /// 父类 + /// 角色ID /// - public class RoleModulePermissionRoot : RootEntityTkey where Tkey : IEquatable - { - - /// - /// 角色ID - /// - public Tkey RoleId { get; set; } - /// - /// 菜单ID - /// - public Tkey ModuleId { get; set; } - /// - /// api ID - /// - [SugarColumn(IsNullable = true)] - public Tkey PermissionId { get; set; } - - } + public Tkey RoleId { get; set; } + /// + /// 菜单ID + /// + public Tkey ModuleId { get; set; } + /// + /// api ID + /// + [SugarColumn(IsNullable = true)] + public Tkey PermissionId { get; set; } + } diff --git a/Tiobon.Core.Model/Models/RootTkey/RootEntityTkey.cs b/Tiobon.Core.Model/Models/RootTkey/RootEntityTkey.cs index 103fd0b8..ea0387f9 100644 --- a/Tiobon.Core.Model/Models/RootTkey/RootEntityTkey.cs +++ b/Tiobon.Core.Model/Models/RootTkey/RootEntityTkey.cs @@ -1,15 +1,11 @@ -using SqlSugar; -using System; +namespace Tiobon.Core.Model; -namespace Tiobon.Core.Model +public class RootEntityTkey where Tkey : IEquatable { - public class RootEntityTkey where Tkey : IEquatable - { - /// - /// ID - /// 泛型主键Tkey - /// - [SugarColumn(IsNullable = false, IsPrimaryKey = true)] - public Tkey Id { get; set; } - } + /// + /// ID + /// 泛型主键Tkey + /// + [SugarColumn(IsNullable = false, IsPrimaryKey = true)] + public Tkey Id { get; set; } } \ No newline at end of file diff --git a/Tiobon.Core.Model/Models/RootTkey/UserRoleRoot.cs b/Tiobon.Core.Model/Models/RootTkey/UserRoleRoot.cs index bcbc165d..deaa5dde 100644 --- a/Tiobon.Core.Model/Models/RootTkey/UserRoleRoot.cs +++ b/Tiobon.Core.Model/Models/RootTkey/UserRoleRoot.cs @@ -1,21 +1,18 @@ -using System; +namespace Tiobon.Core.Model; -namespace Tiobon.Core.Model +/// +/// 用户跟角色关联表 +/// 父类 +/// +public class UserRoleRoot : RootEntityTkey where Tkey : IEquatable { /// - /// 用户跟角色关联表 - /// 父类 + /// 用户ID /// - public class UserRoleRoot : RootEntityTkey where Tkey : IEquatable - { - /// - /// 用户ID - /// - public Tkey UserId { get; set; } - /// - /// 角色ID - /// - public Tkey RoleId { get; set; } + public Tkey UserId { get; set; } + /// + /// 角色ID + /// + public Tkey RoleId { get; set; } - } } diff --git a/Tiobon.Core.Model/Models/RootTkey/sysUserInfoRoot.cs b/Tiobon.Core.Model/Models/RootTkey/sysUserInfoRoot.cs index 8dc51fd7..19109317 100644 --- a/Tiobon.Core.Model/Models/RootTkey/sysUserInfoRoot.cs +++ b/Tiobon.Core.Model/Models/RootTkey/sysUserInfoRoot.cs @@ -1,23 +1,18 @@ -using SqlSugar; -using System; -using System.Collections.Generic; +namespace Tiobon.Core.Model; -namespace Tiobon.Core.Model +/// +/// 用户信息表 +/// +public class SysUserInfoRoot where Tkey : IEquatable { /// - /// 用户信息表 + /// Id + /// 泛型主键Tkey /// - public class SysUserInfoRoot where Tkey : IEquatable - { - /// - /// Id - /// 泛型主键Tkey - /// - [SugarColumn(IsNullable = false, IsPrimaryKey = true)] - public Tkey Id { get; set; } + [SugarColumn(IsNullable = false, IsPrimaryKey = true)] + public Tkey Id { get; set; } - [SugarColumn(IsIgnore = true)] - public List RIDs { get; set; } + [SugarColumn(IsIgnore = true)] + public List RIDs { get; set; } - } } diff --git a/Tiobon.Core.Model/Models/SplitDemo.cs b/Tiobon.Core.Model/Models/SplitDemo.cs index 11e1cc22..69793e5b 100644 --- a/Tiobon.Core.Model/Models/SplitDemo.cs +++ b/Tiobon.Core.Model/Models/SplitDemo.cs @@ -1,27 +1,17 @@ -using Newtonsoft.Json; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Text.Json.Serialization; -using System.Threading.Tasks; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models +[SplitTable(SplitType.Day)]//按天分表 (自带分表支持 年、季、月、周、日) +[SugarTable("SplitDemo_{year}{month}{day}")]//3个变量必须要有,这么设计为了兼容开始按年,后面改成按月、按日 +public class SplitDemo { - [SplitTable(SplitType.Day)]//按天分表 (自带分表支持 年、季、月、周、日) - [SugarTable("SplitDemo_{year}{month}{day}")]//3个变量必须要有,这么设计为了兼容开始按年,后面改成按月、按日 - public class SplitDemo - { - [SugarColumn(IsPrimaryKey = true)] - public long Id { get; set; } + [SugarColumn(IsPrimaryKey = true)] + public long Id { get; set; } - public string Name { get; set; } + public string Name { get; set; } - [SugarColumn(IsNullable = true)]//设置为可空字段 (更多用法看文档 迁移) - public DateTime UpdateTime { get; set; } + [SugarColumn(IsNullable = true)]//设置为可空字段 (更多用法看文档 迁移) + public DateTime UpdateTime { get; set; } - [SplitField] //分表字段 在插入的时候会根据这个字段插入哪个表,在更新删除的时候用这个字段找出相关表 - public DateTime CreateTime { get; set; } - } + [SplitField] //分表字段 在插入的时候会根据这个字段插入哪个表,在更新删除的时候用这个字段找出相关表 + public DateTime CreateTime { get; set; } } diff --git a/Tiobon.Core.Model/Models/Tenant/MultiBusinessTable.cs b/Tiobon.Core.Model/Models/Tenant/MultiBusinessTable.cs index aaaf9624..662c0d17 100644 --- a/Tiobon.Core.Model/Models/Tenant/MultiBusinessTable.cs +++ b/Tiobon.Core.Model/Models/Tenant/MultiBusinessTable.cs @@ -1,7 +1,5 @@ -using System.Collections.Generic; -using Tiobon.Core.Model.Models.RootTkey; +using Tiobon.Core.Model.Models.RootTkey; using Tiobon.Core.Model.Tenants; -using SqlSugar; namespace Tiobon.Core.Model.Models; diff --git a/Tiobon.Core.Model/Models/TestModels.cs b/Tiobon.Core.Model/Models/TestModels.cs index 4de7c4c4..8374d826 100644 --- a/Tiobon.Core.Model/Models/TestModels.cs +++ b/Tiobon.Core.Model/Models/TestModels.cs @@ -1,13 +1,12 @@ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - public class TestMuchTableResult - { - public string moduleName { get; set; } - public string permName { get; set; } - public long rid { get; set; } - public long mid { get; set; } - public long? pid { get; set; } +public class TestMuchTableResult +{ + public string moduleName { get; set; } + public string permName { get; set; } + public long rid { get; set; } + public long mid { get; set; } + public long? pid { get; set; } - } } diff --git a/Tiobon.Core.Model/Models/UserRole.cs b/Tiobon.Core.Model/Models/UserRole.cs index 801c4f4e..b3daf11c 100644 --- a/Tiobon.Core.Model/Models/UserRole.cs +++ b/Tiobon.Core.Model/Models/UserRole.cs @@ -1,62 +1,58 @@ -using SqlSugar; -using System; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models +/// +/// 用户跟角色关联表 +/// +public class UserRole : UserRoleRoot { - /// - /// 用户跟角色关联表 - /// - public class UserRole : UserRoleRoot - { - public UserRole() { } + public UserRole() { } - public UserRole(long uid, long rid) - { - UserId = uid; - RoleId = rid; - CreateTime = DateTime.Now; - IsDeleted = false; - CreateId = uid; - CreateTime = DateTime.Now; - } + public UserRole(long uid, long rid) + { + UserId = uid; + RoleId = rid; + CreateTime = DateTime.Now; + IsDeleted = false; + CreateId = uid; + CreateTime = DateTime.Now; + } - /// - ///获取或设置是否禁用,逻辑上的删除,非物理删除 - /// - [SugarColumn(IsNullable = true)] - public bool? IsDeleted { get; set; } - - /// - /// 创建ID - /// - [SugarColumn(IsNullable = true)] - public long? CreateId { get; set; } - /// - /// 创建者 - /// - [SugarColumn(Length = 50, IsNullable = true)] - public string CreateBy { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(IsNullable = true)] - public DateTime? CreateTime { get; set; } - /// - /// 修改ID - /// - [SugarColumn(IsNullable = true)] - public int? ModifyId { get; set; } - /// - /// 修改者 - /// - [SugarColumn(Length = 50, IsNullable = true)] - public string ModifyBy { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(IsNullable = true)] - public DateTime? ModifyTime { get; set; } + /// + ///获取或设置是否禁用,逻辑上的删除,非物理删除 + /// + [SugarColumn(IsNullable = true)] + public bool? IsDeleted { get; set; } + + /// + /// 创建ID + /// + [SugarColumn(IsNullable = true)] + public long? CreateId { get; set; } + /// + /// 创建者 + /// + [SugarColumn(Length = 50, IsNullable = true)] + public string CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(IsNullable = true)] + public DateTime? CreateTime { get; set; } + /// + /// 修改ID + /// + [SugarColumn(IsNullable = true)] + public int? ModifyId { get; set; } + /// + /// 修改者 + /// + [SugarColumn(Length = 50, IsNullable = true)] + public string ModifyBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(IsNullable = true)] + public DateTime? ModifyTime { get; set; } - } } diff --git a/Tiobon.Core.Model/Models/sysUserInfo.cs b/Tiobon.Core.Model/Models/sysUserInfo.cs index 9af66319..2aa44b78 100644 --- a/Tiobon.Core.Model/Models/sysUserInfo.cs +++ b/Tiobon.Core.Model/Models/sysUserInfo.cs @@ -1,144 +1,139 @@ -using SqlSugar; -using System; -using System.Collections.Generic; - -namespace Tiobon.Core.Model.Models +namespace Tiobon.Core.Model.Models; + +/// +/// 用户信息表 +/// +//[SugarTable("SysUserInfo")] +[SugarTable("SysUserInfo", "用户表")] //('数据库表名','数据库表备注') +public class SysUserInfo : SysUserInfoRoot { - /// - /// 用户信息表 - /// - //[SugarTable("SysUserInfo")] - [SugarTable("SysUserInfo", "用户表")] //('数据库表名','数据库表备注') - public class SysUserInfo : SysUserInfoRoot + public SysUserInfo() { - public SysUserInfo() - { - } - - public SysUserInfo(string loginName, string loginPWD) - { - LoginName = loginName; - LoginPWD = loginPWD; - RealName = LoginName; - Status = 0; - CreateTime = DateTime.Now; - UpdateTime = DateTime.Now; - LastErrorTime = DateTime.Now; - ErrorCount = 0; - Name = ""; - } - - /// - /// 登录账号 - /// - [SugarColumn(Length = 200, IsNullable = true, ColumnDescription = "登录账号")] - //:eg model 根据sqlsugar的完整定义可以如下定义,ColumnDescription可定义表字段备注 - //[SugarColumn(IsNullable = false, ColumnDescription = "登录账号", IsPrimaryKey = false, IsIdentity = false, Length = 50)] - //ColumnDescription 表字段备注, 已在MSSQL测试,配合 [SugarTable("SysUserInfo", "用户表")]//('数据库表名','数据库表备注') - //可以完整生成 表备注和各个字段的中文备注 - //2022/10/11 - //测试mssql 发现 不写ColumnDescription,写好注释在mssql下也能生成表字段备注 - public string LoginName { get; set; } - - /// - /// 登录密码 - /// - [SugarColumn(Length = 200, IsNullable = true)] - public string LoginPWD { get; set; } - - /// - /// 真实姓名 - /// - [SugarColumn(Length = 200, IsNullable = true)] - public string RealName { get; set; } - - /// - /// 状态 - /// - public int Status { get; set; } - - /// - /// 部门 - /// - [SugarColumn(IsNullable = true)] - public long DepartmentId { get; set; } = -1; - - /// - /// 备注 - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string Remark { get; set; } - - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } = DateTime.Now; - - /// - /// 更新时间 - /// - public DateTime UpdateTime { get; set; } = DateTime.Now; - - /// - /// 关键业务修改时间 - /// - public DateTime CriticalModifyTime { get; set; } = DateTime.Now; - - /// - ///最后异常时间 - /// - public DateTime LastErrorTime { get; set; } = DateTime.Now; - - /// - ///错误次数 - /// - public int ErrorCount { get; set; } - - - /// - /// 登录账号 - /// - [SugarColumn(Length = 200, IsNullable = true)] - public string Name { get; set; } - - // 性别 - [SugarColumn(IsNullable = true)] - public int Sex { get; set; } = 0; - - // 年龄 - [SugarColumn(IsNullable = true)] - public int Age { get; set; } - - // 生日 - [SugarColumn(IsNullable = true)] - public DateTime Birth { get; set; } = DateTime.Now; - - // 地址 - [SugarColumn(Length = 200, IsNullable = true)] - public string Address { get; set; } - - [SugarColumn(DefaultValue = "1")] - public bool Enable { get; set; } = true; - - [SugarColumn(IsNullable = true)] - public bool IsDeleted { get; set; } - - /// - /// 租户Id - /// - [SugarColumn(IsNullable = false, DefaultValue = "0")] - public long TenantId { get; set; } - - [Navigate(NavigateType.OneToOne, nameof(TenantId))] - public SysTenant Tenant { get; set; } - - [SugarColumn(IsIgnore = true)] - public List RoleNames { get; set; } - - [SugarColumn(IsIgnore = true)] - public List Dids { get; set; } - - [SugarColumn(IsIgnore = true)] - public string DepartmentName { get; set; } } + + public SysUserInfo(string loginName, string loginPWD) + { + LoginName = loginName; + LoginPWD = loginPWD; + RealName = LoginName; + Status = 0; + CreateTime = DateTime.Now; + UpdateTime = DateTime.Now; + LastErrorTime = DateTime.Now; + ErrorCount = 0; + Name = ""; + } + + /// + /// 登录账号 + /// + [SugarColumn(Length = 200, IsNullable = true, ColumnDescription = "登录账号")] + //:eg model 根据sqlsugar的完整定义可以如下定义,ColumnDescription可定义表字段备注 + //[SugarColumn(IsNullable = false, ColumnDescription = "登录账号", IsPrimaryKey = false, IsIdentity = false, Length = 50)] + //ColumnDescription 表字段备注, 已在MSSQL测试,配合 [SugarTable("SysUserInfo", "用户表")]//('数据库表名','数据库表备注') + //可以完整生成 表备注和各个字段的中文备注 + //2022/10/11 + //测试mssql 发现 不写ColumnDescription,写好注释在mssql下也能生成表字段备注 + public string LoginName { get; set; } + + /// + /// 登录密码 + /// + [SugarColumn(Length = 200, IsNullable = true)] + public string LoginPWD { get; set; } + + /// + /// 真实姓名 + /// + [SugarColumn(Length = 200, IsNullable = true)] + public string RealName { get; set; } + + /// + /// 状态 + /// + public int Status { get; set; } + + /// + /// 部门 + /// + [SugarColumn(IsNullable = true)] + public long DepartmentId { get; set; } = -1; + + /// + /// 备注 + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string Remark { get; set; } + + /// + /// 创建时间 + /// + public DateTime CreateTime { get; set; } = DateTime.Now; + + /// + /// 更新时间 + /// + public DateTime UpdateTime { get; set; } = DateTime.Now; + + /// + /// 关键业务修改时间 + /// + public DateTime CriticalModifyTime { get; set; } = DateTime.Now; + + /// + ///最后异常时间 + /// + public DateTime LastErrorTime { get; set; } = DateTime.Now; + + /// + ///错误次数 + /// + public int ErrorCount { get; set; } + + + /// + /// 登录账号 + /// + [SugarColumn(Length = 200, IsNullable = true)] + public string Name { get; set; } + + // 性别 + [SugarColumn(IsNullable = true)] + public int Sex { get; set; } = 0; + + // 年龄 + [SugarColumn(IsNullable = true)] + public int Age { get; set; } + + // 生日 + [SugarColumn(IsNullable = true)] + public DateTime Birth { get; set; } = DateTime.Now; + + // 地址 + [SugarColumn(Length = 200, IsNullable = true)] + public string Address { get; set; } + + [SugarColumn(DefaultValue = "1")] + public bool Enable { get; set; } = true; + + [SugarColumn(IsNullable = true)] + public bool IsDeleted { get; set; } + + /// + /// 租户Id + /// + [SugarColumn(IsNullable = false, DefaultValue = "0")] + public long TenantId { get; set; } + + [Navigate(NavigateType.OneToOne, nameof(TenantId))] + public SysTenant Tenant { get; set; } + + [SugarColumn(IsIgnore = true)] + public List RoleNames { get; set; } + + [SugarColumn(IsIgnore = true)] + public List Dids { get; set; } + + [SugarColumn(IsIgnore = true)] + public string DepartmentName { get; set; } } diff --git a/Tiobon.Core.Model/PaginationModel.cs b/Tiobon.Core.Model/PaginationModel.cs index e2f29fe3..ed20e93c 100644 --- a/Tiobon.Core.Model/PaginationModel.cs +++ b/Tiobon.Core.Model/PaginationModel.cs @@ -1,27 +1,26 @@ -namespace Tiobon.Core.Model +namespace Tiobon.Core.Model; + +/// +/// 所需分页参数 +/// 作者:SimonHsiao +/// 时间:2024-5-3 20:31:26 +/// +public class PaginationModel { /// - /// 所需分页参数 - /// 作者:SimonHsiao - /// 时间:2024-5-3 20:31:26 + /// 当前页 /// - public class PaginationModel - { - /// - /// 当前页 - /// - public int PageIndex { get; set; } = 1; - /// - /// 每页大小 - /// - public int PageSize { get; set; } = 10; - /// - /// 排序字段(例如:id desc,time asc) - /// - public string OrderByFileds { get; set; } - /// - /// 查询条件( 例如:id = 1 and name = 小明) - /// - public string Conditions { get; set; } - } + public int PageIndex { get; set; } = 1; + /// + /// 每页大小 + /// + public int PageSize { get; set; } = 10; + /// + /// 排序字段(例如:id desc,time asc) + /// + public string OrderByFileds { get; set; } + /// + /// 查询条件( 例如:id = 1 and name = 小明) + /// + public string Conditions { get; set; } } diff --git a/Tiobon.Core.Model/Systems/DataBase/DatabaseOutput.cs b/Tiobon.Core.Model/Systems/DataBase/DatabaseOutput.cs index d14714a7..0670c632 100644 --- a/Tiobon.Core.Model/Systems/DataBase/DatabaseOutput.cs +++ b/Tiobon.Core.Model/Systems/DataBase/DatabaseOutput.cs @@ -1,6 +1,4 @@ -using SqlSugar; - -namespace Tiobon.Core.Model.Systems.DataBase; +namespace Tiobon.Core.Model.Systems.DataBase; public class DatabaseOutput { diff --git a/Tiobon.Core.Model/Tenants/ITenantEntity.cs b/Tiobon.Core.Model/Tenants/ITenantEntity.cs index d6d2c161..dd97a0bf 100644 --- a/Tiobon.Core.Model/Tenants/ITenantEntity.cs +++ b/Tiobon.Core.Model/Tenants/ITenantEntity.cs @@ -1,6 +1,4 @@ -using SqlSugar; - -namespace Tiobon.Core.Model.Tenants; +namespace Tiobon.Core.Model.Tenants; /// /// 租户模型接口 diff --git a/Tiobon.Core.Model/Tenants/MultiTenantAttribute.cs b/Tiobon.Core.Model/Tenants/MultiTenantAttribute.cs index 299af06c..ef843ea9 100644 --- a/Tiobon.Core.Model/Tenants/MultiTenantAttribute.cs +++ b/Tiobon.Core.Model/Tenants/MultiTenantAttribute.cs @@ -1,6 +1,4 @@ -using System; - -namespace Tiobon.Core.Model.Tenants; +namespace Tiobon.Core.Model.Tenants; /// /// 标识 多租户 的业务表
diff --git a/Tiobon.Core.Model/Tenants/TenantTypeEnum.cs b/Tiobon.Core.Model/Tenants/TenantTypeEnum.cs index ab142e89..373b1552 100644 --- a/Tiobon.Core.Model/Tenants/TenantTypeEnum.cs +++ b/Tiobon.Core.Model/Tenants/TenantTypeEnum.cs @@ -1,6 +1,4 @@ -using System.ComponentModel; - -namespace Tiobon.Core.Model.Tenants; +namespace Tiobon.Core.Model.Tenants; /// /// 租户隔离方案 diff --git a/Tiobon.Core.Model/View/Ghra/Ghra_Grade.Dto.View.cs b/Tiobon.Core.Model/View/Ghra/Ghra_Grade.Dto.View.cs index 04d95727..8b7c3077 100644 --- a/Tiobon.Core.Model/View/Ghra/Ghra_Grade.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghra/Ghra_Grade.Dto.View.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 年级(Dto.View) - /// - public class Ghra_GradeDto : Ghra_Grade - { - } +/// +/// 年级(Dto.View) +/// +public class Ghra_GradeDto : Ghra_Grade +{ } diff --git a/Tiobon.Core.Model/View/Ghra/Ghra_Job.Dto.View.cs b/Tiobon.Core.Model/View/Ghra/Ghra_Job.Dto.View.cs index 947d11ae..1c85d0d7 100644 --- a/Tiobon.Core.Model/View/Ghra/Ghra_Job.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghra/Ghra_Job.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghra_JobDto : Ghra_Job { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghra/Ghra_StaffSocialRelation.Dto.View.cs b/Tiobon.Core.Model/View/Ghra/Ghra_StaffSocialRelation.Dto.View.cs index 2a135864..fb125258 100644 --- a/Tiobon.Core.Model/View/Ghra/Ghra_StaffSocialRelation.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghra/Ghra_StaffSocialRelation.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; ///
public class Ghra_StaffSocialRelationDto : Ghra_StaffSocialRelation { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghra/Ghra_StaffTraining.Dto.View.cs b/Tiobon.Core.Model/View/Ghra/Ghra_StaffTraining.Dto.View.cs index 8a3d8955..7f6695b8 100644 --- a/Tiobon.Core.Model/View/Ghra/Ghra_StaffTraining.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghra/Ghra_StaffTraining.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; ///
public class Ghra_StaffTrainingDto : Ghra_StaffTraining { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghra/Ghra_StaffWorkExp.Dto.View.cs b/Tiobon.Core.Model/View/Ghra/Ghra_StaffWorkExp.Dto.View.cs index 41ec9eda..8c49e8e6 100644 --- a/Tiobon.Core.Model/View/Ghra/Ghra_StaffWorkExp.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghra/Ghra_StaffWorkExp.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghra_StaffWorkExpDto : Ghra_StaffWorkExp { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghra/Ghra_Zone.Dto.View.cs b/Tiobon.Core.Model/View/Ghra/Ghra_Zone.Dto.View.cs index b3b0b43b..a8496a3a 100644 --- a/Tiobon.Core.Model/View/Ghra/Ghra_Zone.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghra/Ghra_Zone.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghra_ZoneDto : Ghra_Zone { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_Config.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_Config.Dto.View.cs index b77ff0da..07157b52 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_Config.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_Config.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghre_ConfigDto : Ghre_Config { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_CourseSnap.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_CourseSnap.Dto.View.cs index 9e9b81fe..36641883 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_CourseSnap.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_CourseSnap.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghre_CourseSnapDto : Ghre_CourseSnap { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_CourseWareAttachment.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_CourseWareAttachment.Dto.View.cs index 52449fb3..525fd990 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_CourseWareAttachment.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_CourseWareAttachment.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghre_CourseWareAttachmentDto : Ghre_CourseWareAttachment { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_CreditPoint.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_CreditPoint.Dto.View.cs index efa71d83..a113bfbe 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_CreditPoint.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_CreditPoint.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghre_CreditPointDto : Ghre_CreditPoint { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_ExamRecordAnswer.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_ExamRecordAnswer.Dto.View.cs index ace582f0..02e3499d 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_ExamRecordAnswer.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_ExamRecordAnswer.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghre_ExamRecordAnswerDto : Ghre_ExamRecordAnswer { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_ExamRecordDetail.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_ExamRecordDetail.Dto.View.cs index a12d84ba..a61d8254 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_ExamRecordDetail.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_ExamRecordDetail.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghre_ExamRecordDetailDto : Ghre_ExamRecordDetail { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_ExamStaff.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_ExamStaff.Dto.View.cs index e039df8b..c73cea6d 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_ExamStaff.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_ExamStaff.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghre_ExamStaffDto : Ghre_ExamStaff { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_QuestionAnswer.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_QuestionAnswer.Dto.View.cs index 74839476..265bac92 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_QuestionAnswer.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_QuestionAnswer.Dto.View.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 题目答案(Dto.View) - /// - public class Ghre_QuestionAnswerDto : Ghre_QuestionAnswer - { - } +/// +/// 题目答案(Dto.View) +/// +public class Ghre_QuestionAnswerDto : Ghre_QuestionAnswer +{ } diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_StudyRuleResult.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_StudyRuleResult.Dto.View.cs index 5eee4d6a..bd0a5442 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_StudyRuleResult.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_StudyRuleResult.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghre_StudyRuleResultDto : Ghre_StudyRuleResult { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_StudyRuleStaff.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_StudyRuleStaff.Dto.View.cs index 20193b76..94c72dc2 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_StudyRuleStaff.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_StudyRuleStaff.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghre_StudyRuleStaffDto : Ghre_StudyRuleStaff { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_InterviewLog.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_InterviewLog.Dto.View.cs index 029ccee4..b6bce225 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_InterviewLog.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_InterviewLog.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghrh_InterviewLogDto : Ghrh_InterviewLog { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeStatement.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeStatement.Dto.View.cs index b29597a3..bd868306 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeStatement.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeStatement.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghrh_ResumeStatementDto : Ghrh_ResumeStatement { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeTag.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeTag.Dto.View.cs index 1498ccd1..936a07e9 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeTag.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeTag.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghrh_ResumeTagDto : Ghrh_ResumeTag { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_Statement.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_Statement.Dto.View.cs index 4fb40fe6..4224d8b1 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_Statement.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_Statement.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghrh_StatementDto : Ghrh_Statement { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghro/Ghro_Dept.Dto.View.cs b/Tiobon.Core.Model/View/Ghro/Ghro_Dept.Dto.View.cs index 643f390c..f7d72195 100644 --- a/Tiobon.Core.Model/View/Ghro/Ghro_Dept.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghro/Ghro_Dept.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghro_DeptDto : Ghro_Dept { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghrs/Ghrs_Attachment.Dto.View.cs b/Tiobon.Core.Model/View/Ghrs/Ghrs_Attachment.Dto.View.cs index 252513b8..73c0ee6e 100644 --- a/Tiobon.Core.Model/View/Ghrs/Ghrs_Attachment.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrs/Ghrs_Attachment.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghrs_AttachmentDto : Ghrs_Attachment { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghrs/Ghrs_DataRoleDetail.Dto.View.cs b/Tiobon.Core.Model/View/Ghrs/Ghrs_DataRoleDetail.Dto.View.cs index 2d4efe64..94d25b54 100644 --- a/Tiobon.Core.Model/View/Ghrs/Ghrs_DataRoleDetail.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrs/Ghrs_DataRoleDetail.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghrs_DataRoleDetailDto : Ghrs_DataRoleDetail { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghrs/Ghrs_Menu.Dto.View.cs b/Tiobon.Core.Model/View/Ghrs/Ghrs_Menu.Dto.View.cs index af1cf26a..76c9ef74 100644 --- a/Tiobon.Core.Model/View/Ghrs/Ghrs_Menu.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrs/Ghrs_Menu.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghrs_MenuDto : Ghrs_Menu { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghrs/Ghrs_ParaDetail.Dto.View.cs b/Tiobon.Core.Model/View/Ghrs/Ghrs_ParaDetail.Dto.View.cs index 48a4d171..89a5d04a 100644 --- a/Tiobon.Core.Model/View/Ghrs/Ghrs_ParaDetail.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrs/Ghrs_ParaDetail.Dto.View.cs @@ -13,7 +13,7 @@ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,13 @@ namespace Tiobon.Core.Model.Models; /// public class Ghrs_ParaDetailDto : Ghrs_ParaDetail { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/ViewModels/BlogViewModels.cs b/Tiobon.Core.Model/ViewModels/BlogViewModels.cs index 1de82079..c81e3a4f 100644 --- a/Tiobon.Core.Model/ViewModels/BlogViewModels.cs +++ b/Tiobon.Core.Model/ViewModels/BlogViewModels.cs @@ -1,83 +1,80 @@ -using System; +namespace Tiobon.Core.Model.ViewModels; -namespace Tiobon.Core.Model.ViewModels +/// +/// 博客信息展示类 +/// +public class TiobonViewModels { /// - /// 博客信息展示类 + /// /// - public class TiobonViewModels - { - /// - /// - /// - public long bID { get; set; } - /// 创建人 - /// - /// - public string bsubmitter { get; set; } + public long bID { get; set; } + /// 创建人 + /// + /// + public string bsubmitter { get; set; } - /// 博客标题 - /// - /// - public string btitle { get; set; } + /// 博客标题 + /// + /// + public string btitle { get; set; } - /// 摘要 - /// - /// - public string digest { get; set; } + /// 摘要 + /// + /// + public string digest { get; set; } - /// - /// 上一篇 - /// - public string previous { get; set; } + /// + /// 上一篇 + /// + public string previous { get; set; } - /// - /// 上一篇id - /// - public long previousID { get; set; } + /// + /// 上一篇id + /// + public long previousID { get; set; } - /// - /// 下一篇 - /// - public string next { get; set; } + /// + /// 下一篇 + /// + public string next { get; set; } - /// - /// 下一篇id - /// - public long nextID { get; set; } + /// + /// 下一篇id + /// + public long nextID { get; set; } - /// 类别 - /// - /// - public string bcategory { get; set; } + /// 类别 + /// + /// + public string bcategory { get; set; } - /// 内容 - /// - /// - public string bcontent { get; set; } + /// 内容 + /// + /// + public string bcontent { get; set; } - /// - /// 访问量 - /// - public int btraffic { get; set; } + /// + /// 访问量 + /// + public int btraffic { get; set; } - /// - /// 评论数量 - /// - public int bcommentNum { get; set; } + /// + /// 评论数量 + /// + public int bcommentNum { get; set; } - /// 修改时间 - /// - /// - public DateTime bUpdateTime { get; set; } + /// 修改时间 + /// + /// + public DateTime bUpdateTime { get; set; } - /// - /// 创建时间 - /// - public System.DateTime bCreateTime { get; set; } - /// 备注 - /// - /// - public string bRemark { get; set; } - } + /// + /// 创建时间 + /// + public System.DateTime bCreateTime { get; set; } + /// 备注 + /// + /// + public string bRemark { get; set; } } diff --git a/Tiobon.Core.Model/ViewModels/EnumDemoDto.cs b/Tiobon.Core.Model/ViewModels/EnumDemoDto.cs index 3bd19eb3..50684bfc 100644 --- a/Tiobon.Core.Model/ViewModels/EnumDemoDto.cs +++ b/Tiobon.Core.Model/ViewModels/EnumDemoDto.cs @@ -1,23 +1,16 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +namespace Tiobon.Core.Model.ViewModels; -namespace Tiobon.Core.Model.ViewModels +public class EnumDemoDto { - public class EnumDemoDto - { - public int Id { get; set; } - /// - /// Type Description balabala - /// - public EnumType Type { get; set; } - } + public int Id { get; set; } + /// + /// Type Description balabala + /// + public EnumType Type { get; set; } +} - public enum EnumType - { - foo, bar, baz - } +public enum EnumType +{ + foo, bar, baz } diff --git a/Tiobon.Core.Model/ViewModels/GuestbookViewModels.cs b/Tiobon.Core.Model/ViewModels/GuestbookViewModels.cs index a9c501ba..28b8f11e 100644 --- a/Tiobon.Core.Model/ViewModels/GuestbookViewModels.cs +++ b/Tiobon.Core.Model/ViewModels/GuestbookViewModels.cs @@ -1,51 +1,49 @@ -using System; -using Tiobon.Core.Model.Models; +using Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.ViewModels +namespace Tiobon.Core.Model.ViewModels; + +/// +/// 留言信息展示类 +/// +public class GuestbookViewModels { - /// - /// 留言信息展示类 - /// - public class GuestbookViewModels - { - /// 留言表 - /// - /// - public int id { get; set; } + /// 留言表 + /// + /// + public int id { get; set; } - /// 博客ID - /// - /// - public int? TiobonId { get; set; } - /// 创建时间 - /// - /// - public DateTime createdate { get; set; } - public string username { get; set; } + /// 博客ID + /// + /// + public int? TiobonId { get; set; } + /// 创建时间 + /// + /// + public DateTime createdate { get; set; } + public string username { get; set; } - /// 手机 - /// - /// - public string phone { get; set; } - /// qq - /// - /// - public string QQ { get; set; } + /// 手机 + /// + /// + public string phone { get; set; } + /// qq + /// + /// + public string QQ { get; set; } - /// 留言内容 - /// - /// - public string body { get; set; } - /// ip地址 - /// - /// - public string ip { get; set; } + /// 留言内容 + /// + /// + public string body { get; set; } + /// ip地址 + /// + /// + public string ip { get; set; } - /// 是否显示在前台,0否1是 - /// - /// - public bool isshow { get; set; } + /// 是否显示在前台,0否1是 + /// + /// + public bool isshow { get; set; } - public TiobonArticle Tiobonarticle { get; set; } - } + public TiobonArticle Tiobonarticle { get; set; } } diff --git a/Tiobon.Core.Model/ViewModels/LoginInfoViewModels.cs b/Tiobon.Core.Model/ViewModels/LoginInfoViewModels.cs index 88f42c99..6b230443 100644 --- a/Tiobon.Core.Model/ViewModels/LoginInfoViewModels.cs +++ b/Tiobon.Core.Model/ViewModels/LoginInfoViewModels.cs @@ -1,13 +1,12 @@ -namespace Tiobon.Core.Model.ViewModels +namespace Tiobon.Core.Model.ViewModels; + +public class LoginInfoViewModels { - public class LoginInfoViewModels - { - public string uLoginName { get; set; } + public string uLoginName { get; set; } - public string uLoginPwd { get; set; } + public string uLoginPwd { get; set; } - public string VCode { get; set; } + public string VCode { get; set; } - public bool IsMember { get; set; } - } + public bool IsMember { get; set; } } diff --git a/Tiobon.Core.Model/ViewModels/Menu.cs b/Tiobon.Core.Model/ViewModels/Menu.cs index c6ef302d..07c7ce4b 100644 --- a/Tiobon.Core.Model/ViewModels/Menu.cs +++ b/Tiobon.Core.Model/ViewModels/Menu.cs @@ -1,7 +1,4 @@ -using System.Data; -using SqlSugar; - -namespace Tiobon.Core.Model; +namespace Tiobon.Core.Model; public class MenuParam { diff --git a/Tiobon.Core.Model/ViewModels/ModuleViewModels.cs b/Tiobon.Core.Model/ViewModels/ModuleViewModels.cs deleted file mode 100644 index e0d9a09c..00000000 --- a/Tiobon.Core.Model/ViewModels/ModuleViewModels.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Tiobon.Core.Model.ViewModels -{ - public class ModuleViewModels - { - } -} diff --git a/Tiobon.Core.Model/ViewModels/QuartzReflectionViewModel.cs b/Tiobon.Core.Model/ViewModels/QuartzReflectionViewModel.cs index 5368d992..6dccb9e4 100644 --- a/Tiobon.Core.Model/ViewModels/QuartzReflectionViewModel.cs +++ b/Tiobon.Core.Model/ViewModels/QuartzReflectionViewModel.cs @@ -1,21 +1,20 @@ -namespace Tiobon.Core.Model.ViewModels +namespace Tiobon.Core.Model.ViewModels; + +/// +/// 实现IJob的类 +/// +public class QuartzReflectionViewModel { /// - /// 实现IJob的类 + /// 命名空间 /// - public class QuartzReflectionViewModel - { - /// - /// 命名空间 - /// - public string nameSpace{ get; set; } - /// - /// 类名 - /// - public string nameClass { get; set; } - /// - /// 备注 - /// - public string remark { get; set; } - } + public string nameSpace{ get; set; } + /// + /// 类名 + /// + public string nameClass { get; set; } + /// + /// 备注 + /// + public string remark { get; set; } } diff --git a/Tiobon.Core.Model/ViewModels/ServerViewModel.cs b/Tiobon.Core.Model/ViewModels/ServerViewModel.cs index dc37a4a2..820d86d8 100644 --- a/Tiobon.Core.Model/ViewModels/ServerViewModel.cs +++ b/Tiobon.Core.Model/ViewModels/ServerViewModel.cs @@ -1,39 +1,38 @@ -namespace Tiobon.Core.Model.ViewModels +namespace Tiobon.Core.Model.ViewModels; + +/// +/// 服务器VM +/// +public class ServerViewModel { /// - /// 服务器VM + /// 环境变量 + /// + public string EnvironmentName { get; set; } + /// + /// 系统架构 + /// + public string OSArchitecture { get; set; } + /// + /// ContentRootPath + /// + public string ContentRootPath { get; set; } + /// + /// WebRootPath + /// + public string WebRootPath { get; set; } + /// + /// .NET Core版本 + /// + public string FrameworkDescription { get; set; } + /// + /// 内存占用 + /// + public string MemoryFootprint { get; set; } + /// + /// 启动时间 /// - public class ServerViewModel - { - /// - /// 环境变量 - /// - public string EnvironmentName { get; set; } - /// - /// 系统架构 - /// - public string OSArchitecture { get; set; } - /// - /// ContentRootPath - /// - public string ContentRootPath { get; set; } - /// - /// WebRootPath - /// - public string WebRootPath { get; set; } - /// - /// .NET Core版本 - /// - public string FrameworkDescription { get; set; } - /// - /// 内存占用 - /// - public string MemoryFootprint { get; set; } - /// - /// 启动时间 - /// - public string WorkingTime { get; set; } + public string WorkingTime { get; set; } - } } diff --git a/Tiobon.Core.Model/ViewModels/SidebarMenuViewModel.cs b/Tiobon.Core.Model/ViewModels/SidebarMenuViewModel.cs index 7aedb37d..a68027fd 100644 --- a/Tiobon.Core.Model/ViewModels/SidebarMenuViewModel.cs +++ b/Tiobon.Core.Model/ViewModels/SidebarMenuViewModel.cs @@ -1,27 +1,24 @@ -using System.Collections.Generic; +namespace Tiobon.Core.Model.ViewModels; -namespace Tiobon.Core.Model.ViewModels +/// +/// 菜单展示model +/// +public class SidebarMenuViewModel { - /// - /// 菜单展示model - /// - public class SidebarMenuViewModel + public SidebarMenuViewModel() { - public SidebarMenuViewModel() - { - this.ChildMenuList = new List(); - } + this.ChildMenuList = new List(); + } - public int Id { get; set; } - public int? ParentId { get; set; } - public string Name { get; set; } - public string Icon { get; set; } - public string Code { get; set; } - public string LinkUrl { get; set; } - public string Area { get; set; } - public string Controller { get; set; } - public string Action { get; set; } + public int Id { get; set; } + public int? ParentId { get; set; } + public string Name { get; set; } + public string Icon { get; set; } + public string Code { get; set; } + public string LinkUrl { get; set; } + public string Area { get; set; } + public string Controller { get; set; } + public string Action { get; set; } - public List ChildMenuList { get; set; } - } + public List ChildMenuList { get; set; } } diff --git a/Tiobon.Core.Model/ViewModels/SysUserInfoDto.cs b/Tiobon.Core.Model/ViewModels/SysUserInfoDto.cs index 574b4af1..e740c3ff 100644 --- a/Tiobon.Core.Model/ViewModels/SysUserInfoDto.cs +++ b/Tiobon.Core.Model/ViewModels/SysUserInfoDto.cs @@ -1,28 +1,24 @@ -using System; -using System.Collections.Generic; +namespace Tiobon.Core.Model.ViewModels; -namespace Tiobon.Core.Model.ViewModels +public class SysUserInfoDto : SysUserInfoDtoRoot { - public class SysUserInfoDto : SysUserInfoDtoRoot - { - public string uLoginName { get; set; } - public string uLoginPWD { get; set; } - public string uRealName { get; set; } - public int uStatus { get; set; } - public long DepartmentId { get; set; } - public string uRemark { get; set; } - public System.DateTime uCreateTime { get; set; } = DateTime.Now; - public System.DateTime uUpdateTime { get; set; } = DateTime.Now; - public DateTime uLastErrTime { get; set; } = DateTime.Now; - public int uErrorCount { get; set; } - public string name { get; set; } - public int sex { get; set; } = 0; - public int age { get; set; } - public DateTime birth { get; set; } = DateTime.Now; - public string addr { get; set; } - public bool tdIsDelete { get; set; } - public List RoleNames { get; set; } - public List Dids { get; set; } - public string DepartmentName { get; set; } - } + public string uLoginName { get; set; } + public string uLoginPWD { get; set; } + public string uRealName { get; set; } + public int uStatus { get; set; } + public long DepartmentId { get; set; } + public string uRemark { get; set; } + public System.DateTime uCreateTime { get; set; } = DateTime.Now; + public System.DateTime uUpdateTime { get; set; } = DateTime.Now; + public DateTime uLastErrTime { get; set; } = DateTime.Now; + public int uErrorCount { get; set; } + public string name { get; set; } + public int sex { get; set; } = 0; + public int age { get; set; } + public DateTime birth { get; set; } = DateTime.Now; + public string addr { get; set; } + public bool tdIsDelete { get; set; } + public List RoleNames { get; set; } + public List Dids { get; set; } + public string DepartmentName { get; set; } } diff --git a/Tiobon.Core.Model/ViewModels/TaskInfoDto.cs b/Tiobon.Core.Model/ViewModels/TaskInfoDto.cs index 27a7ec58..0a3586fe 100644 --- a/Tiobon.Core.Model/ViewModels/TaskInfoDto.cs +++ b/Tiobon.Core.Model/ViewModels/TaskInfoDto.cs @@ -1,41 +1,36 @@ -using System; -using System.Collections.Generic; -using System.Text; +namespace Tiobon.Core.Model.ViewModels; -namespace Tiobon.Core.Model.ViewModels +/// +/// 调度任务触发器信息实体 +/// +public class TaskInfoDto { /// - /// 调度任务触发器信息实体 + /// 任务ID /// - public class TaskInfoDto - { - /// - /// 任务ID - /// - public string jobId { get; set; } - /// - /// 任务名称 - /// - public string jobName { get; set; } - /// - /// 任务分组 - /// - public string jobGroup { get; set; } - /// - /// 触发器ID - /// - public string triggerId { get; set; } - /// - /// 触发器名称 - /// - public string triggerName { get; set; } - /// - /// 触发器分组 - /// - public string triggerGroup { get; set; } - /// - /// 触发器状态 - /// - public string triggerStatus { get; set; } - } + public string jobId { get; set; } + /// + /// 任务名称 + /// + public string jobName { get; set; } + /// + /// 任务分组 + /// + public string jobGroup { get; set; } + /// + /// 触发器ID + /// + public string triggerId { get; set; } + /// + /// 触发器名称 + /// + public string triggerName { get; set; } + /// + /// 触发器分组 + /// + public string triggerGroup { get; set; } + /// + /// 触发器状态 + /// + public string triggerStatus { get; set; } } diff --git a/Tiobon.Core.Model/ViewModels/TestRestSharpGetDto.cs b/Tiobon.Core.Model/ViewModels/TestRestSharpGetDto.cs index 23c60493..be7c0f50 100644 --- a/Tiobon.Core.Model/ViewModels/TestRestSharpGetDto.cs +++ b/Tiobon.Core.Model/ViewModels/TestRestSharpGetDto.cs @@ -1,19 +1,18 @@ using Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.ViewModels +namespace Tiobon.Core.Model.ViewModels; + +/// +/// 用来测试 RestSharp Get 请求 +/// +public class TestRestSharpGetDto { /// - /// 用来测试 RestSharp Get 请求 + /// + /// + public string success { get; set; } + /// + /// /// - public class TestRestSharpGetDto - { - /// - /// - /// - public string success { get; set; } - /// - /// - /// - public TiobonArticle data { get; set; } - } + public TiobonArticle data { get; set; } } diff --git a/Tiobon.Core.Model/ViewModels/TestRestSharpPostDto.cs b/Tiobon.Core.Model/ViewModels/TestRestSharpPostDto.cs index 09e47446..250f861d 100644 --- a/Tiobon.Core.Model/ViewModels/TestRestSharpPostDto.cs +++ b/Tiobon.Core.Model/ViewModels/TestRestSharpPostDto.cs @@ -1,11 +1,10 @@ -namespace Tiobon.Core.Model.ViewModels +namespace Tiobon.Core.Model.ViewModels; + +/// +/// 用来测试 RestSharp Post 请求 +/// +public class TestRestSharpPostDto { - /// - /// 用来测试 RestSharp Post 请求 - /// - public class TestRestSharpPostDto - { - public bool success { get; set; } - public string name { get; set; } - } + public bool success { get; set; } + public string name { get; set; } } diff --git a/Tiobon.Core.Model/ViewModels/TokenInfoViewModel.cs b/Tiobon.Core.Model/ViewModels/TokenInfoViewModel.cs index a1766f34..e16b912b 100644 --- a/Tiobon.Core.Model/ViewModels/TokenInfoViewModel.cs +++ b/Tiobon.Core.Model/ViewModels/TokenInfoViewModel.cs @@ -1,10 +1,9 @@ -namespace Tiobon.Core.Model.ViewModels +namespace Tiobon.Core.Model.ViewModels; + +public class TokenInfoViewModel { - public class TokenInfoViewModel - { - public bool success { get; set; } - public string token { get; set; } - public double expires_in { get; set; } - public string token_type { get; set; } - } + public bool success { get; set; } + public string token { get; set; } + public double expires_in { get; set; } + public string token_type { get; set; } } diff --git a/Tiobon.Core.Model/ViewModels/TopgbViewModels.cs b/Tiobon.Core.Model/ViewModels/TopgbViewModels.cs index d31e445c..1b1c9507 100644 --- a/Tiobon.Core.Model/ViewModels/TopgbViewModels.cs +++ b/Tiobon.Core.Model/ViewModels/TopgbViewModels.cs @@ -1,23 +1,22 @@ -namespace Tiobon.Core.Model.ViewModels +namespace Tiobon.Core.Model.ViewModels; + +/// +/// 留言排名展示类 +/// +public class TopgbViewModels { - /// - /// 留言排名展示类 + /// 博客ID + /// /// - public class TopgbViewModels - { - /// 博客ID - /// - /// - public int? TiobonId { get; set; } + public int? TiobonId { get; set; } - /// - /// 评论数量 - /// - public int counts { get; set; } + /// + /// 评论数量 + /// + public int counts { get; set; } - /// 博客标题 - /// - /// - public string btitle { get; set; } - } + /// 博客标题 + /// + /// + public string btitle { get; set; } } diff --git a/Tiobon.Core.Model/ViewModels/UploadFileDto.cs b/Tiobon.Core.Model/ViewModels/UploadFileDto.cs index 0a19244f..e229925b 100644 --- a/Tiobon.Core.Model/ViewModels/UploadFileDto.cs +++ b/Tiobon.Core.Model/ViewModels/UploadFileDto.cs @@ -1,20 +1,18 @@ using Microsoft.AspNetCore.Http; -using System.ComponentModel.DataAnnotations; -namespace Tiobon.Core.Model.ViewModels +namespace Tiobon.Core.Model.ViewModels; + +public class UploadFileDto { - public class UploadFileDto - { - //多文件 - [Required] - public IFormFileCollection file { get; set; } + //多文件 + [Required] + public IFormFileCollection file { get; set; } - //单文件 - //public IFormFile File { get; set; } + //单文件 + //public IFormFile File { get; set; } - //其他数据 - public string Foo { get; set; } + //其他数据 + public string Foo { get; set; } - - } + } diff --git a/Tiobon.Core.Repository/MongoRepository/IMongoBaseRepository.cs b/Tiobon.Core.Repository/MongoRepository/IMongoBaseRepository.cs index e0276bbf..dc5480af 100644 --- a/Tiobon.Core.Repository/MongoRepository/IMongoBaseRepository.cs +++ b/Tiobon.Core.Repository/MongoRepository/IMongoBaseRepository.cs @@ -1,16 +1,13 @@ using MongoDB.Driver; -using System.Collections.Generic; -using System.Threading.Tasks; -namespace Tiobon.Core.Repository.MongoRepository -{ +namespace Tiobon.Core.Repository.MongoRepository; + - public interface IMongoBaseRepository where TEntity : class - { - Task AddAsync(TEntity entity); - Task GetAsync(int Id); - Task> GetListAsync(); - Task GetByObjectIdAsync(string Id); - Task> GetListFilterAsync(FilterDefinition filter); - } +public interface IMongoBaseRepository where TEntity : class +{ + Task AddAsync(TEntity entity); + Task GetAsync(int Id); + Task> GetListAsync(); + Task GetByObjectIdAsync(string Id); + Task> GetListFilterAsync(FilterDefinition filter); } diff --git a/Tiobon.Core.Repository/MongoRepository/MongoBaseRepository.cs b/Tiobon.Core.Repository/MongoRepository/MongoBaseRepository.cs index 894040c0..502b2c15 100644 --- a/Tiobon.Core.Repository/MongoRepository/MongoBaseRepository.cs +++ b/Tiobon.Core.Repository/MongoRepository/MongoBaseRepository.cs @@ -1,57 +1,54 @@ using MongoDB.Bson; using MongoDB.Driver; -using System.Collections.Generic; -using System.Threading.Tasks; -namespace Tiobon.Core.Repository.MongoRepository +namespace Tiobon.Core.Repository.MongoRepository; + + + +public class MongoBaseRepository : IMongoBaseRepository where TEntity : class, new() { + private readonly MongoDbContext _context; + + public MongoBaseRepository() + { + _context = new MongoDbContext(); + } + public async Task AddAsync(TEntity entity) + { + await _context.Db.GetCollection(typeof(TEntity).Name) + .InsertOneAsync(entity); + } + + public async Task GetAsync(int Id) + { + var filter = Builders.Filter.Eq("Id", Id); + + return await _context.Db.GetCollection(typeof(TEntity).Name) + .Find(filter) + .FirstOrDefaultAsync(); + } + + public async Task GetByObjectIdAsync(string Id) + { + var filter = Builders.Filter.Eq("_id", ObjectId.Parse(Id)); + + return await _context.Db.GetCollection(typeof(TEntity).Name) + .Find(filter) + .FirstOrDefaultAsync(); + } + + public async Task> GetListAsync() + { + return await _context.Db.GetCollection(typeof(TEntity).Name) + .Find(new BsonDocument()) + .ToListAsync(); + } - public class MongoBaseRepository : IMongoBaseRepository where TEntity : class, new() + public async Task> GetListFilterAsync(FilterDefinition filter) { - private readonly MongoDbContext _context; - - public MongoBaseRepository() - { - _context = new MongoDbContext(); - } - - public async Task AddAsync(TEntity entity) - { - await _context.Db.GetCollection(typeof(TEntity).Name) - .InsertOneAsync(entity); - } - - public async Task GetAsync(int Id) - { - var filter = Builders.Filter.Eq("Id", Id); - - return await _context.Db.GetCollection(typeof(TEntity).Name) - .Find(filter) - .FirstOrDefaultAsync(); - } - - public async Task GetByObjectIdAsync(string Id) - { - var filter = Builders.Filter.Eq("_id", ObjectId.Parse(Id)); - - return await _context.Db.GetCollection(typeof(TEntity).Name) - .Find(filter) - .FirstOrDefaultAsync(); - } - - public async Task> GetListAsync() - { - return await _context.Db.GetCollection(typeof(TEntity).Name) - .Find(new BsonDocument()) - .ToListAsync(); - } - - public async Task> GetListFilterAsync(FilterDefinition filter) - { - - return await _context.Db.GetCollection(typeof(TEntity).Name) - .Find(filter).ToListAsync(); - } + + return await _context.Db.GetCollection(typeof(TEntity).Name) + .Find(filter).ToListAsync(); } } diff --git a/Tiobon.Core.Repository/MongoRepository/MongoDbContext.cs b/Tiobon.Core.Repository/MongoRepository/MongoDbContext.cs index 72c1a96d..412a2e3f 100644 --- a/Tiobon.Core.Repository/MongoRepository/MongoDbContext.cs +++ b/Tiobon.Core.Repository/MongoRepository/MongoDbContext.cs @@ -1,31 +1,30 @@  -using Tiobon.Core.Common; using MongoDB.Driver; +using Tiobon.Core.Common; -namespace Tiobon.Core.Repository.MongoRepository -{ +namespace Tiobon.Core.Repository.MongoRepository; - public class MongoDbContext - { - private readonly IMongoDatabase _database = null; - public MongoDbContext() - { - var client = new MongoClient(AppSettings.app(new string[] { "Mongo", "ConnectionString" })); - _database = client.GetDatabase(AppSettings.app(new string[] { "Mongo", "Database" })); - } +public class MongoDbContext +{ + private readonly IMongoDatabase _database = null; - public IMongoDatabase Db - { - get { return _database; } - } + public MongoDbContext() + { + var client = new MongoClient(AppSettings.app(new string[] { "Mongo", "ConnectionString" })); + _database = client.GetDatabase(AppSettings.app(new string[] { "Mongo", "Database" })); + } - //public IMongoCollection Query - //{ - // get - // { - // return _database.GetCollection(nameof(TEntity)); - // } - //} + public IMongoDatabase Db + { + get { return _database; } } + + //public IMongoCollection Query + //{ + // get + // { + // return _database.GetCollection(nameof(TEntity)); + // } + //} } diff --git a/Tiobon.Core.Repository/UnitOfWorks/IUnitOfWorkManage.cs b/Tiobon.Core.Repository/UnitOfWorks/IUnitOfWorkManage.cs index adafa823..e77d9213 100644 --- a/Tiobon.Core.Repository/UnitOfWorks/IUnitOfWorkManage.cs +++ b/Tiobon.Core.Repository/UnitOfWorks/IUnitOfWorkManage.cs @@ -1,20 +1,19 @@ using System.Reflection; using SqlSugar; -namespace Tiobon.Core.Repository.UnitOfWorks +namespace Tiobon.Core.Repository.UnitOfWorks; + +public interface IUnitOfWorkManage { - public interface IUnitOfWorkManage - { - SqlSugarScope GetDbClient(); - int TranCount { get; } + SqlSugarScope GetDbClient(); + int TranCount { get; } - UnitOfWork CreateUnitOfWork(); + UnitOfWork CreateUnitOfWork(); - void BeginTran(); - void BeginTran(MethodInfo method); - void CommitTran(); - void CommitTran(MethodInfo method); - void RollbackTran(); - void RollbackTran(MethodInfo method); - } + void BeginTran(); + void BeginTran(MethodInfo method); + void CommitTran(); + void CommitTran(MethodInfo method); + void RollbackTran(); + void RollbackTran(MethodInfo method); } \ No newline at end of file diff --git a/Tiobon.Core.Repository/UnitOfWorks/UnitOfWork.cs b/Tiobon.Core.Repository/UnitOfWorks/UnitOfWork.cs index 187509ed..998b7f81 100644 --- a/Tiobon.Core.Repository/UnitOfWorks/UnitOfWork.cs +++ b/Tiobon.Core.Repository/UnitOfWorks/UnitOfWork.cs @@ -1,5 +1,4 @@ -using System; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging; using SqlSugar; namespace Tiobon.Core.Repository.UnitOfWorks; diff --git a/Tiobon.Core.Repository/UnitOfWorks/UnitOfWorkManage.cs b/Tiobon.Core.Repository/UnitOfWorks/UnitOfWorkManage.cs index 399e4d5c..827010a0 100644 --- a/Tiobon.Core.Repository/UnitOfWorks/UnitOfWorkManage.cs +++ b/Tiobon.Core.Repository/UnitOfWorks/UnitOfWorkManage.cs @@ -1,163 +1,160 @@ -using System; +using Microsoft.Extensions.Logging; +using SqlSugar; using System.Collections.Concurrent; using System.Reflection; -using System.Threading; using Tiobon.Core.Common.Extensions; -using Microsoft.Extensions.Logging; -using SqlSugar; -namespace Tiobon.Core.Repository.UnitOfWorks +namespace Tiobon.Core.Repository.UnitOfWorks; + +public class UnitOfWorkManage : IUnitOfWorkManage { - public class UnitOfWorkManage : IUnitOfWorkManage - { - private readonly ILogger _logger; - private readonly ISqlSugarClient _sqlSugarClient; + private readonly ILogger _logger; + private readonly ISqlSugarClient _sqlSugarClient; - private int _tranCount { get; set; } - public int TranCount => _tranCount; - public readonly ConcurrentStack TranStack = new(); + private int _tranCount { get; set; } + public int TranCount => _tranCount; + public readonly ConcurrentStack TranStack = new(); - public UnitOfWorkManage(ISqlSugarClient sqlSugarClient, ILogger logger) - { - _sqlSugarClient = sqlSugarClient; - _logger = logger; - _tranCount = 0; - } + public UnitOfWorkManage(ISqlSugarClient sqlSugarClient, ILogger logger) + { + _sqlSugarClient = sqlSugarClient; + _logger = logger; + _tranCount = 0; + } - /// - /// 获取DB,保证唯一性 - /// - /// - public SqlSugarScope GetDbClient() - { - // 必须要as,后边会用到切换数据库操作 - return _sqlSugarClient as SqlSugarScope; - } + /// + /// 获取DB,保证唯一性 + /// + /// + public SqlSugarScope GetDbClient() + { + // 必须要as,后边会用到切换数据库操作 + return _sqlSugarClient as SqlSugarScope; + } - public UnitOfWork CreateUnitOfWork() - { - UnitOfWork uow = new UnitOfWork(); - uow.Logger = _logger; - uow.Db = _sqlSugarClient; - uow.Tenant = (ITenant) _sqlSugarClient; - uow.IsTran = true; - - uow.Db.Open(); - uow.Tenant.BeginTran(); - _logger.LogDebug("UnitOfWork Begin"); - return uow; - } + public UnitOfWork CreateUnitOfWork() + { + UnitOfWork uow = new UnitOfWork(); + uow.Logger = _logger; + uow.Db = _sqlSugarClient; + uow.Tenant = (ITenant) _sqlSugarClient; + uow.IsTran = true; + + uow.Db.Open(); + uow.Tenant.BeginTran(); + _logger.LogDebug("UnitOfWork Begin"); + return uow; + } - public void BeginTran() + public void BeginTran() + { + lock (this) { - lock (this) - { - _tranCount++; - GetDbClient().BeginTran(); - } + _tranCount++; + GetDbClient().BeginTran(); } + } - public void BeginTran(MethodInfo method) + public void BeginTran(MethodInfo method) + { + lock (this) { - lock (this) - { - GetDbClient().BeginTran(); - TranStack.Push(method.GetFullName()); - _tranCount = TranStack.Count; - } + GetDbClient().BeginTran(); + TranStack.Push(method.GetFullName()); + _tranCount = TranStack.Count; } + } - public void CommitTran() + public void CommitTran() + { + lock (this) { - lock (this) + _tranCount--; + if (_tranCount == 0) { - _tranCount--; - if (_tranCount == 0) + try { - try - { - GetDbClient().CommitTran(); - } - catch (Exception ex) - { - Console.WriteLine(ex.Message); - GetDbClient().RollbackTran(); - } + GetDbClient().CommitTran(); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + GetDbClient().RollbackTran(); } } } + } - public void CommitTran(MethodInfo method) + public void CommitTran(MethodInfo method) + { + lock (this) { - lock (this) + string result = ""; + while (!TranStack.IsEmpty && !TranStack.TryPeek(out result)) { - string result = ""; - while (!TranStack.IsEmpty && !TranStack.TryPeek(out result)) - { - Thread.Sleep(1); - } + Thread.Sleep(1); + } - if (result == method.GetFullName()) + if (result == method.GetFullName()) + { + try { - try - { - GetDbClient().CommitTran(); + GetDbClient().CommitTran(); - _logger.LogDebug($"Commit Transaction"); - Console.WriteLine($"Commit Transaction"); - } - catch (Exception ex) + _logger.LogDebug($"Commit Transaction"); + Console.WriteLine($"Commit Transaction"); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + GetDbClient().RollbackTran(); + _logger.LogDebug($"Commit Error , Rollback Transaction"); + } + finally + { + while (!TranStack.TryPop(out _)) { - Console.WriteLine(ex.Message); - GetDbClient().RollbackTran(); - _logger.LogDebug($"Commit Error , Rollback Transaction"); + Thread.Sleep(1); } - finally - { - while (!TranStack.TryPop(out _)) - { - Thread.Sleep(1); - } - _tranCount = TranStack.Count; - } + _tranCount = TranStack.Count; } } } + } - public void RollbackTran() + public void RollbackTran() + { + lock (this) { - lock (this) - { - _tranCount--; - GetDbClient().RollbackTran(); - } + _tranCount--; + GetDbClient().RollbackTran(); } + } - public void RollbackTran(MethodInfo method) + public void RollbackTran(MethodInfo method) + { + lock (this) { - lock (this) + string result = ""; + while (!TranStack.IsEmpty && !TranStack.TryPeek(out result)) { - string result = ""; - while (!TranStack.IsEmpty && !TranStack.TryPeek(out result)) + Thread.Sleep(1); + } + + if (result == method.GetFullName()) + { + GetDbClient().RollbackTran(); + _logger.LogDebug($"Rollback Transaction"); + Console.WriteLine($"Rollback Transaction"); + while (!TranStack.TryPop(out _)) { Thread.Sleep(1); } - if (result == method.GetFullName()) - { - GetDbClient().RollbackTran(); - _logger.LogDebug($"Rollback Transaction"); - Console.WriteLine($"Rollback Transaction"); - while (!TranStack.TryPop(out _)) - { - Thread.Sleep(1); - } - - _tranCount = TranStack.Count; - } + _tranCount = TranStack.Count; } } } diff --git a/Tiobon.Core.Serilog.Es/AppSettingsFileNameConfig.cs b/Tiobon.Core.Serilog.Es/AppSettingsFileNameConfig.cs index 23a457c1..abc63dae 100644 --- a/Tiobon.Core.Serilog.Es/AppSettingsFileNameConfig.cs +++ b/Tiobon.Core.Serilog.Es/AppSettingsFileNameConfig.cs @@ -1,30 +1,27 @@ -using System; +namespace Tiobon.Core.Serilog.Es; -namespace Tiobon.Core.Serilog.Es +public class AppSettingsFileNameConfig { - public class AppSettingsFileNameConfig - { - /// - /// 配置文件名称常量 - /// - public static string AppSettingsFileName = $"appsettings{ GetAppSettingsConfigName() }json"; + /// + /// 配置文件名称常量 + /// + public static string AppSettingsFileName = $"appsettings{ GetAppSettingsConfigName() }json"; - /// - /// 根据环境变量定向配置文件名称 - /// - /// - private static string GetAppSettingsConfigName() + /// + /// 根据环境变量定向配置文件名称 + /// + /// + private static string GetAppSettingsConfigName() + { + if (Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") != null + && Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") != "") + { + return $".{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}."; + } + else { - if (Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") != null - && Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") != "") - { - return $".{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}."; - } - else - { - return "."; - } + return "."; } } } diff --git a/Tiobon.Core.Serilog.Es/Formatters/JsonConfigUtils.cs b/Tiobon.Core.Serilog.Es/Formatters/JsonConfigUtils.cs index 94231c93..a78a2c80 100644 --- a/Tiobon.Core.Serilog.Es/Formatters/JsonConfigUtils.cs +++ b/Tiobon.Core.Serilog.Es/Formatters/JsonConfigUtils.cs @@ -3,64 +3,63 @@ using Microsoft.Extensions.Configuration.Json; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -namespace Tiobon.Core.Serilog.Es.Formatters +namespace Tiobon.Core.Serilog.Es.Formatters; + +/// +/// Json 配置文件通用类 +/// +public static class JsonConfigUtils { + #region 变量 + /// - /// Json 配置文件通用类 + /// 锁 /// - public static class JsonConfigUtils - { - #region 变量 - - /// - /// 锁 - /// - private static object __Lock__ = new object(); + private static object __Lock__ = new object(); - // 读取到的系统配置信息 - public static IConfiguration Configuration { get; set; } + // 读取到的系统配置信息 + public static IConfiguration Configuration { get; set; } - #endregion + #endregion - /// - /// 读取配置文件的信息 - /// - /// - /// 要读取json的名称 - /// 要读取的json节点名称 - /// - public static T GetAppSettings(string AppSettingsFileName, string key) where T : class, new() + /// + /// 读取配置文件的信息 + /// + /// + /// 要读取json的名称 + /// 要读取的json节点名称 + /// + public static T GetAppSettings(string AppSettingsFileName, string key) where T : class, new() + { + lock (__Lock__) { - lock (__Lock__) + if (Configuration == null) { - if (Configuration == null) - { - Configuration = new ConfigurationBuilder() - .Add(new JsonConfigurationSource - { - Path = AppSettingsFileName, - Optional = false, - ReloadOnChange = true - }) - .Build(); - } - var appconfig = new ServiceCollection() - .AddOptions() - .Configure(Configuration.GetSection(key)) - .BuildServiceProvider() - .GetService>() - .Value; - - return appconfig; + Configuration = new ConfigurationBuilder() + .Add(new JsonConfigurationSource + { + Path = AppSettingsFileName, + Optional = false, + ReloadOnChange = true + }) + .Build(); } + var appconfig = new ServiceCollection() + .AddOptions() + .Configure(Configuration.GetSection(key)) + .BuildServiceProvider() + .GetService>() + .Value; + + return appconfig; } + } - public static string GetJson(string jsonPath, string key) - { - IConfiguration config = new ConfigurationBuilder().AddJsonFile(jsonPath).Build(); //json文件地址 - string s = config.GetSection(key).Value; //json某个对象 - return s; - } + public static string GetJson(string jsonPath, string key) + { + IConfiguration config = new ConfigurationBuilder().AddJsonFile(jsonPath).Build(); //json文件地址 + string s = config.GetSection(key).Value; //json某个对象 + return s; } } diff --git a/Tiobon.Core.Serilog.Es/Formatters/LogConfigRootDTO.cs b/Tiobon.Core.Serilog.Es/Formatters/LogConfigRootDTO.cs index 6283fdff..7713c4cd 100644 --- a/Tiobon.Core.Serilog.Es/Formatters/LogConfigRootDTO.cs +++ b/Tiobon.Core.Serilog.Es/Formatters/LogConfigRootDTO.cs @@ -1,26 +1,23 @@ -using System.Collections.Generic; +namespace Tiobon.Core.Serilog.Es.Formatters; -namespace Tiobon.Core.Serilog.Es.Formatters + +public class LogConfigRootDTO { - - public class LogConfigRootDTO - { - /// - /// tcp日志的host地址 - /// - public string tcpAddressHost { set; get; } + /// + /// tcp日志的host地址 + /// + public string tcpAddressHost { set; get; } - /// - /// tcp日志的port地址 - /// - public int tcpAddressPort { set; get; } + /// + /// tcp日志的port地址 + /// + public int tcpAddressPort { set; get; } - public List ConfigsInfo { get; set; } - } + public List ConfigsInfo { get; set; } +} - public class Configsinfo - { - public string FiedName { get; set; } - public string FiedValue { get; set; } - } +public class Configsinfo +{ + public string FiedName { get; set; } + public string FiedValue { get; set; } } diff --git a/Tiobon.Core.Serilog.Es/Formatters/LogstashJsonFormatter.cs b/Tiobon.Core.Serilog.Es/Formatters/LogstashJsonFormatter.cs index d805151d..91b821b6 100644 --- a/Tiobon.Core.Serilog.Es/Formatters/LogstashJsonFormatter.cs +++ b/Tiobon.Core.Serilog.Es/Formatters/LogstashJsonFormatter.cs @@ -12,141 +12,136 @@ // See the License for the specific language governing permissions and // limitations under the License. -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using Serilog.Events; using Serilog.Formatting; using Serilog.Formatting.Json; using Tiobon.Core.Serilog.Es.HttpInfo; - -namespace Tiobon.Core.Serilog.Es.Formatters + +namespace Tiobon.Core.Serilog.Es.Formatters; + +public class LogstashJsonFormatter : ITextFormatter { - public class LogstashJsonFormatter : ITextFormatter + private static readonly JsonValueFormatter ValueFormatter = new JsonValueFormatter(); + + public void Format(LogEvent logEvent, TextWriter output) + { + FormatContent(logEvent, output); + + output.WriteLine(); + } + + + /// + /// 格式化 最终输出到elk的核心部分 + /// + /// + /// + private static void FormatContent(LogEvent logEvent, TextWriter output) { - private static readonly JsonValueFormatter ValueFormatter = new JsonValueFormatter(); + if (logEvent == null) throw new ArgumentNullException(nameof(logEvent)); + if (output == null) throw new ArgumentNullException(nameof(output)); + + output.Write('{'); - public void Format(LogEvent logEvent, TextWriter output) + // 读取相关配置 + var logConfigRootDTOInfo = JsonConfigUtils.GetAppSettings(AppSettingsFileNameConfig.AppSettingsFileName, "LogFiedOutPutConfigs"); + if (logConfigRootDTOInfo == null) { - FormatContent(logEvent, output); - - output.WriteLine(); + return; } - - /// - /// 格式化 最终输出到elk的核心部分 - /// - /// - /// - private static void FormatContent(LogEvent logEvent, TextWriter output) + // 写入所有的项目配置项的字段 在appsetting中配置的 输出elk节点的数据字段 + foreach (var item in logConfigRootDTOInfo.ConfigsInfo) { - if (logEvent == null) throw new ArgumentNullException(nameof(logEvent)); - if (output == null) throw new ArgumentNullException(nameof(output)); - - output.Write('{'); - - // 读取相关配置 - var logConfigRootDTOInfo = JsonConfigUtils.GetAppSettings(AppSettingsFileNameConfig.AppSettingsFileName, "LogFiedOutPutConfigs"); - if (logConfigRootDTOInfo == null) + switch (item.FiedName) { - return; + //case "orgid": + // WritePropertyAndValue(output, "method", HttpContextProvider.GetCurrent().Request.Method); + // output.Write(","); + // break; + default: + WritePropertyAndValue(output, item.FiedName, item.FiedValue); + output.Write(","); + break; } - - // 写入所有的项目配置项的字段 在appsetting中配置的 输出elk节点的数据字段 - foreach (var item in logConfigRootDTOInfo.ConfigsInfo) + } + // 写入http对应的信息数据 + if (HttpContextProvider.GetCurrent()!=null && HttpContextProvider.GetCurrent().Request!=null) + { + if (!string.IsNullOrEmpty(HttpContextProvider.GetCurrent().Request.Method)) { - switch (item.FiedName) - { - //case "orgid": - // WritePropertyAndValue(output, "method", HttpContextProvider.GetCurrent().Request.Method); - // output.Write(","); - // break; - default: - WritePropertyAndValue(output, item.FiedName, item.FiedValue); - output.Write(","); - break; - } + WritePropertyAndValue(output, "method", HttpContextProvider.GetCurrent().Request.Method); + output.Write(","); } - // 写入http对应的信息数据 - if (HttpContextProvider.GetCurrent()!=null && HttpContextProvider.GetCurrent().Request!=null) + // 输出请求页面url + if (!string.IsNullOrEmpty(HttpContextProvider.GetCurrent().Request.Path)) { - if (!string.IsNullOrEmpty(HttpContextProvider.GetCurrent().Request.Method)) - { - WritePropertyAndValue(output, "method", HttpContextProvider.GetCurrent().Request.Method); - output.Write(","); - } - // 输出请求页面url - if (!string.IsNullOrEmpty(HttpContextProvider.GetCurrent().Request.Path)) - { - WritePropertyAndValue(output, "requestUrl", HttpContextProvider.GetCurrent().Request.Path.ToString()); - output.Write(","); - } - // 输出携带token - if (HttpContextProvider.GetCurrent().Request.Headers["Authorization"].FirstOrDefault() != null) - { - WritePropertyAndValue(output, "Authorization", HttpContextProvider.GetCurrent().Request.Headers["Authorization"].FirstOrDefault()); - output.Write(","); - } - // 输出请求参数 - if (!string.IsNullOrEmpty(HttpContextProvider.GetCurrent().Request.Method)) - { - string contentFromBody = ParamsHelper.GetParams(HttpContextProvider.GetCurrent()); - WritePropertyAndValue(output, "requestParam", contentFromBody); - output.Write(","); - } - // 输出请求方法类型 - if (!string.IsNullOrEmpty(HttpContextProvider.GetCurrent().Request.Method)) - { - WritePropertyAndValue(output, "method", HttpContextProvider.GetCurrent().Request.Method); - output.Write(","); - } + WritePropertyAndValue(output, "requestUrl", HttpContextProvider.GetCurrent().Request.Path.ToString()); + output.Write(","); } - // 输出请求时间戳 - WritePropertyAndValue(output, "timestamp", logEvent.Timestamp.ToString("o")); - output.Write(","); - - // 输出日志级别 - WritePropertyAndValue(output, "level", logEvent.Level.ToString()); - output.Write(","); - - // 输出log内容 - WritePropertyAndValue(output, "executeResult", logEvent.MessageTemplate.Render(logEvent.Properties)); - - if (logEvent.Exception != null) + // 输出携带token + if (HttpContextProvider.GetCurrent().Request.Headers["Authorization"].FirstOrDefault() != null) { + WritePropertyAndValue(output, "Authorization", HttpContextProvider.GetCurrent().Request.Headers["Authorization"].FirstOrDefault()); + output.Write(","); + } + // 输出请求参数 + if (!string.IsNullOrEmpty(HttpContextProvider.GetCurrent().Request.Method)) + { + string contentFromBody = ParamsHelper.GetParams(HttpContextProvider.GetCurrent()); + WritePropertyAndValue(output, "requestParam", contentFromBody); + output.Write(","); + } + // 输出请求方法类型 + if (!string.IsNullOrEmpty(HttpContextProvider.GetCurrent().Request.Method)) + { + WritePropertyAndValue(output, "method", HttpContextProvider.GetCurrent().Request.Method); output.Write(","); - WritePropertyAndValue(output, "exception", logEvent.Exception.ToString()); } - - WriteProperties(logEvent.Properties, output); - - output.Write('}'); } + // 输出请求时间戳 + WritePropertyAndValue(output, "timestamp", logEvent.Timestamp.ToString("o")); + output.Write(","); + + // 输出日志级别 + WritePropertyAndValue(output, "level", logEvent.Level.ToString()); + output.Write(","); + + // 输出log内容 + WritePropertyAndValue(output, "executeResult", logEvent.MessageTemplate.Render(logEvent.Properties)); - private static void WritePropertyAndValue(TextWriter output, string propertyKey, string propertyValue) + if (logEvent.Exception != null) { - JsonValueFormatter.WriteQuotedJsonString(propertyKey, output); - output.Write(":"); - JsonValueFormatter.WriteQuotedJsonString(propertyValue, output); + output.Write(","); + WritePropertyAndValue(output, "exception", logEvent.Exception.ToString()); } - private static void WriteProperties(IReadOnlyDictionary properties, TextWriter output) - { - if (properties.Any()) output.Write(","); + WriteProperties(logEvent.Properties, output); - var precedingDelimiter = ""; - foreach (var property in properties) - { - output.Write(precedingDelimiter); - precedingDelimiter = ","; + output.Write('}'); + } - var camelCasePropertyKey = property.Key[0].ToString().ToLower() + property.Key.Substring(1); - JsonValueFormatter.WriteQuotedJsonString(camelCasePropertyKey, output); - output.Write(':'); - ValueFormatter.Format(property.Value, output); - } + private static void WritePropertyAndValue(TextWriter output, string propertyKey, string propertyValue) + { + JsonValueFormatter.WriteQuotedJsonString(propertyKey, output); + output.Write(":"); + JsonValueFormatter.WriteQuotedJsonString(propertyValue, output); + } + + private static void WriteProperties(IReadOnlyDictionary properties, TextWriter output) + { + if (properties.Any()) output.Write(","); + + var precedingDelimiter = ""; + foreach (var property in properties) + { + output.Write(precedingDelimiter); + precedingDelimiter = ","; + + var camelCasePropertyKey = property.Key[0].ToString().ToLower() + property.Key.Substring(1); + JsonValueFormatter.WriteQuotedJsonString(camelCasePropertyKey, output); + output.Write(':'); + ValueFormatter.Format(property.Value, output); } } } \ No newline at end of file diff --git a/Tiobon.Core.Serilog.Es/HttpInfo/HttpContextProvider.cs b/Tiobon.Core.Serilog.Es/HttpInfo/HttpContextProvider.cs index 174aba69..3228179d 100644 --- a/Tiobon.Core.Serilog.Es/HttpInfo/HttpContextProvider.cs +++ b/Tiobon.Core.Serilog.Es/HttpInfo/HttpContextProvider.cs @@ -1,20 +1,18 @@ using Microsoft.AspNetCore.Http; -namespace Tiobon.Core.Serilog.Es.HttpInfo +namespace Tiobon.Core.Serilog.Es.HttpInfo; + +public static class HttpContextProvider { - public static class HttpContextProvider - { - private static IHttpContextAccessor _accessor; + private static IHttpContextAccessor _accessor; - public static HttpContext GetCurrent() - { - var context = _accessor?.HttpContext; - return context; - } - public static void ConfigureAccessor(IHttpContextAccessor accessor) - { - _accessor = accessor; - } + public static HttpContext GetCurrent() + { + var context = _accessor?.HttpContext; + return context; + } + public static void ConfigureAccessor(IHttpContextAccessor accessor) + { + _accessor = accessor; } - } diff --git a/Tiobon.Core.Serilog.Es/HttpInfo/ParamsHelper.cs b/Tiobon.Core.Serilog.Es/HttpInfo/ParamsHelper.cs index 5be0aaaa..8b059cac 100644 --- a/Tiobon.Core.Serilog.Es/HttpInfo/ParamsHelper.cs +++ b/Tiobon.Core.Serilog.Es/HttpInfo/ParamsHelper.cs @@ -1,82 +1,78 @@ using Microsoft.AspNetCore.Http; -using System; -using System.Collections.Generic; using System.Collections.Specialized; -using System.IO; using System.Text; using System.Web; -namespace Tiobon.Core.Serilog.Es.HttpInfo +namespace Tiobon.Core.Serilog.Es.HttpInfo; + +/// +/// 获取参数帮助类 +/// +public class ParamsHelper { /// - /// 获取参数帮助类 + /// 获取参数值 /// - public class ParamsHelper + /// + /// + public static string GetParams(HttpContext context) { - /// - /// 获取参数值 - /// - /// - /// - public static string GetParams(HttpContext context) + try { - try - { - NameValueCollection form = HttpUtility.ParseQueryString(context.Request.QueryString.ToString()); - HttpRequest request = context.Request; + NameValueCollection form = HttpUtility.ParseQueryString(context.Request.QueryString.ToString()); + HttpRequest request = context.Request; - string data = string.Empty; - switch (request.Method) - { - case "POST": + string data = string.Empty; + switch (request.Method) + { + case "POST": - request.Body.Position = 0; - using (var ms = new MemoryStream()) - { - request.Body.CopyTo(ms); - var b = ms.ToArray(); - data = Encoding.UTF8.GetString(b); //把body赋值给bodyStr - - } - break; - case "GET": - //第一步:取出所有get参数 - IDictionary parameters = new Dictionary(); - for (int f = 0; f < form.Count; f++) - { - string key = form.Keys[f]; - parameters.Add(key, form[key]); - } + request.Body.Position = 0; + using (var ms = new MemoryStream()) + { + request.Body.CopyTo(ms); + var b = ms.ToArray(); + data = Encoding.UTF8.GetString(b); //把body赋值给bodyStr + + } + break; + case "GET": + //第一步:取出所有get参数 + IDictionary parameters = new Dictionary(); + for (int f = 0; f < form.Count; f++) + { + string key = form.Keys[f]; + parameters.Add(key, form[key]); + } - // 第二步:把字典按Key的字母顺序排序 - IDictionary sortedParams = new SortedDictionary(parameters); - IEnumerator> dem = sortedParams.GetEnumerator(); + // 第二步:把字典按Key的字母顺序排序 + IDictionary sortedParams = new SortedDictionary(parameters); + IEnumerator> dem = sortedParams.GetEnumerator(); - // 第三步:把所有参数名和参数值串在一起 - StringBuilder query = new StringBuilder(); - while (dem.MoveNext()) + // 第三步:把所有参数名和参数值串在一起 + StringBuilder query = new StringBuilder(); + while (dem.MoveNext()) + { + string key = dem.Current.Key; + string value = dem.Current.Value; + if (!string.IsNullOrEmpty(key)) { - string key = dem.Current.Key; - string value = dem.Current.Value; - if (!string.IsNullOrEmpty(key)) - { - query.Append(key).Append("=").Append(value).Append("&"); - } + query.Append(key).Append("=").Append(value).Append("&"); } - data = query.ToString().TrimEnd('&'); - break; - default: - data = string.Empty; + } + data = query.ToString().TrimEnd('&'); + break; + default: + data = string.Empty; - break; - } - return data; - } - catch(Exception) - { - return string.Empty; + break; } + return data; + } + catch(Exception) + { + return string.Empty; } - } + } diff --git a/Tiobon.Core.Serilog.Es/NetworkLoggerConfigurationExtensions.cs b/Tiobon.Core.Serilog.Es/NetworkLoggerConfigurationExtensions.cs index 8aa18546..6b30ef02 100644 --- a/Tiobon.Core.Serilog.Es/NetworkLoggerConfigurationExtensions.cs +++ b/Tiobon.Core.Serilog.Es/NetworkLoggerConfigurationExtensions.cs @@ -1,102 +1,99 @@ -using System; -using System.Linq; -using System.Net; -using Serilog; +using Serilog; using Serilog.Configuration; using Serilog.Debugging; using Serilog.Events; using Serilog.Formatting; +using System.Net; using Tiobon.Core.Serilog.Es.Formatters; using Tiobon.Core.Serilog.Es.Sinks.TCP; -namespace Tiobon.Core.Serilog.Es +namespace Tiobon.Core.Serilog.Es; + +/// +/// Extends Serilog configuration to write events to the network. +/// +public static class NetworkLoggerConfigurationExtensions { + private static string TcpAddressHost = ""; + private static int TcpAddressProt = 0; /// - /// Extends Serilog configuration to write events to the network. + /// 获得tcpAddress /// - public static class NetworkLoggerConfigurationExtensions + private static void GetTcpAddress() { - private static string TcpAddressHost = ""; - private static int TcpAddressProt = 0; - /// - /// 获得tcpAddress - /// - private static void GetTcpAddress() + // 读取相关配置 + var logConfigRootDTOInfo = JsonConfigUtils.GetAppSettings(AppSettingsFileNameConfig.AppSettingsFileName, "LogFiedOutPutConfigs"); + if (logConfigRootDTOInfo == null) { - // 读取相关配置 - var logConfigRootDTOInfo = JsonConfigUtils.GetAppSettings(AppSettingsFileNameConfig.AppSettingsFileName, "LogFiedOutPutConfigs"); - if (logConfigRootDTOInfo == null) - { - return; - } - TcpAddressHost = logConfigRootDTOInfo.tcpAddressHost; - TcpAddressProt = logConfigRootDTOInfo.tcpAddressPort; + return; } + TcpAddressHost = logConfigRootDTOInfo.tcpAddressHost; + TcpAddressProt = logConfigRootDTOInfo.tcpAddressPort; + } - public static LoggerConfiguration TCPSink( - this LoggerSinkConfiguration loggerConfiguration, - ITextFormatter textFormatter = null, - LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum) + public static LoggerConfiguration TCPSink( + this LoggerSinkConfiguration loggerConfiguration, + ITextFormatter textFormatter = null, + LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum) + { + GetTcpAddress(); + if (!string.IsNullOrEmpty(TcpAddressHost)) { - GetTcpAddress(); - if (!string.IsNullOrEmpty(TcpAddressHost)) - { - var sink = new TCPSink(BuildUri($"tcp://{TcpAddressHost}:{TcpAddressProt}"), textFormatter ?? new LogstashJsonFormatter()); - return loggerConfiguration.Sink(sink, restrictedToMinimumLevel); - } - else { - return new LoggerConfiguration(); - } + var sink = new TCPSink(BuildUri($"tcp://{TcpAddressHost}:{TcpAddressProt}"), textFormatter ?? new LogstashJsonFormatter()); + return loggerConfiguration.Sink(sink, restrictedToMinimumLevel); } + else { + return new LoggerConfiguration(); + } + } - private static IPAddress ResolveAddress(string uri) - { - // Check if it is IP address - IPAddress address; + private static IPAddress ResolveAddress(string uri) + { + // Check if it is IP address + IPAddress address; - if (IPAddress.TryParse(uri, out address)) - return address; + if (IPAddress.TryParse(uri, out address)) + return address; - address = ResolveIP(uri); - if (address != null) - return address; + address = ResolveIP(uri); + if (address != null) + return address; - SelfLog.WriteLine("Unable to determine the destination IP-Address"); - return IPAddress.Loopback; - } + SelfLog.WriteLine("Unable to determine the destination IP-Address"); + return IPAddress.Loopback; + } - private static IPAddress ResolveIP(string uri) + private static IPAddress ResolveIP(string uri) + { + try { - try - { - var ipHostEntry = Dns.GetHostEntryAsync(uri).Result; - if (!ipHostEntry.AddressList.Any()) - return null; - return ipHostEntry.AddressList.First(); - } - catch (Exception) - { - SelfLog.WriteLine("Could not resolve " + uri); + var ipHostEntry = Dns.GetHostEntryAsync(uri).Result; + if (!ipHostEntry.AddressList.Any()) return null; - } + return ipHostEntry.AddressList.First(); + } + catch (Exception) + { + SelfLog.WriteLine("Could not resolve " + uri); + return null; } + } - private static Uri BuildUri(string s) + private static Uri BuildUri(string s) + { + Uri uri; + try + { + uri = new Uri(s); + } + catch (UriFormatException ex) { - Uri uri; - try - { - uri = new Uri(s); - } - catch (UriFormatException ex) - { - throw new ArgumentNullException("Uri should be in the format tcp://server:port", ex); - } - if (uri.Port == 0) - throw new UriFormatException("Uri port cannot be 0"); - if (!(uri.Scheme.ToLower() == "tcp" || uri.Scheme.ToLower() == "tls")) - throw new UriFormatException("Uri scheme must be tcp or tls"); - return uri; + throw new ArgumentNullException("Uri should be in the format tcp://server:port", ex); } + if (uri.Port == 0) + throw new UriFormatException("Uri port cannot be 0"); + if (!(uri.Scheme.ToLower() == "tcp" || uri.Scheme.ToLower() == "tls")) + throw new UriFormatException("Uri scheme must be tcp or tls"); + return uri; } } \ No newline at end of file diff --git a/Tiobon.Core.Serilog.Es/Sinks/TCP/TCPSink.cs b/Tiobon.Core.Serilog.Es/Sinks/TCP/TCPSink.cs index 3db62458..ccf01d42 100644 --- a/Tiobon.Core.Serilog.Es/Sinks/TCP/TCPSink.cs +++ b/Tiobon.Core.Serilog.Es/Sinks/TCP/TCPSink.cs @@ -1,44 +1,41 @@ -using System; -using System.IO; -using System.Net; -using System.Text; using Serilog.Core; using Serilog.Events; using Serilog.Formatting; - -namespace Tiobon.Core.Serilog.Es.Sinks.TCP +using System.Net; +using System.Text; + +namespace Tiobon.Core.Serilog.Es.Sinks.TCP; + +public class TCPSink : ILogEventSink, IDisposable { - public class TCPSink : ILogEventSink, IDisposable + private readonly ITextFormatter _formatter; + private readonly TcpSocketWriter _socketWriter; + + public TCPSink(IPAddress ipAddress, int port, ITextFormatter formatter) + { + _socketWriter = new TcpSocketWriter(new Uri($"tcp://{ipAddress}:{port}")); + _formatter = formatter; + } + + public TCPSink(Uri uri, ITextFormatter formatter) + { + _socketWriter = new TcpSocketWriter(uri); + _formatter = formatter; + } + + public void Emit(LogEvent logEvent) + { + var sb = new StringBuilder(); + + using (var sw = new StringWriter(sb)) + _formatter.Format(logEvent, sw); + + sb.Replace("RenderedMessage", "message"); + _socketWriter.Enqueue(sb.ToString()); + } + + public void Dispose() { - private readonly ITextFormatter _formatter; - private readonly TcpSocketWriter _socketWriter; - - public TCPSink(IPAddress ipAddress, int port, ITextFormatter formatter) - { - _socketWriter = new TcpSocketWriter(new Uri($"tcp://{ipAddress}:{port}")); - _formatter = formatter; - } - - public TCPSink(Uri uri, ITextFormatter formatter) - { - _socketWriter = new TcpSocketWriter(uri); - _formatter = formatter; - } - - public void Emit(LogEvent logEvent) - { - var sb = new StringBuilder(); - - using (var sw = new StringWriter(sb)) - _formatter.Format(logEvent, sw); - - sb.Replace("RenderedMessage", "message"); - _socketWriter.Enqueue(sb.ToString()); - } - - public void Dispose() - { - _socketWriter.Dispose(); - } + _socketWriter.Dispose(); } } \ No newline at end of file diff --git a/Tiobon.Core.Serilog.Es/Sinks/TCP/TCPSocketWriter.cs b/Tiobon.Core.Serilog.Es/Sinks/TCP/TCPSocketWriter.cs index ed53975a..5adbe114 100644 --- a/Tiobon.Core.Serilog.Es/Sinks/TCP/TCPSocketWriter.cs +++ b/Tiobon.Core.Serilog.Es/Sinks/TCP/TCPSocketWriter.cs @@ -14,312 +14,303 @@ * under the License. */ -using Serilog; -using System; using System.Collections.Concurrent; -using System.IO; -using System.Net; using System.Net.Security; using System.Net.Sockets; -using System.Security.Authentication; using System.Text; -using System.Text.RegularExpressions; -using System.Threading; -using System.Threading.Tasks; - -namespace Tiobon.Core.Serilog.Es.Sinks.TCP + +namespace Tiobon.Core.Serilog.Es.Sinks.TCP; + +/// +/// TcpSocketWriter encapsulates queueing strings to be written to a TCP _socket +/// and handling reconnections (according to a TcpConnectionPolicy object passed +/// to it) when a TCP session drops. +/// +/// +/// TcpSocketWriter maintains a fixed sized queue of strings to be sent via +/// the TCP _port and, while the _socket is open, sends them as quickly as possible. +/// +/// If the TCP session drops, TcpSocketWriter will stop pulling strings off the +/// queue until it can reestablish a connection. Any SocketErrors emitted during this +/// process will be passed as arguments to invocations of LoggingFailureHandler. +/// If the TcpConnectionPolicy.Connect method throws an exception (in particular, +/// TcpReconnectFailure to indicate that the policy has reached a point where it +/// will no longer try to establish a connection) then the LoggingFailureHandler +/// event is invoked, and no further attempt to log anything will be made. +/// +public class TcpSocketWriter : IDisposable { + private readonly FixedSizeQueue _eventQueue; + private readonly ExponentialBackoffTcpReconnectionPolicy _reconnectPolicy = new ExponentialBackoffTcpReconnectionPolicy(); + private readonly CancellationTokenSource _tokenSource; // Must be private or Dispose will not function properly. + private readonly TaskCompletionSource _disposed = new TaskCompletionSource(); + + private Stream _stream; + /// - /// TcpSocketWriter encapsulates queueing strings to be written to a TCP _socket - /// and handling reconnections (according to a TcpConnectionPolicy object passed - /// to it) when a TCP session drops. + /// Event that is invoked when reconnecting after a TCP session is dropped fails. /// - /// - /// TcpSocketWriter maintains a fixed sized queue of strings to be sent via - /// the TCP _port and, while the _socket is open, sends them as quickly as possible. - /// - /// If the TCP session drops, TcpSocketWriter will stop pulling strings off the - /// queue until it can reestablish a connection. Any SocketErrors emitted during this - /// process will be passed as arguments to invocations of LoggingFailureHandler. - /// If the TcpConnectionPolicy.Connect method throws an exception (in particular, - /// TcpReconnectFailure to indicate that the policy has reached a point where it - /// will no longer try to establish a connection) then the LoggingFailureHandler - /// event is invoked, and no further attempt to log anything will be made. - /// - public class TcpSocketWriter : IDisposable + public event Action LoggingFailureHandler = ex => { - private readonly FixedSizeQueue _eventQueue; - private readonly ExponentialBackoffTcpReconnectionPolicy _reconnectPolicy = new ExponentialBackoffTcpReconnectionPolicy(); - private readonly CancellationTokenSource _tokenSource; // Must be private or Dispose will not function properly. - private readonly TaskCompletionSource _disposed = new TaskCompletionSource(); - - private Stream _stream; - - /// - /// Event that is invoked when reconnecting after a TCP session is dropped fails. - /// - public event Action LoggingFailureHandler = ex => - { - UnexpectedErrorLogger( - ex, - (x, socketError) => + UnexpectedErrorLogger( + ex, + (x, socketError) => + { + if (socketError == null) { - if (socketError == null) - { - //Log.Error(x, "failure inside TCP socket: {message}", x.Message); - } - else - { - //Log.Error( - // x, - // "failure inside TCP socket: {message} - socket error found {socketErrorCode}", - // x.Message, - // socketError); - } - - }); - }; + //Log.Error(x, "failure inside TCP socket: {message}", x.Message); + } + else + { + //Log.Error( + // x, + // "failure inside TCP socket: {message} - socket error found {socketErrorCode}", + // x.Message, + // socketError); + } + + }); + }; - public static void UnexpectedErrorLogger(Exception ex, Action log) + public static void UnexpectedErrorLogger(Exception ex, Action log) + { + SocketError? socketErrorCode = null; + var current = ex; + do { - SocketError? socketErrorCode = null; - var current = ex; - do + if (current is SocketException) { - if (current is SocketException) - { - socketErrorCode = ((SocketException) current).SocketErrorCode; - } + socketErrorCode = ((SocketException) current).SocketErrorCode; + } - current = current.InnerException; - } while (socketErrorCode == null && current != null); + current = current.InnerException; + } while (socketErrorCode == null && current != null); - log(ex, socketErrorCode); - } + log(ex, socketErrorCode); + } - /// - /// Construct a TCP _socket writer that writes to the given endPoint and _port. - /// - /// Uri to open a TCP socket to. - /// The maximum number of log entries to queue before starting to drop entries. - public TcpSocketWriter(Uri uri, int maxQueueSize = 5000) + /// + /// Construct a TCP _socket writer that writes to the given endPoint and _port. + /// + /// Uri to open a TCP socket to. + /// The maximum number of log entries to queue before starting to drop entries. + public TcpSocketWriter(Uri uri, int maxQueueSize = 5000) + { + _eventQueue = new FixedSizeQueue(maxQueueSize); + _tokenSource = new CancellationTokenSource(); + + Func> tryOpenSocket = async h => { - _eventQueue = new FixedSizeQueue(maxQueueSize); - _tokenSource = new CancellationTokenSource(); + try + { + TcpClient client = new TcpClient(); + await client.ConnectAsync(uri.Host, uri.Port); + Stream stream = client.GetStream(); + if (uri.Scheme.ToLower() != "tls") + return stream; - Func> tryOpenSocket = async h => + var sslStream = new SslStream(client.GetStream(), false, null, null); + await sslStream.AuthenticateAsClientAsync(uri.Host); + return sslStream; + } + catch (Exception e) { - try - { - TcpClient client = new TcpClient(); - await client.ConnectAsync(uri.Host, uri.Port); - Stream stream = client.GetStream(); - if (uri.Scheme.ToLower() != "tls") - return stream; - - var sslStream = new SslStream(client.GetStream(), false, null, null); - await sslStream.AuthenticateAsClientAsync(uri.Host); - return sslStream; - } - catch (Exception e) - { - LoggingFailureHandler(e); - throw; - } - }; + LoggingFailureHandler(e); + throw; + } + }; - var threadReady = new TaskCompletionSource(); + var threadReady = new TaskCompletionSource(); - Task queueListener = Task.Factory.StartNew(async () => + Task queueListener = Task.Factory.StartNew(async () => + { + try { - try - { - bool sslEnabled = uri.Scheme.ToLower() == "tls"; - _stream = await _reconnectPolicy.ConnectAsync(tryOpenSocket, uri, _tokenSource.Token); - threadReady.SetResult(true); // Signal the calling thread that we are ready. + bool sslEnabled = uri.Scheme.ToLower() == "tls"; + _stream = await _reconnectPolicy.ConnectAsync(tryOpenSocket, uri, _tokenSource.Token); + threadReady.SetResult(true); // Signal the calling thread that we are ready. - string entry = null; - while (_stream != null) // null indicates that the thread has been cancelled and cleaned up. + string entry = null; + while (_stream != null) // null indicates that the thread has been cancelled and cleaned up. + { + if (_tokenSource.Token.IsCancellationRequested) { - if (_tokenSource.Token.IsCancellationRequested) - { - _eventQueue.CompleteAdding(); - // Post-condition: no further items will be added to the queue, so there will be a finite number of items to handle. - while (_eventQueue.Count > 0) - { - entry = _eventQueue.Dequeue(); - try - { - byte[] messsage = Encoding.UTF8.GetBytes(entry); - await _stream.WriteAsync(messsage, 0, messsage.Length); - await _stream.FlushAsync(); - } - catch (SocketException ex) - { - LoggingFailureHandler(ex); - } - } - break; - } - if (entry == null) - { - entry = _eventQueue.Dequeue(_tokenSource.Token); - } - else + _eventQueue.CompleteAdding(); + // Post-condition: no further items will be added to the queue, so there will be a finite number of items to handle. + while (_eventQueue.Count > 0) { + entry = _eventQueue.Dequeue(); try { byte[] messsage = Encoding.UTF8.GetBytes(entry); await _stream.WriteAsync(messsage, 0, messsage.Length); await _stream.FlushAsync(); - // No exception, it was sent - entry = null; - } - catch (IOException ex) - { - LoggingFailureHandler(ex); - _stream = await _reconnectPolicy.ConnectAsync(tryOpenSocket, uri, _tokenSource.Token); } catch (SocketException ex) { LoggingFailureHandler(ex); - _stream = await _reconnectPolicy.ConnectAsync(tryOpenSocket, uri, _tokenSource.Token); } } + break; } - } - catch (Exception e) - { - LoggingFailureHandler(e); - } - finally - { - if (_stream != null) + if (entry == null) { - _stream.Dispose(); + entry = _eventQueue.Dequeue(_tokenSource.Token); + } + else + { + try + { + byte[] messsage = Encoding.UTF8.GetBytes(entry); + await _stream.WriteAsync(messsage, 0, messsage.Length); + await _stream.FlushAsync(); + // No exception, it was sent + entry = null; + } + catch (IOException ex) + { + LoggingFailureHandler(ex); + _stream = await _reconnectPolicy.ConnectAsync(tryOpenSocket, uri, _tokenSource.Token); + } + catch (SocketException ex) + { + LoggingFailureHandler(ex); + _stream = await _reconnectPolicy.ConnectAsync(tryOpenSocket, uri, _tokenSource.Token); + } } - - _disposed.SetResult(true); } - }, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default); - threadReady.Task.Wait(TimeSpan.FromSeconds(5)); - } + } + catch (Exception e) + { + LoggingFailureHandler(e); + } + finally + { + if (_stream != null) + { + _stream.Dispose(); + } - public void Dispose() - { - // The following operations are idempotent. Issue a cancellation to tell the - // writer thread to stop the queue from accepting entries and write what it has - // before cleaning up, then wait until that cleanup is finished. - _tokenSource.Cancel(); - Task.Run(async () => await _disposed.Task).Wait(); - } + _disposed.SetResult(true); + } + }, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default); + threadReady.Task.Wait(TimeSpan.FromSeconds(5)); + } - /// - /// Push a string onto the queue to be written. - /// - /// The string to be written to the TCP _socket. - public void Enqueue(string entry) - { - _eventQueue.Enqueue(entry); - } + public void Dispose() + { + // The following operations are idempotent. Issue a cancellation to tell the + // writer thread to stop the queue from accepting entries and write what it has + // before cleaning up, then wait until that cleanup is finished. + _tokenSource.Cancel(); + Task.Run(async () => await _disposed.Task).Wait(); } /// - /// TcpConnectionPolicy implementation that tries to reconnect after - /// increasingly long intervals. + /// Push a string onto the queue to be written. /// - /// - /// The intervals double every time, starting from 0s, 1s, 2s, 4s, ... - /// until 10 minutes between connections, when it plateaus and does - /// not increase the interval length any further. - /// - public class ExponentialBackoffTcpReconnectionPolicy + /// The string to be written to the TCP _socket. + public void Enqueue(string entry) { - private readonly int ceiling = 10 * 60; // 10 minutes in seconds + _eventQueue.Enqueue(entry); + } +} + +/// +/// TcpConnectionPolicy implementation that tries to reconnect after +/// increasingly long intervals. +/// +/// +/// The intervals double every time, starting from 0s, 1s, 2s, 4s, ... +/// until 10 minutes between connections, when it plateaus and does +/// not increase the interval length any further. +/// +public class ExponentialBackoffTcpReconnectionPolicy +{ + private readonly int ceiling = 10 * 60; // 10 minutes in seconds - public async Task ConnectAsync(Func> connect, Uri host, CancellationToken cancellationToken) + public async Task ConnectAsync(Func> connect, Uri host, CancellationToken cancellationToken) + { + int delay = 1; // in seconds + while (!cancellationToken.IsCancellationRequested) { - int delay = 1; // in seconds - while (!cancellationToken.IsCancellationRequested) + try { - try - { - //Log.Debug("Attempting to connect to TCP endpoint {host} after delay of {delay} seconds", host, delay); - return await connect(host); - } - catch (SocketException) { } - - // If this is cancelled via the cancellationToken instead of - // completing its delay, the next while-loop test will fail, - // the loop will terminate, and the method will return null - // with no additional connection attempts. - await Task.Delay(delay * 1000, cancellationToken); - // The nth delay is min(10 minutes, 2^n - 1 seconds). - delay = Math.Min((delay + 1) * 2 - 1, ceiling); + //Log.Debug("Attempting to connect to TCP endpoint {host} after delay of {delay} seconds", host, delay); + return await connect(host); } + catch (SocketException) { } - // cancellationToken has been cancelled. - return null; + // If this is cancelled via the cancellationToken instead of + // completing its delay, the next while-loop test will fail, + // the loop will terminate, and the method will return null + // with no additional connection attempts. + await Task.Delay(delay * 1000, cancellationToken); + // The nth delay is min(10 minutes, 2^n - 1 seconds). + delay = Math.Min((delay + 1) * 2 - 1, ceiling); } + + // cancellationToken has been cancelled. + return null; } +} - /// - /// A queue with a maximum size. When the queue is at its maximum size - /// and a new item is queued, the oldest item in the queue is dropped. - /// - /// - internal class FixedSizeQueue - { - private int Size { get; } - private readonly IProgress _progress = new Progress(); - private bool IsCompleted { get; set; } +/// +/// A queue with a maximum size. When the queue is at its maximum size +/// and a new item is queued, the oldest item in the queue is dropped. +/// +/// +internal class FixedSizeQueue +{ + private int Size { get; } + private readonly IProgress _progress = new Progress(); + private bool IsCompleted { get; set; } - private readonly BlockingCollection _collection = new BlockingCollection(); + private readonly BlockingCollection _collection = new BlockingCollection(); - public FixedSizeQueue(int size) - { - Size = size; - IsCompleted = false; - } + public FixedSizeQueue(int size) + { + Size = size; + IsCompleted = false; + } - public void Enqueue(T obj) + public void Enqueue(T obj) + { + lock (this) { - lock (this) + if (IsCompleted) { - if (IsCompleted) - { - throw new InvalidOperationException("Tried to add an item to a completed queue."); - } - - _collection.Add(obj); - - while (_collection.Count > Size) - { - _collection.Take(); - } - _progress.Report(true); + throw new InvalidOperationException("Tried to add an item to a completed queue."); } - } - public void CompleteAdding() - { - lock (this) + _collection.Add(obj); + + while (_collection.Count > Size) { - IsCompleted = true; + _collection.Take(); } + _progress.Report(true); } + } - public T Dequeue(CancellationToken cancellationToken) - { - return _collection.Take(cancellationToken); - } - - public T Dequeue() + public void CompleteAdding() + { + lock (this) { - return _collection.Take(); + IsCompleted = true; } + } + public T Dequeue(CancellationToken cancellationToken) + { + return _collection.Take(cancellationToken); + } - public decimal Count => _collection.Count; + public T Dequeue() + { + return _collection.Take(); } + + + public decimal Count => _collection.Count; } \ No newline at end of file diff --git a/Tiobon.Core.Serilog.Es/Sinks/UDP/UDPSink.cs b/Tiobon.Core.Serilog.Es/Sinks/UDP/UDPSink.cs index f07c24e1..c8110a92 100644 --- a/Tiobon.Core.Serilog.Es/Sinks/UDP/UDPSink.cs +++ b/Tiobon.Core.Serilog.Es/Sinks/UDP/UDPSink.cs @@ -1,42 +1,39 @@ -using System; -using System.IO; +using Serilog.Core; +using Serilog.Events; +using Serilog.Formatting; using System.Net; using System.Net.Sockets; using System.Text; -using Serilog.Core; -using Serilog.Events; -using Serilog.Formatting; - - -namespace Serilog.Sinks.Network.Sinks.UDP + + +namespace Serilog.Sinks.Network.Sinks.UDP; + +public class UDPSink : ILogEventSink, IDisposable { - public class UDPSink : ILogEventSink, IDisposable - { - private Socket _socket = new Socket(SocketType.Dgram, ProtocolType.Udp); - private readonly ITextFormatter _formatter; + private Socket _socket = new Socket(SocketType.Dgram, ProtocolType.Udp); + private readonly ITextFormatter _formatter; - public UDPSink(IPAddress ipAddress, int port, ITextFormatter formatter) - { - _socket.Connect(ipAddress, port); - _formatter = formatter; - } + public UDPSink(IPAddress ipAddress, int port, ITextFormatter formatter) + { + _socket.Connect(ipAddress, port); + _formatter = formatter; + } - public void Emit(LogEvent logEvent) - { - var sb = new StringBuilder(); + public void Emit(LogEvent logEvent) + { + var sb = new StringBuilder(); - using (var sw = new StringWriter(sb)) - _formatter.Format(logEvent, sw); + using (var sw = new StringWriter(sb)) + _formatter.Format(logEvent, sw); - sb.Replace("RenderedMessage", "message"); + sb.Replace("RenderedMessage", "message"); - _socket.Send(Encoding.UTF8.GetBytes(sb.ToString())); - } + _socket.Send(Encoding.UTF8.GetBytes(sb.ToString())); + } - public void Dispose() - { - _socket?.Dispose(); - _socket = null; - } + public void Dispose() + { + _socket?.Dispose(); + _socket = null; } } diff --git a/Tiobon.Core.Serilog/Extensions/LoggerConfigurationExtensions.cs b/Tiobon.Core.Serilog/Extensions/LoggerConfigurationExtensions.cs index a2c699f8..d9e3b927 100644 --- a/Tiobon.Core.Serilog/Extensions/LoggerConfigurationExtensions.cs +++ b/Tiobon.Core.Serilog/Extensions/LoggerConfigurationExtensions.cs @@ -1,9 +1,8 @@ -using Tiobon.Core.Common; -using Tiobon.Core.Common.LogHelper; -using Serilog; +using Serilog; using Serilog.Events; using Serilog.Filters; using SqlSugar; +using Tiobon.Core.Common.LogHelper; namespace Tiobon.Core.Serilog.Extensions; diff --git a/Tiobon.Core.Services/BASE/BaseServices.cs b/Tiobon.Core.Services/BASE/BaseServices.cs index 9931889f..2857ee28 100644 --- a/Tiobon.Core.Services/BASE/BaseServices.cs +++ b/Tiobon.Core.Services/BASE/BaseServices.cs @@ -1,6 +1,4 @@ -using System.IO; - -namespace Tiobon.Core.Services.BASE; +namespace Tiobon.Core.Services.BASE; /// /// 增删改查基础服务 diff --git a/Tiobon.Core.Services/BlogArticleServices.cs b/Tiobon.Core.Services/BlogArticleServices.cs index e28b802d..15ba5620 100644 --- a/Tiobon.Core.Services/BlogArticleServices.cs +++ b/Tiobon.Core.Services/BlogArticleServices.cs @@ -1,64 +1,63 @@ -namespace Tiobon.Core.Services +namespace Tiobon.Core.Services; + +public class TiobonArticleServices : BaseServices, ITiobonArticleServices { - public class TiobonArticleServices : BaseServices, ITiobonArticleServices + AutoMapper.IMapper _mapper; + public TiobonArticleServices(AutoMapper.IMapper mapper) { - AutoMapper.IMapper _mapper; - public TiobonArticleServices(AutoMapper.IMapper mapper) - { - this._mapper = mapper; - } - /// - /// 获取视图博客详情信息 - /// - /// - /// - public async Task GetTiobonDetails(long id) - { - // 此处想获取上一条下一条数据,因此将全部数据list出来,有好的想法请提出 - //var Tiobonlist = await base.Query(a => a.IsDeleted==false, a => a.bID); - var TiobonArticle = (await base.Query(a => a.bID == id && a.bcategory == "技术博文")).FirstOrDefault(); - - TiobonViewModels models = null; + this._mapper = mapper; + } + /// + /// 获取视图博客详情信息 + /// + /// + /// + public async Task GetTiobonDetails(long id) + { + // 此处想获取上一条下一条数据,因此将全部数据list出来,有好的想法请提出 + //var Tiobonlist = await base.Query(a => a.IsDeleted==false, a => a.bID); + var TiobonArticle = (await base.Query(a => a.bID == id && a.bcategory == "技术博文")).FirstOrDefault(); - if (TiobonArticle != null) - { - models = _mapper.Map(TiobonArticle); + TiobonViewModels models = null; - //要取下一篇和上一篇,以当前id开始,按id排序后top(2),而不用取出所有记录 - //这样在记录很多的时候也不会有多大影响 - var nextTiobons = await base.Query(a => a.bID >= id && a.IsDeleted == false && a.bcategory == "技术博文", 2, "bID"); - if (nextTiobons.Count == 2) - { - models.next = nextTiobons[1].btitle; - models.nextID = nextTiobons[1].bID; - } - var prevTiobons = await base.Query(a => a.bID <= id && a.IsDeleted == false && a.bcategory == "技术博文", 2, "bID desc"); - if (prevTiobons.Count == 2) - { - models.previous = prevTiobons[1].btitle; - models.previousID = prevTiobons[1].bID; - } + if (TiobonArticle != null) + { + models = _mapper.Map(TiobonArticle); - TiobonArticle.btraffic += 1; - await base.Update(TiobonArticle, new List { "btraffic" }); + //要取下一篇和上一篇,以当前id开始,按id排序后top(2),而不用取出所有记录 + //这样在记录很多的时候也不会有多大影响 + var nextTiobons = await base.Query(a => a.bID >= id && a.IsDeleted == false && a.bcategory == "技术博文", 2, "bID"); + if (nextTiobons.Count == 2) + { + models.next = nextTiobons[1].btitle; + models.nextID = nextTiobons[1].bID; + } + var prevTiobons = await base.Query(a => a.bID <= id && a.IsDeleted == false && a.bcategory == "技术博文", 2, "bID desc"); + if (prevTiobons.Count == 2) + { + models.previous = prevTiobons[1].btitle; + models.previousID = prevTiobons[1].bID; } - return models; - + TiobonArticle.btraffic += 1; + await base.Update(TiobonArticle, new List { "btraffic" }); } + return models; - /// - /// 获取博客列表 - /// - /// - [Caching(AbsoluteExpiration = 10)] - public async Task> GetTiobons() - { - var Tiobonlist = await base.Query(a => a.bID > 0, a => a.bID); + } - return Tiobonlist; - } + /// + /// 获取博客列表 + /// + /// + [Caching(AbsoluteExpiration = 10)] + public async Task> GetTiobons() + { + var Tiobonlist = await base.Query(a => a.bID > 0, a => a.bID); + + return Tiobonlist; + } } diff --git a/Tiobon.Core.Services/DepartmentServices.cs b/Tiobon.Core.Services/DepartmentServices.cs index d5c576a4..e41736c8 100644 --- a/Tiobon.Core.Services/DepartmentServices.cs +++ b/Tiobon.Core.Services/DepartmentServices.cs @@ -1,15 +1,9 @@ -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// DepartmentServices +/// +public class DepartmentServices : BaseServices, IDepartmentServices { - /// - /// DepartmentServices - /// - public class DepartmentServices : BaseServices, IDepartmentServices - { - } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghra/Ghra_StaffSocialRelationServices.cs b/Tiobon.Core.Services/Ghra/Ghra_StaffSocialRelationServices.cs index d2cbd572..9e79da35 100644 --- a/Tiobon.Core.Services/Ghra/Ghra_StaffSocialRelationServices.cs +++ b/Tiobon.Core.Services/Ghra/Ghra_StaffSocialRelationServices.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 +/// +/// Ghra_StaffSocialRelation (服务) +/// +public class Ghra_StaffSocialRelationServices : BaseServices, IGhra_StaffSocialRelationServices { - /// - /// Ghra_StaffSocialRelation (服务) - /// - public class Ghra_StaffSocialRelationServices : BaseServices, IGhra_StaffSocialRelationServices + private readonly IBaseRepository _dal; + public Ghra_StaffSocialRelationServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghra_StaffSocialRelationServices(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/Ghra/Ghra_StaffWorkExpServices.cs b/Tiobon.Core.Services/Ghra/Ghra_StaffWorkExpServices.cs index 9c89c285..d6db7947 100644 --- a/Tiobon.Core.Services/Ghra/Ghra_StaffWorkExpServices.cs +++ b/Tiobon.Core.Services/Ghra/Ghra_StaffWorkExpServices.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 +/// +/// Ghra_StaffWorkExp (服务) +/// +public class Ghra_StaffWorkExpServices : BaseServices, IGhra_StaffWorkExpServices { - /// - /// Ghra_StaffWorkExp (服务) - /// - public class Ghra_StaffWorkExpServices : BaseServices, IGhra_StaffWorkExpServices + private readonly IBaseRepository _dal; + public Ghra_StaffWorkExpServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghra_StaffWorkExpServices(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/Ghra_GradeServices.cs b/Tiobon.Core.Services/Ghra_GradeServices.cs index b9b2df9d..095e105e 100644 --- a/Tiobon.Core.Services/Ghra_GradeServices.cs +++ b/Tiobon.Core.Services/Ghra_GradeServices.cs @@ -1,15 +1,14 @@ -namespace Tiobon.Core.Services +namespace Tiobon.Core.Services; + +/// +/// 年级 (服务) +/// +public class Ghra_GradeServices : BaseServices, IGhra_GradeServices { - /// - /// 年级 (服务) - /// - public class Ghra_GradeServices : BaseServices, IGhra_GradeServices + private readonly IBaseRepository _dal; + public Ghra_GradeServices(IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghra_GradeServices(IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - } + this._dal = dal; + base.BaseDal = dal; } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseWareServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseWareServices.cs index 7c375dc7..5b5b5fbd 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CourseWareServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CourseWareServices.cs @@ -62,8 +62,12 @@ public class Ghre_CourseWareServices : BaseServices().Where(x => x.CourseWareId == Id).Select(x => x.Id).ToListAsync(); - if (await Db.Queryable().AnyAsync(x => x.CourseId != null && courseIds.Contains(x.CourseId.Value) && x.StudyStatus != Consts.DIC_STUDY_RECORD_STUDY_STATUS.HAS_FINISH && x.CourseEndTime != null && x.CourseEndTime.Value.Date >= DateTime.Now.Date)) - throw new Exception($"关联课程有学员正在学习中,暂不可修改附件"); + var courseSceneIds = await Db.Queryable().Where(x => x.CourseWareId == Id).Select(x => x.CourseSceneId).ToListAsync(); + if (await Db.Queryable().AnyAsync(x => + ((x.CourseId != null && courseIds.Contains(x.CourseId.Value)) || (x.CourseSceneId != null && courseSceneIds.Contains(x.CourseSceneId.Value))) && + x.StudyStatus != Consts.DIC_STUDY_RECORD_STUDY_STATUS.HAS_FINISH && x.CourseEndTime != null && + x.CourseEndTime.Value.Date >= DateTime.Now.Date)) + throw new Exception($"关联课程/场景有学员正在学习中,暂不可修改附件"); #endregion if (editModel.CourseIds2.Any()) diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_InterviewOrderServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_InterviewOrderServices.cs index 18b398f0..333ddb1f 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_InterviewOrderServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_InterviewOrderServices.cs @@ -1,6 +1,4 @@ -using MySqlX.XDevAPI.Common; - -namespace Tiobon.Core.Services; +namespace Tiobon.Core.Services; /// /// 面试工单 (服务) diff --git a/Tiobon.Core.Services/GuestbookServices.cs b/Tiobon.Core.Services/GuestbookServices.cs index a376094d..641230af 100644 --- a/Tiobon.Core.Services/GuestbookServices.cs +++ b/Tiobon.Core.Services/GuestbookServices.cs @@ -1,203 +1,202 @@ using Tiobon.Core.Common.DB; using Tiobon.Core.Repository.UnitOfWorks; -namespace Tiobon.Core.Services +namespace Tiobon.Core.Services; + +public class GuestbookServices : BaseServices, IGuestbookServices { - public class GuestbookServices : BaseServices, IGuestbookServices - { - private readonly IUnitOfWorkManage _unitOfWorkManage; - private readonly IBaseRepository _passwordLibRepository; + private readonly IUnitOfWorkManage _unitOfWorkManage; + private readonly IBaseRepository _passwordLibRepository; - private readonly IPasswordLibServices _passwordLibServices; + private readonly IPasswordLibServices _passwordLibServices; - public GuestbookServices(IUnitOfWorkManage unitOfWorkManage, IBaseRepository dal, IBaseRepository passwordLibRepository, IPasswordLibServices passwordLibServices) - { - _unitOfWorkManage = unitOfWorkManage; - _passwordLibRepository = passwordLibRepository; - _passwordLibServices = passwordLibServices; - } + public GuestbookServices(IUnitOfWorkManage unitOfWorkManage, IBaseRepository dal, IBaseRepository passwordLibRepository, IPasswordLibServices passwordLibServices) + { + _unitOfWorkManage = unitOfWorkManage; + _passwordLibRepository = passwordLibRepository; + _passwordLibServices = passwordLibServices; + } - public async Task> TestTranInRepository() + public async Task> TestTranInRepository() + { + try { - try + Console.WriteLine($""); + Console.WriteLine($"事务操作开始"); + using (var uow = _unitOfWorkManage.CreateUnitOfWork()) { Console.WriteLine($""); - Console.WriteLine($"事务操作开始"); - using (var uow = _unitOfWorkManage.CreateUnitOfWork()) - { - Console.WriteLine($""); - - Console.WriteLine($"insert a data into the table PasswordLib now."); - var insertPassword = await _passwordLibRepository.Add(new PasswordLib() - { - IsDeleted = false, - plAccountName = "aaa", - plCreateTime = DateTime.Now - }); + Console.WriteLine($"insert a data into the table PasswordLib now."); + var insertPassword = await _passwordLibRepository.Add(new PasswordLib() + { + IsDeleted = false, + plAccountName = "aaa", + plCreateTime = DateTime.Now + }); - var passwords = await _passwordLibRepository.Query(d => d.IsDeleted == false); - Console.WriteLine($"second time : the count of passwords is :{passwords.Count}"); - - //...... - - Console.WriteLine($""); - var guestbooks = await BaseDal.Query(); - Console.WriteLine($"first time : the count of guestbooks is :{guestbooks.Count}"); - int ex = 0; - Console.WriteLine($"\nThere's an exception!!"); - int throwEx = 1 / ex; + var passwords = await _passwordLibRepository.Query(d => d.IsDeleted == false); + Console.WriteLine($"second time : the count of passwords is :{passwords.Count}"); - Console.WriteLine($"insert a data into the table Guestbook now."); - var insertGuestbook = await BaseDal.Add(new Guestbook() - { - username = "bbb", - TiobonId = 1, - createdate = DateTime.Now, - isshow = true - }); + //...... - guestbooks = await BaseDal.Query(); - Console.WriteLine($"second time : the count of guestbooks is :{guestbooks.Count}"); + Console.WriteLine($""); + var guestbooks = await BaseDal.Query(); + Console.WriteLine($"first time : the count of guestbooks is :{guestbooks.Count}"); - uow.Commit(); - } + int ex = 0; + Console.WriteLine($"\nThere's an exception!!"); + int throwEx = 1 / ex; - return new ServiceResult() + Console.WriteLine($"insert a data into the table Guestbook now."); + var insertGuestbook = await BaseDal.Add(new Guestbook() { - Success = true, - Message = "操作完成" - }; - } - catch (Exception) - { - var passwords = await _passwordLibRepository.Query(); - Console.WriteLine($"third time : the count of passwords is :{passwords.Count}"); + username = "bbb", + TiobonId = 1, + createdate = DateTime.Now, + isshow = true + }); - var guestbooks = await BaseDal.Query(); - Console.WriteLine($"third time : the count of guestbooks is :{guestbooks.Count}"); + guestbooks = await BaseDal.Query(); + Console.WriteLine($"second time : the count of guestbooks is :{guestbooks.Count}"); - return new ServiceResult() - { - Success = false, - Message = "操作异常" - }; + uow.Commit(); } - } - [UseTran] - public async Task TestTranInRepositoryAOP() + return new ServiceResult() + { + Success = true, + Message = "操作完成" + }; + } + catch (Exception) { var passwords = await _passwordLibRepository.Query(); - Console.WriteLine($"first time : the count of passwords is :{passwords.Count}"); + Console.WriteLine($"third time : the count of passwords is :{passwords.Count}"); + var guestbooks = await BaseDal.Query(); + Console.WriteLine($"third time : the count of guestbooks is :{guestbooks.Count}"); - Console.WriteLine($"insert a data into the table PasswordLib now."); - var insertPassword = await _passwordLibRepository.Add(new PasswordLib() + return new ServiceResult() { - IsDeleted = false, - plAccountName = "aaa", - plCreateTime = DateTime.Now - }); + Success = false, + Message = "操作异常" + }; + } + } + [UseTran] + public async Task TestTranInRepositoryAOP() + { + var passwords = await _passwordLibRepository.Query(); + Console.WriteLine($"first time : the count of passwords is :{passwords.Count}"); - passwords = await _passwordLibRepository.Query(d => d.IsDeleted == false); - Console.WriteLine($"second time : the count of passwords is :{passwords.Count}"); - //...... + Console.WriteLine($"insert a data into the table PasswordLib now."); + var insertPassword = await _passwordLibRepository.Add(new PasswordLib() + { + IsDeleted = false, + plAccountName = "aaa", + plCreateTime = DateTime.Now + }); - Console.WriteLine($""); - var guestbooks = await BaseDal.Query(); - Console.WriteLine($"first time : the count of guestbooks is :{guestbooks.Count}"); - int ex = 0; - Console.WriteLine($"\nThere's an exception!!"); - int throwEx = 1 / ex; + passwords = await _passwordLibRepository.Query(d => d.IsDeleted == false); + Console.WriteLine($"second time : the count of passwords is :{passwords.Count}"); - Console.WriteLine($"insert a data into the table Guestbook now."); - var insertGuestbook = await BaseDal.Add(new Guestbook() - { - username = "bbb", - TiobonId = 1, - createdate = DateTime.Now, - isshow = true - }); + //...... - guestbooks = await BaseDal.Query(); - Console.WriteLine($"second time : the count of guestbooks is :{guestbooks.Count}"); + Console.WriteLine($""); + var guestbooks = await BaseDal.Query(); + Console.WriteLine($"first time : the count of guestbooks is :{guestbooks.Count}"); - return true; - } + int ex = 0; + Console.WriteLine($"\nThere's an exception!!"); + int throwEx = 1 / ex; - /// - /// 测试使用同事务 - /// - /// - [UseTran(Propagation = Propagation.Required)] - public async Task TestTranPropagation() + Console.WriteLine($"insert a data into the table Guestbook now."); + var insertGuestbook = await BaseDal.Add(new Guestbook() { - var guestbooks = await base.Query(); - Console.WriteLine($"first time : the count of guestbooks is :{guestbooks.Count}"); + username = "bbb", + TiobonId = 1, + createdate = DateTime.Now, + isshow = true + }); - var insertGuestbook = await base.Add(new Guestbook() - { - username = "bbb", - TiobonId = 1, - createdate = DateTime.Now, - isshow = true - }); - - await _passwordLibServices.TestTranPropagation2(); + guestbooks = await BaseDal.Query(); + Console.WriteLine($"second time : the count of guestbooks is :{guestbooks.Count}"); - return true; - } + return true; + } + /// + /// 测试使用同事务 + /// + /// + [UseTran(Propagation = Propagation.Required)] + public async Task TestTranPropagation() + { + var guestbooks = await base.Query(); + Console.WriteLine($"first time : the count of guestbooks is :{guestbooks.Count}"); - /// - /// 测试无事务 Mandatory传播机制报错 - /// - /// - public async Task TestTranPropagationNoTran() + var insertGuestbook = await base.Add(new Guestbook() { - var guestbooks = await base.Query(); - Console.WriteLine($"first time : the count of guestbooks is :{guestbooks.Count}"); + username = "bbb", + TiobonId = 1, + createdate = DateTime.Now, + isshow = true + }); - var insertGuestbook = await base.Add(new Guestbook() - { - username = "bbb", - TiobonId = 1, - createdate = DateTime.Now, - isshow = true - }); + await _passwordLibServices.TestTranPropagation2(); - await _passwordLibServices.TestTranPropagationNoTranError(); + return true; + } - return true; - } + /// + /// 测试无事务 Mandatory传播机制报错 + /// + /// + public async Task TestTranPropagationNoTran() + { + var guestbooks = await base.Query(); + Console.WriteLine($"first time : the count of guestbooks is :{guestbooks.Count}"); - /// - /// 测试嵌套事务 - /// - /// - [UseTran(Propagation = Propagation.Required)] - public async Task TestTranPropagationTran() + var insertGuestbook = await base.Add(new Guestbook() { - var guestbooks = await base.Query(); - Console.WriteLine($"first time : the count of guestbooks is :{guestbooks.Count}"); + username = "bbb", + TiobonId = 1, + createdate = DateTime.Now, + isshow = true + }); - var insertGuestbook = await base.Add(new Guestbook() - { - username = "bbb", - TiobonId = 1, - createdate = DateTime.Now, - isshow = true - }); + await _passwordLibServices.TestTranPropagationNoTranError(); - await _passwordLibServices.TestTranPropagationTran2(); + return true; + } - return true; - } + + /// + /// 测试嵌套事务 + /// + /// + [UseTran(Propagation = Propagation.Required)] + public async Task TestTranPropagationTran() + { + var guestbooks = await base.Query(); + Console.WriteLine($"first time : the count of guestbooks is :{guestbooks.Count}"); + + var insertGuestbook = await base.Add(new Guestbook() + { + username = "bbb", + TiobonId = 1, + createdate = DateTime.Now, + isshow = true + }); + + await _passwordLibServices.TestTranPropagationTran2(); + + return true; } } \ No newline at end of file diff --git a/Tiobon.Core.Tasks/QuartzNet/JobFactory.cs b/Tiobon.Core.Tasks/QuartzNet/JobFactory.cs index 373df9cc..d9cd307e 100644 --- a/Tiobon.Core.Tasks/QuartzNet/JobFactory.cs +++ b/Tiobon.Core.Tasks/QuartzNet/JobFactory.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using Quartz; using Quartz.Spi; namespace Tiobon.Core.Tasks; diff --git a/Tiobon.Core.Tasks/QuartzNet/Jobs/JobBase.cs b/Tiobon.Core.Tasks/QuartzNet/Jobs/JobBase.cs index 83450a90..aec34117 100644 --- a/Tiobon.Core.Tasks/QuartzNet/Jobs/JobBase.cs +++ b/Tiobon.Core.Tasks/QuartzNet/Jobs/JobBase.cs @@ -1,6 +1,4 @@ -using Quartz; -using Tiobon.Core.Common.Helper; -using Tiobon.Core.IServices; +using Tiobon.Core.Common.Helper; using Tiobon.Core.Model.Models; namespace Tiobon.Core.Tasks; diff --git a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_AutoClearLog_Quartz.cs b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_AutoClearLog_Quartz.cs index ffe80dec..d10d555b 100644 --- a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_AutoClearLog_Quartz.cs +++ b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_AutoClearLog_Quartz.cs @@ -1,6 +1,4 @@ using Microsoft.Extensions.Logging; -using Quartz; -using Tiobon.Core.IServices; /// /// 这里要注意下,命名空间和程序集是一样的,不然反射不到(任务类要去JobSetup添加注入) diff --git a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_Blogs_Quartz.cs b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_Blogs_Quartz.cs index 22245dc5..decacfba 100644 --- a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_Blogs_Quartz.cs +++ b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_Blogs_Quartz.cs @@ -1,7 +1,4 @@ -using Tiobon.Core.IServices; -using Quartz; - -/// +/// /// 这里要注意下,命名空间和程序集是一样的,不然反射不到 /// namespace Tiobon.Core.Tasks; diff --git a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_OperateLog_Quartz.cs b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_OperateLog_Quartz.cs index 7b8fe13a..3008fcf9 100644 --- a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_OperateLog_Quartz.cs +++ b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_OperateLog_Quartz.cs @@ -1,8 +1,6 @@ using Microsoft.AspNetCore.Hosting; -using Quartz; using System.Text; using Tiobon.Core.Common.LogHelper; -using Tiobon.Core.IServices; using Tiobon.Core.Model.Models; /// diff --git a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_OverTimeDeleteResume_Quartz.cs b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_OverTimeDeleteResume_Quartz.cs index f8d83c5d..7dd6e4bc 100644 --- a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_OverTimeDeleteResume_Quartz.cs +++ b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_OverTimeDeleteResume_Quartz.cs @@ -1,7 +1,4 @@ -using Tiobon.Core.IServices; -using Quartz; - -/// +/// /// 这里要注意下,命名空间和程序集是一样的,不然反射不到 /// namespace Tiobon.Core.Tasks; diff --git a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_Shihua_OA_Sync_Quartz.cs b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_Shihua_OA_Sync_Quartz.cs index 32f32aab..bff68328 100644 --- a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_Shihua_OA_Sync_Quartz.cs +++ b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_Shihua_OA_Sync_Quartz.cs @@ -1,7 +1,4 @@ -using Tiobon.Core.IServices; -using Quartz; - -/// +/// /// 这里要注意下,命名空间和程序集是一样的,不然反射不到 /// namespace Tiobon.Core.Tasks; diff --git a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_StaffIn_Quartz.cs b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_StaffIn_Quartz.cs index b19be7ee..463406ab 100644 --- a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_StaffIn_Quartz.cs +++ b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_StaffIn_Quartz.cs @@ -1,7 +1,4 @@ -using Tiobon.Core.IServices; -using Quartz; - -/// +/// /// 这里要注意下,命名空间和程序集是一样的,不然反射不到 /// namespace Tiobon.Core.Tasks; diff --git a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_StudyRecordSync_Quartz.cs b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_StudyRecordSync_Quartz.cs index 0571760b..55f38430 100644 --- a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_StudyRecordSync_Quartz.cs +++ b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_StudyRecordSync_Quartz.cs @@ -1,7 +1,4 @@ -using Tiobon.Core.IServices; -using Quartz; - -/// +/// /// 这里要注意下,命名空间和程序集是一样的,不然反射不到 /// namespace Tiobon.Core.Tasks; diff --git a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_URL_Quartz.cs b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_URL_Quartz.cs index db8f1e14..7790f2ae 100644 --- a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_URL_Quartz.cs +++ b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_URL_Quartz.cs @@ -1,7 +1,5 @@ using Microsoft.Extensions.Logging; -using Quartz; using Tiobon.Core.Common.Helper; -using Tiobon.Core.IServices; /// /// 这里要注意下,命名空间和程序集是一样的,不然反射不到(任务类要去JobSetup添加注入) diff --git a/Tiobon.Core.Tasks/QuartzNet/SchedulerCenterServer.cs b/Tiobon.Core.Tasks/QuartzNet/SchedulerCenterServer.cs index f1454be4..6fcea1fd 100644 --- a/Tiobon.Core.Tasks/QuartzNet/SchedulerCenterServer.cs +++ b/Tiobon.Core.Tasks/QuartzNet/SchedulerCenterServer.cs @@ -1,5 +1,4 @@ -using Quartz; -using Quartz.Impl; +using Quartz.Impl; using Quartz.Impl.Triggers; using Quartz.Spi; using System.Collections.Specialized;