diff --git a/Tiobon.Core.Api/Controllers/CommonController.cs b/Tiobon.Core.Api/Controllers/CommonController.cs index 68854d54..2370c5e5 100644 --- a/Tiobon.Core.Api/Controllers/CommonController.cs +++ b/Tiobon.Core.Api/Controllers/CommonController.cs @@ -71,6 +71,7 @@ public class CommonController : BaseApiController /// 获取模块信息接口 /// /// + /// /// [HttpPost, Route("GetSelect/{type}")] public async Task> GetSelectAsync(string type, string Keywords) diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_CourseController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_CourseController.cs index 9bd90c76..5e248573 100644 --- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_CourseController.cs +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_CourseController.cs @@ -54,6 +54,7 @@ public class Ghre_CourseController : BaseController /// + /// /// [HttpPost, Route("QuerySelect")] public async Task> QuerySelectAsync(long? linkId, string KeyWords) diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamPaperController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamPaperController.cs index 0c849102..6f8d8205 100644 --- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamPaperController.cs +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamPaperController.cs @@ -98,6 +98,7 @@ public class Ghre_ExamPaperController : BaseController /// + /// /// [HttpPost, Route("GetSelect")] public async Task> GetSelectAsync(long? linkId, string KeyWords) diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_RequestController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_RequestController.cs index c9fef3d4..87b669b4 100644 --- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_RequestController.cs +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_RequestController.cs @@ -1,6 +1,4 @@ -using Consul.Filtering; - -namespace Tiobon.Core.Api.Controllers; +namespace Tiobon.Core.Api.Controllers; /// /// 培训需求(Controller) diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_StudyRecordController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_StudyRecordController.cs index 40f133e7..6742362e 100644 --- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_StudyRecordController.cs +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_StudyRecordController.cs @@ -86,6 +86,7 @@ public class Ghre_StudyRecordController : BaseController /// 记录学习时长 /// + /// /// /// [HttpPost, Route("RecordDuration/{id}")] diff --git a/Tiobon.Core.Api/GlobalUsings.cs b/Tiobon.Core.Api/GlobalUsings.cs index 40d06266..4382be0f 100644 --- a/Tiobon.Core.Api/GlobalUsings.cs +++ b/Tiobon.Core.Api/GlobalUsings.cs @@ -1,14 +1,12 @@ global using System.Linq.Expressions; global using System.Text; global using System.Text.RegularExpressions; -global using AutoMapper; global using Microsoft.AspNetCore.Authorization; global using Microsoft.AspNetCore.Mvc; global using Newtonsoft.Json; global using Tiobon.Core.Api.Filter; global using Tiobon.Core.Common; global using Tiobon.Core.Common.Helper; -global using Tiobon.Core.Common.HttpContextUser; global using Tiobon.Core.Common.LogHelper; global using Tiobon.Core.Controllers; global using Tiobon.Core.IServices; diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml index 5596c195..e141ede8 100644 --- a/Tiobon.Core.Api/Tiobon.Core.xml +++ b/Tiobon.Core.Api/Tiobon.Core.xml @@ -271,6 +271,7 @@ 获取模块信息接口 + @@ -757,6 +758,7 @@ 获取通用列表下拉 + @@ -955,6 +957,7 @@ 获取通用列表下拉 + @@ -1154,6 +1157,7 @@ 记录学习时长 + diff --git a/Tiobon.Core.DataAccess/ContextFactory.cs b/Tiobon.Core.DataAccess/ContextFactory.cs index 90a13b26..15c4ae35 100644 --- a/Tiobon.Core.DataAccess/ContextFactory.cs +++ b/Tiobon.Core.DataAccess/ContextFactory.cs @@ -1,24 +1,23 @@ using Microsoft.EntityFrameworkCore; using Tiobon.Core.Common.DB; -namespace Tiobon.Core.DataAccess +namespace Tiobon.Core.DataAccess; + +/// +/// 直接创建 Context +/// +public class ContextFactory { /// - /// 直接创建 Context + /// 创建DbContext /// - public class ContextFactory + /// + public static DataContext CreateContext() { - /// - /// 创建DbContext - /// - /// - public static DataContext CreateContext() - { - var builder = new DbContextOptionsBuilder(); + var builder = new DbContextOptionsBuilder(); - var mainConnetctDb = BaseDBConfig.MutiConnectionString.allDbs.Find(x => x.ConnId == MainDb.CurrentDbConnId); - builder.UseSqlServer(mainConnetctDb.Connection); - return new DataContext(builder.Options); - } + var mainConnetctDb = BaseDBConfig.MutiConnectionString.allDbs.Find(x => x.ConnId == MainDb.CurrentDbConnId); + builder.UseSqlServer(mainConnetctDb.Connection); + return new DataContext(builder.Options); } } diff --git a/Tiobon.Core.DataAccess/DataContext.cs b/Tiobon.Core.DataAccess/DataContext.cs index 04c85e99..5d8a0349 100644 --- a/Tiobon.Core.DataAccess/DataContext.cs +++ b/Tiobon.Core.DataAccess/DataContext.cs @@ -1,21 +1,20 @@ using Microsoft.EntityFrameworkCore; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.DataAccess +namespace Tiobon.Core.DataAccess; + +public class DataContext : DbContext { - public class DataContext : DbContext - { - //public virtual DbSet Ghra_Grade { get; set; } - public virtual DbSet Ghre_Attachment { get; set; } - public virtual DbSet Ghre_ExamRecordDetail { get; set; } - public virtual DbSet Ghre_ExamRecordAnswer { get; set; } + //public virtual DbSet Ghra_Grade { get; set; } + public virtual DbSet Ghre_Attachment { get; set; } + public virtual DbSet Ghre_ExamRecordDetail { get; set; } + public virtual DbSet Ghre_ExamRecordAnswer { get; set; } - //占位符 + //占位符 - public DataContext(DbContextOptions options) : base(options) - { - } + public DataContext(DbContextOptions options) : base(options) + { } } diff --git a/Tiobon.Core.DataAccess/Domain/IBaseCRUDVM.cs b/Tiobon.Core.DataAccess/Domain/IBaseCRUDVM.cs index 1b475da1..b4fde822 100644 --- a/Tiobon.Core.DataAccess/Domain/IBaseCRUDVM.cs +++ b/Tiobon.Core.DataAccess/Domain/IBaseCRUDVM.cs @@ -3,31 +3,30 @@ using System.Collections.Generic; using System.Linq.Expressions; using System.Threading.Tasks; -namespace Tiobon.Core.Domain +namespace Tiobon.Core.Domain; + +public interface IBaseCRUDVM where TModel : class { - public interface IBaseCRUDVM where TModel : class - { - IEnumerable Get(); - TModel Get(Expression> express = null); + IEnumerable Get(); + TModel Get(Expression> express = null); - TModel GetById(object id); - Task GetByIdAsync(object id); + TModel GetById(object id); + Task GetByIdAsync(object id); - void DoAdd(TModel model); + void DoAdd(TModel model); - Task DoAddAsync(TModel model); + Task DoAddAsync(TModel model); - void DoDelete(object id); + void DoDelete(object id); - Task DoDeleteAsync(Guid id, Guid? updateById = null); + Task DoDeleteAsync(Guid id, Guid? updateById = null); - void DoRealDelete(object id); + void DoRealDelete(object id); - Task DoRealDeleteAsync(object id); + Task DoRealDeleteAsync(object id); - void DoUpdate(TModel model); + void DoUpdate(TModel model); - Task DoUpdateAsync(TModel model); - Task GetAsync(Expression> express); - } + Task DoUpdateAsync(TModel model); + Task GetAsync(Expression> express); } diff --git a/Tiobon.Core.DataAccess/Domain/Repositories/BaseCRUDVM.cs b/Tiobon.Core.DataAccess/Domain/Repositories/BaseCRUDVM.cs index 2b450b78..fcec233a 100644 --- a/Tiobon.Core.DataAccess/Domain/Repositories/BaseCRUDVM.cs +++ b/Tiobon.Core.DataAccess/Domain/Repositories/BaseCRUDVM.cs @@ -6,103 +6,102 @@ using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -namespace Tiobon.Core.Domain +namespace Tiobon.Core.Domain; + +public class BaseCRUDVM : IBaseCRUDVM where TModel : class { - public class BaseCRUDVM : IBaseCRUDVM where TModel : class + private readonly DataContext _context; + internal DbSet dbSet; + + public BaseCRUDVM(DataContext context) + { + _context = context; + this.dbSet = _context.Set(); + } + + IEnumerable IBaseCRUDVM.Get() { - private readonly DataContext _context; - internal DbSet dbSet; - - public BaseCRUDVM(DataContext context) - { - _context = context; - this.dbSet = _context.Set(); - } - - IEnumerable IBaseCRUDVM.Get() - { - return dbSet.ToList(); - } - - TModel IBaseCRUDVM.Get(Expression> express) - { - return dbSet.Where(express).FirstOrDefault(); - } - - async Task IBaseCRUDVM.GetAsync(Expression> express) - { - return await dbSet.Where(express).FirstOrDefaultAsync(); - } - - public TModel GetById(object id) - { - return dbSet.Find(id); - } - - public async Task GetByIdAsync(object id) - { - return await dbSet.FindAsync(id); - } - - public void DoAdd(TModel model) - { - _context.Entry(model).CurrentValues["IsDeleted"] = false; - _context.Entry(model).CurrentValues["AuditStatus"] = "Add"; - _context.Add(model); - _context.SaveChanges(); - } - - public async Task DoAddAsync(TModel model) - { - _context.Entry(model).CurrentValues["IsDeleted"] = false; - _context.Entry(model).CurrentValues["AuditStatus"] = "Add"; - await _context.AddAsync(model); - await _context.SaveChangesAsync(); - } - - public void DoDelete(object id) - { - var query = dbSet.Find(id); - _context.Entry(query).CurrentValues["IsDeleted"] = true; - _context.Update(query); - _context.SaveChanges(); - } - - public async Task DoDeleteAsync(Guid id, Guid? updateById = null) - { - var query = await dbSet.FindAsync(id); - _context.Entry(query).CurrentValues["IsDeleted"] = true; - _context.Entry(query).CurrentValues["UpdateBy"] = updateById ?? null; - _context.Entry(query).CurrentValues["UpdateTime"] = DateTime.Now; - await _context.SaveChangesAsync(); - } - - public void DoRealDelete(object id) - { - var query = dbSet.Find(id); - _context.Remove(query); - _context.SaveChanges(); - } - - public async Task DoRealDeleteAsync(object id) - { - var query = await dbSet.FindAsync(id); - _context.Remove(query); - await _context.SaveChangesAsync(); - } - - public void DoUpdate(TModel model) - { - _context.Update(model); - _context.SaveChanges(); - } - - public async Task DoUpdateAsync(TModel model) - { - _context.Update(model); - await _context.SaveChangesAsync(); - } + return dbSet.ToList(); + } + TModel IBaseCRUDVM.Get(Expression> express) + { + return dbSet.Where(express).FirstOrDefault(); + } + + async Task IBaseCRUDVM.GetAsync(Expression> express) + { + return await dbSet.Where(express).FirstOrDefaultAsync(); + } + public TModel GetById(object id) + { + return dbSet.Find(id); + } + + public async Task GetByIdAsync(object id) + { + return await dbSet.FindAsync(id); + } + + public void DoAdd(TModel model) + { + _context.Entry(model).CurrentValues["IsDeleted"] = false; + _context.Entry(model).CurrentValues["AuditStatus"] = "Add"; + _context.Add(model); + _context.SaveChanges(); + } + + public async Task DoAddAsync(TModel model) + { + _context.Entry(model).CurrentValues["IsDeleted"] = false; + _context.Entry(model).CurrentValues["AuditStatus"] = "Add"; + await _context.AddAsync(model); + await _context.SaveChangesAsync(); } + + public void DoDelete(object id) + { + var query = dbSet.Find(id); + _context.Entry(query).CurrentValues["IsDeleted"] = true; + _context.Update(query); + _context.SaveChanges(); + } + + public async Task DoDeleteAsync(Guid id, Guid? updateById = null) + { + var query = await dbSet.FindAsync(id); + _context.Entry(query).CurrentValues["IsDeleted"] = true; + _context.Entry(query).CurrentValues["UpdateBy"] = updateById ?? null; + _context.Entry(query).CurrentValues["UpdateTime"] = DateTime.Now; + await _context.SaveChangesAsync(); + } + + public void DoRealDelete(object id) + { + var query = dbSet.Find(id); + _context.Remove(query); + _context.SaveChanges(); + } + + public async Task DoRealDeleteAsync(object id) + { + var query = await dbSet.FindAsync(id); + _context.Remove(query); + await _context.SaveChangesAsync(); + } + + public void DoUpdate(TModel model) + { + _context.Update(model); + _context.SaveChanges(); + } + + public async Task DoUpdateAsync(TModel model) + { + _context.Update(model); + await _context.SaveChangesAsync(); + } + + } diff --git a/Tiobon.Core.Extensions/AOP/BlogCacheAOP.cs b/Tiobon.Core.Extensions/AOP/BlogCacheAOP.cs index 4d1e72fe..72f7c3df 100644 --- a/Tiobon.Core.Extensions/AOP/BlogCacheAOP.cs +++ b/Tiobon.Core.Extensions/AOP/BlogCacheAOP.cs @@ -1,83 +1,79 @@ -using System; +using Castle.DynamicProxy; using Tiobon.Core.Common; -using Castle.DynamicProxy; -using System.Linq; -using System.Threading.Tasks; using Tiobon.Core.Common.Caches; -namespace Tiobon.Core.AOP +namespace Tiobon.Core.AOP; + +/// +/// 面向切面的缓存使用 +/// +public class TiobonCacheAOP : CacheAOPbase { - /// - /// 面向切面的缓存使用 - /// - public class TiobonCacheAOP : CacheAOPbase - { - //通过注入的方式，把缓存操作接口通过构造函数注入 - private readonly ICaching _cache; + //通过注入的方式，把缓存操作接口通过构造函数注入 + private readonly ICaching _cache; - public TiobonCacheAOP(ICaching cache) - { - _cache = cache; - } + public TiobonCacheAOP(ICaching cache) + { + _cache = cache; + } - //Intercept方法是拦截的关键所在，也是IInterceptor接口中的唯一定义 - public override void Intercept(IInvocation invocation) + //Intercept方法是拦截的关键所在，也是IInterceptor接口中的唯一定义 + public override void Intercept(IInvocation invocation) + { + var method = invocation.MethodInvocationTarget ?? invocation.Method; + //对当前方法的特性验证 + //如果需要验证 + var CachingAttribute = method.GetCustomAttributes(true).FirstOrDefault(x => x.GetType() == typeof(CachingAttribute)); + if (CachingAttribute is CachingAttribute qCachingAttribute) { - var method = invocation.MethodInvocationTarget ?? invocation.Method; - //对当前方法的特性验证 - //如果需要验证 - var CachingAttribute = method.GetCustomAttributes(true).FirstOrDefault(x => x.GetType() == typeof(CachingAttribute)); - if (CachingAttribute is CachingAttribute qCachingAttribute) + //获取自定义缓存键 + var cacheKey = CustomCacheKey(invocation); + if (_cache.Exists(cacheKey)) { - //获取自定义缓存键 - var cacheKey = CustomCacheKey(invocation); - if (_cache.Exists(cacheKey)) + //将当前获取到的缓存值，赋值给当前执行方法 + Type returnType; + if (typeof(Task).IsAssignableFrom(method.ReturnType)) { - //将当前获取到的缓存值，赋值给当前执行方法 - Type returnType; - if (typeof(Task).IsAssignableFrom(method.ReturnType)) - { - returnType = method.ReturnType.GenericTypeArguments.FirstOrDefault(); - } - else - { - returnType = method.ReturnType; - } - - //根据key获取相应的缓存值 - dynamic cacheValue = _cache.Get(returnType, cacheKey); - invocation.ReturnValue = (typeof(Task).IsAssignableFrom(method.ReturnType)) ? Task.FromResult(cacheValue) : cacheValue; - return; + returnType = method.ReturnType.GenericTypeArguments.FirstOrDefault(); } - - //去执行当前的方法 - invocation.Proceed(); - //存入缓存 - if (!string.IsNullOrWhiteSpace(cacheKey)) + else { - object response; + returnType = method.ReturnType; + } - //Type type = invocation.ReturnValue?.GetType(); - var type = invocation.Method.ReturnType; - if (typeof(Task).IsAssignableFrom(type)) - { - dynamic result = invocation.ReturnValue; - response = result.Result; - } - else - { - response = invocation.ReturnValue; - } + //根据key获取相应的缓存值 + dynamic cacheValue = _cache.Get(returnType, cacheKey); + invocation.ReturnValue = (typeof(Task).IsAssignableFrom(method.ReturnType)) ? Task.FromResult(cacheValue) : cacheValue; + return; + } - if (response == null) response = string.Empty; + //去执行当前的方法 + invocation.Proceed(); + //存入缓存 + if (!string.IsNullOrWhiteSpace(cacheKey)) + { + object response; - _cache.Set(cacheKey, response, TimeSpan.FromMinutes(qCachingAttribute.AbsoluteExpiration)); + //Type type = invocation.ReturnValue?.GetType(); + var type = invocation.Method.ReturnType; + if (typeof(Task).IsAssignableFrom(type)) + { + dynamic result = invocation.ReturnValue; + response = result.Result; } + else + { + response = invocation.ReturnValue; + } + + if (response == null) response = string.Empty; + + _cache.Set(cacheKey, response, TimeSpan.FromMinutes(qCachingAttribute.AbsoluteExpiration)); } - else - { - invocation.Proceed(); //直接执行被拦截方法 - } + } + else + { + invocation.Proceed(); //直接执行被拦截方法 } } } \ No newline at end of file diff --git a/Tiobon.Core.Extensions/AOP/BlogLogAOP.cs b/Tiobon.Core.Extensions/AOP/BlogLogAOP.cs index 617e3ef0..14d01424 100644 --- a/Tiobon.Core.Extensions/AOP/BlogLogAOP.cs +++ b/Tiobon.Core.Extensions/AOP/BlogLogAOP.cs @@ -1,291 +1,287 @@ -using Tiobon.Core.Common; -using Tiobon.Core.Common.LogHelper; -using Tiobon.Core.Hubs; -using Castle.DynamicProxy; +using Castle.DynamicProxy; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.SignalR; using Newtonsoft.Json; using StackExchange.Profiling; -using System; -using System.Linq; using System.Reflection; -using System.Threading.Tasks; +using Tiobon.Core.Common; +using Tiobon.Core.Common.LogHelper; +using Tiobon.Core.Hubs; + +namespace Tiobon.Core.AOP; -namespace Tiobon.Core.AOP +/// +/// 拦截器TiobonLogAOP 继承IInterceptor接口 +/// +public class TiobonLogAOP : IInterceptor { + private readonly IHubContext _hubContext; + private readonly IHttpContextAccessor _accessor; + + public TiobonLogAOP(IHubContext hubContext, IHttpContextAccessor accessor) + { + _hubContext = hubContext; + _accessor = accessor; + } + + /// - /// 拦截器TiobonLogAOP 继承IInterceptor接口 + /// 实例化IInterceptor唯一方法 /// - public class TiobonLogAOP : IInterceptor + /// 包含被拦截方法的信息 + public void Intercept(IInvocation invocation) { - private readonly IHubContext _hubContext; - private readonly IHttpContextAccessor _accessor; - - public TiobonLogAOP(IHubContext hubContext, IHttpContextAccessor accessor) + string UserName = _accessor.HttpContext?.User?.Identity?.Name; + string json; + try { - _hubContext = hubContext; - _accessor = accessor; + json = JsonConvert.SerializeObject(invocation.Arguments); + } + catch (Exception ex) + { + json = "无法序列化，可能是兰姆达表达式等原因造成，按照框架优化代码" + ex.ToString(); } - - /// - /// 实例化IInterceptor唯一方法 - /// - /// 包含被拦截方法的信息 - public void Intercept(IInvocation invocation) + DateTime startTime = DateTime.Now; + AOPLogInfo apiLogAopInfo = new AOPLogInfo { - string UserName = _accessor.HttpContext?.User?.Identity?.Name; - string json; - try - { - json = JsonConvert.SerializeObject(invocation.Arguments); - } - catch (Exception ex) - { - json = "无法序列化，可能是兰姆达表达式等原因造成，按照框架优化代码" + ex.ToString(); - } + RequestTime = startTime.ToString("yyyy-MM-dd hh:mm:ss fff"), + OpUserName = UserName, + RequestMethodName = invocation.Method.Name, + RequestParamsName = string.Join(", ", invocation.Arguments.Select(a => (a ?? "").ToString()).ToArray()), + ResponseJsonData = json + }; - DateTime startTime = DateTime.Now; - AOPLogInfo apiLogAopInfo = new AOPLogInfo - { - RequestTime = startTime.ToString("yyyy-MM-dd hh:mm:ss fff"), - OpUserName = UserName, - RequestMethodName = invocation.Method.Name, - RequestParamsName = string.Join(", ", invocation.Arguments.Select(a => (a ?? "").ToString()).ToArray()), - ResponseJsonData = json - }; + //测试异常记录 + //Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss fff")); + + //记录被拦截方法信息的日志信息 + //var dataIntercept = "" + + // $"【当前操作用户】：{ UserName} \r\n" + + // $"【当前执行方法】：{ invocation.Method.Name} \r\n" + + // $"【携带的参数有】： {string.Join(", ", invocation.Arguments.Select(a => (a ?? "").ToString()).ToArray())} \r\n"; - //测试异常记录 - //Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss fff")); + try + { + MiniProfiler.Current.Step($"执行Service方法：{invocation.Method.Name}() -> "); + //在被拦截的方法执行完毕后 继续执行当前方法，注意是被拦截的是异步的 + invocation.Proceed(); - //记录被拦截方法信息的日志信息 - //var dataIntercept = "" + - // $"【当前操作用户】：{ UserName} \r\n" + - // $"【当前执行方法】：{ invocation.Method.Name} \r\n" + - // $"【携带的参数有】： {string.Join(", ", invocation.Arguments.Select(a => (a ?? "").ToString()).ToArray())} \r\n"; - try + // 异步获取异常，先执行 + if (IsAsyncMethod(invocation.Method)) { - MiniProfiler.Current.Step($"执行Service方法：{invocation.Method.Name}() -> "); - //在被拦截的方法执行完毕后 继续执行当前方法，注意是被拦截的是异步的 - invocation.Proceed(); - + #region 方案一 - // 异步获取异常，先执行 - if (IsAsyncMethod(invocation.Method)) + //Wait task execution and modify return value + if (invocation.Method.ReturnType == typeof(Task)) { - #region 方案一 - - //Wait task execution and modify return value - if (invocation.Method.ReturnType == typeof(Task)) - { - invocation.ReturnValue = InternalAsyncHelper.AwaitTaskWithPostActionAndFinally( - (Task) invocation.ReturnValue, - async () => await SuccessAction(invocation, apiLogAopInfo, startTime), /*成功时执行*/ - ex => - { - LogEx(ex, apiLogAopInfo); - }); - } - //Task - else - { - invocation.ReturnValue = InternalAsyncHelper.CallAwaitTaskWithPostActionAndFinallyAndGetResult( - invocation.Method.ReturnType.GenericTypeArguments[0], - invocation.ReturnValue, - //async () => await SuccessAction(invocation, dataIntercept),/*成功时执行*/ - async (o) => await SuccessAction(invocation, apiLogAopInfo, startTime, o), /*成功时执行*/ - ex => - { - LogEx(ex, apiLogAopInfo); - }); - } - - #endregion - - - // 如果方案一不行，试试这个方案 - //#region 方案二 - - //var type = invocation.Method.ReturnType; - //var resultProperty = type.GetProperty("Result"); - //DateTime endTime = DateTime.Now; - //string ResponseTime = (endTime - startTime).Milliseconds.ToString(); - //apiLogAopInfo.ResponseTime = endTime.ToString("yyyy-MM-dd hh:mm:ss fff"); - //apiLogAopInfo.ResponseIntervalTime = ResponseTime + "ms"; - //apiLogAopInfo.ResponseJsonData = JsonConvert.SerializeObject(resultProperty.GetValue(invocation.ReturnValue)); - - ////dataIntercept += ($"【响应时间】：{ResponseTime}ms\r\n"); - ////dataIntercept += ($"【执行完成时间】：{endTime.ToString("yyyy-MM-dd hh:mm:ss fff")}\r\n"); - ////dataIntercept += ($"【执行完成结果】：{JsonConvert.SerializeObject(resultProperty.GetValue(invocation.ReturnValue))}\r\n"); - - //Parallel.For(0, 1, e => - //{ - // //LogLock.OutLogAOP("AOPLog", new string[] { dataIntercept }); - // LogLock.OutLogAOP("AOPLog", new string[] { apiLogAopInfo.GetType().ToString() + " - ResponseJsonDataType:" + type, JsonConvert.SerializeObject(apiLogAopInfo) }); - //}); - - //#endregion + invocation.ReturnValue = InternalAsyncHelper.AwaitTaskWithPostActionAndFinally( + (Task) invocation.ReturnValue, + async () => await SuccessAction(invocation, apiLogAopInfo, startTime), /*成功时执行*/ + ex => + { + LogEx(ex, apiLogAopInfo); + }); } + //Task else { - // 同步1 - string jsonResult; - try - { - jsonResult = JsonConvert.SerializeObject(invocation.ReturnValue); - } - catch (Exception ex) - { - jsonResult = "无法序列化，可能是兰姆达表达式等原因造成，按照框架优化代码" + ex.ToString(); - } - - var type = invocation.Method.ReturnType; - var resultProperty = type.GetProperty("Result"); - DateTime endTime = DateTime.Now; - string ResponseTime = (endTime - startTime).Milliseconds.ToString(); - apiLogAopInfo.ResponseTime = endTime.ToString("yyyy-MM-dd hh:mm:ss fff"); - apiLogAopInfo.ResponseIntervalTime = ResponseTime + "ms"; - //apiLogAopInfo.ResponseJsonData = JsonConvert.SerializeObject(resultProperty.GetValue(invocation.ReturnValue)); - apiLogAopInfo.ResponseJsonData = jsonResult; - //dataIntercept += ($"【执行完成结果】：{jsonResult}"); - Parallel.For(0, 1, e => - { - //LogLock.OutLogAOP("AOPLog", new string[] { dataIntercept }); - LogLock.OutLogAOP("AOPLog", _accessor.HttpContext?.TraceIdentifier, - new string[] {apiLogAopInfo.GetType().ToString(), JsonConvert.SerializeObject(apiLogAopInfo)}); - }); + invocation.ReturnValue = InternalAsyncHelper.CallAwaitTaskWithPostActionAndFinallyAndGetResult( + invocation.Method.ReturnType.GenericTypeArguments[0], + invocation.ReturnValue, + //async () => await SuccessAction(invocation, dataIntercept),/*成功时执行*/ + async (o) => await SuccessAction(invocation, apiLogAopInfo, startTime, o), /*成功时执行*/ + ex => + { + LogEx(ex, apiLogAopInfo); + }); } - } - catch (Exception ex) // 同步2 - { - LogEx(ex, apiLogAopInfo); - throw; - } - if (AppSettings.app(new string[] {"Middleware", "SignalRSendLog", "Enabled"}).ObjToBool()) - { - _hubContext.Clients.All.SendAsync("ReceiveUpdate", LogLock.GetLogData()).Wait(); - } - } + #endregion - private async Task SuccessAction(IInvocation invocation, AOPLogInfo apiLogAopInfo, DateTime startTime, object o = null) - { - //invocation.ReturnValue = o; - //var type = invocation.Method.ReturnType; - //if (typeof(Task).IsAssignableFrom(type)) - //{ - // //var resultProperty = type.GetProperty("Result"); - // //类型错误 都可以不要invocation参数，直接将o系列化保存到日记中 - // dataIntercept += ($"【执行完成结果】：{JsonConvert.SerializeObject(invocation.ReturnValue)}"); - //} - //else - //{ - // dataIntercept += ($"【执行完成结果】：{invocation.ReturnValue}"); - //} - DateTime endTime = DateTime.Now; - string ResponseTime = (endTime - startTime).Milliseconds.ToString(); - apiLogAopInfo.ResponseTime = endTime.ToString("yyyy-MM-dd hh:mm:ss fff"); - apiLogAopInfo.ResponseIntervalTime = ResponseTime + "ms"; - apiLogAopInfo.ResponseJsonData = JsonConvert.SerializeObject(o); - - - await Task.Run(() => + + // 如果方案一不行，试试这个方案 + //#region 方案二 + + //var type = invocation.Method.ReturnType; + //var resultProperty = type.GetProperty("Result"); + //DateTime endTime = DateTime.Now; + //string ResponseTime = (endTime - startTime).Milliseconds.ToString(); + //apiLogAopInfo.ResponseTime = endTime.ToString("yyyy-MM-dd hh:mm:ss fff"); + //apiLogAopInfo.ResponseIntervalTime = ResponseTime + "ms"; + //apiLogAopInfo.ResponseJsonData = JsonConvert.SerializeObject(resultProperty.GetValue(invocation.ReturnValue)); + + ////dataIntercept += ($"【响应时间】：{ResponseTime}ms\r\n"); + ////dataIntercept += ($"【执行完成时间】：{endTime.ToString("yyyy-MM-dd hh:mm:ss fff")}\r\n"); + ////dataIntercept += ($"【执行完成结果】：{JsonConvert.SerializeObject(resultProperty.GetValue(invocation.ReturnValue))}\r\n"); + + //Parallel.For(0, 1, e => + //{ + // //LogLock.OutLogAOP("AOPLog", new string[] { dataIntercept }); + // LogLock.OutLogAOP("AOPLog", new string[] { apiLogAopInfo.GetType().ToString() + " - ResponseJsonDataType:" + type, JsonConvert.SerializeObject(apiLogAopInfo) }); + //}); + + //#endregion + } + else { + // 同步1 + string jsonResult; + try + { + jsonResult = JsonConvert.SerializeObject(invocation.ReturnValue); + } + catch (Exception ex) + { + jsonResult = "无法序列化，可能是兰姆达表达式等原因造成，按照框架优化代码" + ex.ToString(); + } + + var type = invocation.Method.ReturnType; + var resultProperty = type.GetProperty("Result"); + DateTime endTime = DateTime.Now; + string ResponseTime = (endTime - startTime).Milliseconds.ToString(); + apiLogAopInfo.ResponseTime = endTime.ToString("yyyy-MM-dd hh:mm:ss fff"); + apiLogAopInfo.ResponseIntervalTime = ResponseTime + "ms"; + //apiLogAopInfo.ResponseJsonData = JsonConvert.SerializeObject(resultProperty.GetValue(invocation.ReturnValue)); + apiLogAopInfo.ResponseJsonData = jsonResult; + //dataIntercept += ($"【执行完成结果】：{jsonResult}"); Parallel.For(0, 1, e => { - //LogLock.OutSql2Log("AOPLog", new string[] { JsonConvert.SerializeObject(apiLogAopInfo) }); + //LogLock.OutLogAOP("AOPLog", new string[] { dataIntercept }); LogLock.OutLogAOP("AOPLog", _accessor.HttpContext?.TraceIdentifier, new string[] {apiLogAopInfo.GetType().ToString(), JsonConvert.SerializeObject(apiLogAopInfo)}); }); - }); + } } - - private void LogEx(Exception ex, AOPLogInfo dataIntercept) + catch (Exception ex) // 同步2 { - if (ex != null) - { - //执行的 service 中，收录异常 - MiniProfiler.Current.CustomTiming("Errors：", ex.Message); - //执行的 service 中，捕获异常 - //dataIntercept += ($"【执行完成结果】：方法中出现异常：{ex.Message + ex.InnerException}\r\n"); - AOPLogExInfo apiLogAopExInfo = new AOPLogExInfo - { - ExMessage = ex.Message, - InnerException = "InnerException-内部异常:\r\n" + (ex.InnerException == null ? "" : ex.InnerException.InnerException.ToString()) + - ("\r\nStackTrace-堆栈跟踪:\r\n") + (ex.StackTrace == null ? "" : ex.StackTrace.ToString()), - ApiLogAopInfo = dataIntercept - }; - // 异常日志里有详细的堆栈信息 - Parallel.For(0, 1, e => - { - //LogLock.OutLogAOP("AOPLogEx", new string[] { dataIntercept }); - LogLock.OutLogAOP("AOPLogEx", _accessor.HttpContext?.TraceIdentifier, - new string[] {apiLogAopExInfo.GetType().ToString(), JsonConvert.SerializeObject(apiLogAopExInfo)}); - }); - } + LogEx(ex, apiLogAopInfo); + throw; } - - public static bool IsAsyncMethod(MethodInfo method) + if (AppSettings.app(new string[] {"Middleware", "SignalRSendLog", "Enabled"}).ObjToBool()) { - return ( - method.ReturnType == typeof(Task) || - (method.ReturnType.IsGenericType && method.ReturnType.GetGenericTypeDefinition() == typeof(Task<>)) - ); + _hubContext.Clients.All.SendAsync("ReceiveUpdate", LogLock.GetLogData()).Wait(); } } - - internal static class InternalAsyncHelper + private async Task SuccessAction(IInvocation invocation, AOPLogInfo apiLogAopInfo, DateTime startTime, object o = null) { - public static async Task AwaitTaskWithPostActionAndFinally(Task actualReturnValue, Func postAction, Action finalAction) - { - Exception exception = null; + //invocation.ReturnValue = o; + //var type = invocation.Method.ReturnType; + //if (typeof(Task).IsAssignableFrom(type)) + //{ + // //var resultProperty = type.GetProperty("Result"); + // //类型错误 都可以不要invocation参数，直接将o系列化保存到日记中 + // dataIntercept += ($"【执行完成结果】：{JsonConvert.SerializeObject(invocation.ReturnValue)}"); + //} + //else + //{ + // dataIntercept += ($"【执行完成结果】：{invocation.ReturnValue}"); + //} + DateTime endTime = DateTime.Now; + string ResponseTime = (endTime - startTime).Milliseconds.ToString(); + apiLogAopInfo.ResponseTime = endTime.ToString("yyyy-MM-dd hh:mm:ss fff"); + apiLogAopInfo.ResponseIntervalTime = ResponseTime + "ms"; + apiLogAopInfo.ResponseJsonData = JsonConvert.SerializeObject(o); - try + + await Task.Run(() => + { + Parallel.For(0, 1, e => { - await actualReturnValue; - await postAction(); - } - catch (Exception ex) + //LogLock.OutSql2Log("AOPLog", new string[] { JsonConvert.SerializeObject(apiLogAopInfo) }); + LogLock.OutLogAOP("AOPLog", _accessor.HttpContext?.TraceIdentifier, + new string[] {apiLogAopInfo.GetType().ToString(), JsonConvert.SerializeObject(apiLogAopInfo)}); + }); + }); + } + + private void LogEx(Exception ex, AOPLogInfo dataIntercept) + { + if (ex != null) + { + //执行的 service 中，收录异常 + MiniProfiler.Current.CustomTiming("Errors：", ex.Message); + //执行的 service 中，捕获异常 + //dataIntercept += ($"【执行完成结果】：方法中出现异常：{ex.Message + ex.InnerException}\r\n"); + AOPLogExInfo apiLogAopExInfo = new AOPLogExInfo { - exception = ex; - } - finally + ExMessage = ex.Message, + InnerException = "InnerException-内部异常:\r\n" + (ex.InnerException == null ? "" : ex.InnerException.InnerException.ToString()) + + ("\r\nStackTrace-堆栈跟踪:\r\n") + (ex.StackTrace == null ? "" : ex.StackTrace.ToString()), + ApiLogAopInfo = dataIntercept + }; + // 异常日志里有详细的堆栈信息 + Parallel.For(0, 1, e => { - finalAction(exception); - } + //LogLock.OutLogAOP("AOPLogEx", new string[] { dataIntercept }); + LogLock.OutLogAOP("AOPLogEx", _accessor.HttpContext?.TraceIdentifier, + new string[] {apiLogAopExInfo.GetType().ToString(), JsonConvert.SerializeObject(apiLogAopExInfo)}); + }); } + } + + + public static bool IsAsyncMethod(MethodInfo method) + { + return ( + method.ReturnType == typeof(Task) || + (method.ReturnType.IsGenericType && method.ReturnType.GetGenericTypeDefinition() == typeof(Task<>)) + ); + } +} - public static async Task AwaitTaskWithPostActionAndFinallyAndGetResult(Task actualReturnValue, Func postAction, - Action finalAction) + +internal static class InternalAsyncHelper +{ + public static async Task AwaitTaskWithPostActionAndFinally(Task actualReturnValue, Func postAction, Action finalAction) + { + Exception exception = null; + + try { - Exception exception = null; - try - { - var result = await actualReturnValue; - await postAction(result); - return result; - } - catch (Exception ex) - { - exception = ex; - throw; - } - finally - { - finalAction(exception); - } + await actualReturnValue; + await postAction(); + } + catch (Exception ex) + { + exception = ex; } + finally + { + finalAction(exception); + } + } - public static object CallAwaitTaskWithPostActionAndFinallyAndGetResult(Type taskReturnType, object actualReturnValue, - Func action, Action finalAction) + public static async Task AwaitTaskWithPostActionAndFinallyAndGetResult(Task actualReturnValue, Func postAction, + Action finalAction) + { + Exception exception = null; + try + { + var result = await actualReturnValue; + await postAction(result); + return result; + } + catch (Exception ex) { - return typeof(InternalAsyncHelper) - .GetMethod("AwaitTaskWithPostActionAndFinallyAndGetResult", BindingFlags.Public | BindingFlags.Static) - .MakeGenericMethod(taskReturnType) - .Invoke(null, new object[] {actualReturnValue, action, finalAction}); + exception = ex; + throw; } + finally + { + finalAction(exception); + } + } + + public static object CallAwaitTaskWithPostActionAndFinallyAndGetResult(Type taskReturnType, object actualReturnValue, + Func action, Action finalAction) + { + return typeof(InternalAsyncHelper) + .GetMethod("AwaitTaskWithPostActionAndFinallyAndGetResult", BindingFlags.Public | BindingFlags.Static) + .MakeGenericMethod(taskReturnType) + .Invoke(null, new object[] {actualReturnValue, action, finalAction}); } } \ No newline at end of file diff --git a/Tiobon.Core.Extensions/AOP/BlogTranAOP.cs b/Tiobon.Core.Extensions/AOP/BlogTranAOP.cs index b3511731..cf71db0d 100644 --- a/Tiobon.Core.Extensions/AOP/BlogTranAOP.cs +++ b/Tiobon.Core.Extensions/AOP/BlogTranAOP.cs @@ -1,139 +1,136 @@ -using Tiobon.Core.Common; -using Castle.DynamicProxy; +using Castle.DynamicProxy; using Microsoft.Extensions.Logging; -using System; using System.Reflection; -using System.Threading.Tasks; +using Tiobon.Core.Common; using Tiobon.Core.Common.DB; using Tiobon.Core.Repository.UnitOfWorks; -namespace Tiobon.Core.AOP +namespace Tiobon.Core.AOP; + +/// +/// 事务拦截器TiobonTranAOP 继承IInterceptor接口 +/// +public class TiobonTranAOP : IInterceptor { + private readonly ILogger _logger; + private readonly IUnitOfWorkManage _unitOfWorkManage; + + public TiobonTranAOP(IUnitOfWorkManage unitOfWorkManage, ILogger logger) + { + _unitOfWorkManage = unitOfWorkManage; + _logger = logger; + } + /// - /// 事务拦截器TiobonTranAOP 继承IInterceptor接口 + /// 实例化IInterceptor唯一方法 /// - public class TiobonTranAOP : IInterceptor + /// 包含被拦截方法的信息 + public void Intercept(IInvocation invocation) { - private readonly ILogger _logger; - private readonly IUnitOfWorkManage _unitOfWorkManage; - - public TiobonTranAOP(IUnitOfWorkManage unitOfWorkManage, ILogger logger) + var method = invocation.MethodInvocationTarget ?? invocation.Method; + //对当前方法的特性验证 + //如果需要验证 + if (method.GetCustomAttribute(true) is { } uta) { - _unitOfWorkManage = unitOfWorkManage; - _logger = logger; - } - - /// - /// 实例化IInterceptor唯一方法 - /// - /// 包含被拦截方法的信息 - public void Intercept(IInvocation invocation) - { - var method = invocation.MethodInvocationTarget ?? invocation.Method; - //对当前方法的特性验证 - //如果需要验证 - if (method.GetCustomAttribute(true) is { } uta) + try { - try - { - Before(method, uta.Propagation); + Before(method, uta.Propagation); - invocation.Proceed(); + invocation.Proceed(); - // 异步获取异常，先执行 - if (IsAsyncMethod(invocation.Method)) + // 异步获取异常，先执行 + if (IsAsyncMethod(invocation.Method)) + { + var result = invocation.ReturnValue; + if (result is Task) { - var result = invocation.ReturnValue; - if (result is Task) - { - Task.WaitAll(result as Task); - } + Task.WaitAll(result as Task); } - - After(method); - } - catch (Exception ex) - { - _logger.LogError(ex.ToString()); - AfterException(method); - throw; } + + After(method); } - else + catch (Exception ex) { - invocation.Proceed(); //直接执行被拦截方法 + _logger.LogError(ex.ToString()); + AfterException(method); + throw; } } - - private void Before(MethodInfo method, Propagation propagation) + else { - switch (propagation) - { - case Propagation.Required: - if (_unitOfWorkManage.TranCount <= 0) - { - _logger.LogDebug($"Begin Transaction"); - Console.WriteLine($"Begin Transaction"); - _unitOfWorkManage.BeginTran(method); - } - - break; - case Propagation.Mandatory: - if (_unitOfWorkManage.TranCount <= 0) - { - throw new Exception("事务传播机制为:[Mandatory],当前不存在事务"); - } + invocation.Proceed(); //直接执行被拦截方法 + } + } - break; - case Propagation.Nested: + private void Before(MethodInfo method, Propagation propagation) + { + switch (propagation) + { + case Propagation.Required: + if (_unitOfWorkManage.TranCount <= 0) + { _logger.LogDebug($"Begin Transaction"); Console.WriteLine($"Begin Transaction"); _unitOfWorkManage.BeginTran(method); - break; - default: - throw new ArgumentOutOfRangeException(nameof(propagation), propagation, null); - } - } + } - private void After(MethodInfo method) - { - _unitOfWorkManage.CommitTran(method); - } + break; + case Propagation.Mandatory: + if (_unitOfWorkManage.TranCount <= 0) + { + throw new Exception("事务传播机制为:[Mandatory],当前不存在事务"); + } - private void AfterException(MethodInfo method) - { - _unitOfWorkManage.RollbackTran(method); + break; + case Propagation.Nested: + _logger.LogDebug($"Begin Transaction"); + Console.WriteLine($"Begin Transaction"); + _unitOfWorkManage.BeginTran(method); + break; + default: + throw new ArgumentOutOfRangeException(nameof(propagation), propagation, null); } + } - /// - /// 获取变量的默认值 - /// - /// - /// - public object GetDefaultValue(Type type) - { - return type.IsValueType ? Activator.CreateInstance(type) : null; - } + private void After(MethodInfo method) + { + _unitOfWorkManage.CommitTran(method); + } - private async Task SuccessAction(IInvocation invocation) - { - await Task.Run(() => - { - //... - }); - } + private void AfterException(MethodInfo method) + { + _unitOfWorkManage.RollbackTran(method); + } - public static bool IsAsyncMethod(MethodInfo method) - { - return ( - method.ReturnType == typeof(Task) || - (method.ReturnType.IsGenericType && method.ReturnType.GetGenericTypeDefinition() == typeof(Task<>)) - ); - } + /// + /// 获取变量的默认值 + /// + /// + /// + public object GetDefaultValue(Type type) + { + return type.IsValueType ? Activator.CreateInstance(type) : null; + } - private async Task TestActionAsync(IInvocation invocation) + private async Task SuccessAction(IInvocation invocation) + { + await Task.Run(() => { - await Task.Run(null); - } + //... + }); + } + + public static bool IsAsyncMethod(MethodInfo method) + { + return ( + method.ReturnType == typeof(Task) || + (method.ReturnType.IsGenericType && method.ReturnType.GetGenericTypeDefinition() == typeof(Task<>)) + ); + } + + private async Task TestActionAsync(IInvocation invocation) + { + await Task.Run(null); } } \ No newline at end of file diff --git a/Tiobon.Core.Extensions/AOP/BlogUserAuditAOP.cs b/Tiobon.Core.Extensions/AOP/BlogUserAuditAOP.cs index 1dae01c2..24723e12 100644 --- a/Tiobon.Core.Extensions/AOP/BlogUserAuditAOP.cs +++ b/Tiobon.Core.Extensions/AOP/BlogUserAuditAOP.cs @@ -1,69 +1,66 @@ using Castle.DynamicProxy; using Microsoft.AspNetCore.Http; -using System; -namespace Tiobon.Core.AOP +namespace Tiobon.Core.AOP; + +/// +/// 面向切面的缓存使用 +/// +public class TiobonUserAuditAOP : CacheAOPbase { - /// - /// 面向切面的缓存使用 - /// - public class TiobonUserAuditAOP : CacheAOPbase + private readonly IHttpContextAccessor _accessor; + + public TiobonUserAuditAOP(IHttpContextAccessor accessor) { - private readonly IHttpContextAccessor _accessor; + _accessor = accessor; + } - public TiobonUserAuditAOP(IHttpContextAccessor accessor) - { - _accessor = accessor; - } + public override void Intercept(IInvocation invocation) + { + string UserName = _accessor.HttpContext?.User?.Identity?.Name; - public override void Intercept(IInvocation invocation) + //对当前方法的特性验证 + if (invocation.Method.Name?.ToLower() == "add" || invocation.Method.Name?.ToLower() == "update") { - string UserName = _accessor.HttpContext?.User?.Identity?.Name; - //对当前方法的特性验证 - if (invocation.Method.Name?.ToLower() == "add" || invocation.Method.Name?.ToLower() == "update") + if (invocation.Arguments.Length == 1) { - - if (invocation.Arguments.Length == 1) + if (invocation.Arguments[0].GetType().IsClass) { - if (invocation.Arguments[0].GetType().IsClass) + dynamic argModel = invocation.Arguments[0]; + var getType = argModel.GetType(); + if (invocation.Method.Name?.ToLower() == "add") { - dynamic argModel = invocation.Arguments[0]; - var getType = argModel.GetType(); - if (invocation.Method.Name?.ToLower() == "add") - { - if (getType.GetProperty("CreateBy") != null) - { - argModel.CreateBy = UserName; - } - if (getType.GetProperty("bCreateTime") != null) - { - argModel.bCreateTime = DateTime.Now; - } - } - if (getType.GetProperty("bUpdateTime") != null) + if (getType.GetProperty("CreateBy") != null) { - argModel.bUpdateTime = DateTime.Now; + argModel.CreateBy = UserName; } - if (getType.GetProperty("ModifyBy") != null) + if (getType.GetProperty("bCreateTime") != null) { - argModel.ModifyBy = UserName; + argModel.bCreateTime = DateTime.Now; } - if (getType.GetProperty("bsubmitter") != null) - { - argModel.bsubmitter = UserName; - } - - invocation.Arguments[0] = argModel; } + if (getType.GetProperty("bUpdateTime") != null) + { + argModel.bUpdateTime = DateTime.Now; + } + if (getType.GetProperty("ModifyBy") != null) + { + argModel.ModifyBy = UserName; + } + if (getType.GetProperty("bsubmitter") != null) + { + argModel.bsubmitter = UserName; + } + + invocation.Arguments[0] = argModel; } - invocation.Proceed(); - } - else - { - invocation.Proceed(); } + invocation.Proceed(); + } + else + { + invocation.Proceed(); } } - } diff --git a/Tiobon.Core.Extensions/AOP/CacheAOPbase.cs b/Tiobon.Core.Extensions/AOP/CacheAOPbase.cs index e7259f37..a27fefa5 100644 --- a/Tiobon.Core.Extensions/AOP/CacheAOPbase.cs +++ b/Tiobon.Core.Extensions/AOP/CacheAOPbase.cs @@ -1,184 +1,180 @@ -using Tiobon.Core.Common.Helper; -using Castle.DynamicProxy; +using Castle.DynamicProxy; using Newtonsoft.Json; using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; +using Tiobon.Core.Common.Helper; -namespace Tiobon.Core.AOP +namespace Tiobon.Core.AOP; + +public abstract class CacheAOPbase : IInterceptor { - public abstract class CacheAOPbase : IInterceptor + /// + /// AOP的拦截方法 + /// + /// + public abstract void Intercept(IInvocation invocation); + + /// + /// 自定义缓存的key + /// + /// + /// + protected string CustomCacheKey(IInvocation invocation) { - /// - /// AOP的拦截方法 - /// - /// - public abstract void Intercept(IInvocation invocation); - - /// - /// 自定义缓存的key - /// - /// - /// - protected string CustomCacheKey(IInvocation invocation) - { - var typeName = invocation.TargetType.Name; - var methodName = invocation.Method.Name; - var methodArguments = invocation.Arguments.Select(GetArgumentValue).Take(3).ToList();//获取参数列表，最多三个 - - string key = $"{typeName}:{methodName}:"; - foreach (var param in methodArguments) - { - key = $"{key}{param}:"; - } - - return key.TrimEnd(':'); - } + var typeName = invocation.TargetType.Name; + var methodName = invocation.Method.Name; + var methodArguments = invocation.Arguments.Select(GetArgumentValue).Take(3).ToList();//获取参数列表，最多三个 - /// - /// object 转 string - /// - /// - /// - protected static string GetArgumentValue(object arg) + string key = $"{typeName}:{methodName}:"; + foreach (var param in methodArguments) { - if (arg is DateTime) - return ((DateTime)arg).ToString("yyyyMMddHHmmss"); - - if (!arg.IsNotEmptyOrNull()) - return arg.ObjToString(); - - if (arg != null) - { - if (arg is Expression) - { - var obj = arg as Expression; - var result = Resolve(obj); - return MD5Helper.MD5Encrypt16(result); - } - else if (arg.GetType().IsClass) - { - return MD5Helper.MD5Encrypt16(JsonConvert.SerializeObject(arg)); - } - - return $"value:{arg.ObjToString()}"; - } - return string.Empty; + key = $"{key}{param}:"; } - private static string Resolve(Expression expression) - { - ExpressionContext expContext = new ExpressionContext(); - expContext.Resolve(expression, ResolveExpressType.WhereSingle); - var value = expContext.Result.GetString(); - var pars = expContext.Parameters; + return key.TrimEnd(':'); + } - pars.ForEach(s => - { - value = value.Replace(s.ParameterName, s.Value.ObjToString()); - }); + /// + /// object 转 string + /// + /// + /// + protected static string GetArgumentValue(object arg) + { + if (arg is DateTime) + return ((DateTime)arg).ToString("yyyyMMddHHmmss"); - return value; - } + if (!arg.IsNotEmptyOrNull()) + return arg.ObjToString(); - private static string GetOperator(ExpressionType expressiontype) + if (arg != null) { - switch (expressiontype) + if (arg is Expression) + { + var obj = arg as Expression; + var result = Resolve(obj); + return MD5Helper.MD5Encrypt16(result); + } + else if (arg.GetType().IsClass) { - case ExpressionType.And: - return "and"; - case ExpressionType.AndAlso: - return "and"; - case ExpressionType.Or: - return "or"; - case ExpressionType.OrElse: - return "or"; - case ExpressionType.Equal: - return "="; - case ExpressionType.NotEqual: - return "<>"; - case ExpressionType.LessThan: - return "<"; - case ExpressionType.LessThanOrEqual: - return "<="; - case ExpressionType.GreaterThan: - return ">"; - case ExpressionType.GreaterThanOrEqual: - return ">="; - default: - throw new Exception($"不支持{expressiontype}此种运算符查找！"); + return MD5Helper.MD5Encrypt16(JsonConvert.SerializeObject(arg)); } + + return $"value:{arg.ObjToString()}"; } + return string.Empty; + } - private static string ResolveFunc(Expression left, Expression right, ExpressionType expressiontype) + private static string Resolve(Expression expression) + { + ExpressionContext expContext = new ExpressionContext(); + expContext.Resolve(expression, ResolveExpressType.WhereSingle); + var value = expContext.Result.GetString(); + var pars = expContext.Parameters; + + pars.ForEach(s => { - var Name = (left as MemberExpression).Member.Name; - var Value = (right as ConstantExpression).Value; - var Operator = GetOperator(expressiontype); - return Name + Operator + Value ?? "null"; - } + value = value.Replace(s.ParameterName, s.Value.ObjToString()); + }); - private static string ResolveLinqToObject(Expression expression, object value, ExpressionType? expressiontype = null) + return value; + } + + private static string GetOperator(ExpressionType expressiontype) + { + switch (expressiontype) { - var MethodCall = expression as MethodCallExpression; - var MethodName = MethodCall.Method.Name; - switch (MethodName) - { - case "Contains": - if (MethodCall.Object != null) - return Like(MethodCall); - return In(MethodCall, value); - case "Count": - return Len(MethodCall, value, expressiontype.Value); - case "LongCount": - return Len(MethodCall, value, expressiontype.Value); - default: - throw new Exception($"不支持{MethodName}方法的查找！"); - } + case ExpressionType.And: + return "and"; + case ExpressionType.AndAlso: + return "and"; + case ExpressionType.Or: + return "or"; + case ExpressionType.OrElse: + return "or"; + case ExpressionType.Equal: + return "="; + case ExpressionType.NotEqual: + return "<>"; + case ExpressionType.LessThan: + return "<"; + case ExpressionType.LessThanOrEqual: + return "<="; + case ExpressionType.GreaterThan: + return ">"; + case ExpressionType.GreaterThanOrEqual: + return ">="; + default: + throw new Exception($"不支持{expressiontype}此种运算符查找！"); } + } - private static string In(MethodCallExpression expression, object isTrue) + private static string ResolveFunc(Expression left, Expression right, ExpressionType expressiontype) + { + var Name = (left as MemberExpression).Member.Name; + var Value = (right as ConstantExpression).Value; + var Operator = GetOperator(expressiontype); + return Name + Operator + Value ?? "null"; + } + + private static string ResolveLinqToObject(Expression expression, object value, ExpressionType? expressiontype = null) + { + var MethodCall = expression as MethodCallExpression; + var MethodName = MethodCall.Method.Name; + switch (MethodName) { - var Argument1 = (expression.Arguments[0] as MemberExpression).Expression as ConstantExpression; - var Argument2 = expression.Arguments[1] as MemberExpression; - var Field_Array = Argument1.Value.GetType().GetFields().First(); - object[] Array = Field_Array.GetValue(Argument1.Value) as object[]; - List SetInPara = new List(); - for (int i = 0; i < Array.Length; i++) - { - string Name_para = "InParameter" + i; - string Value = Array[i].ToString(); - SetInPara.Add(Value); - } - string Name = Argument2.Member.Name; - string Operator = Convert.ToBoolean(isTrue) ? "in" : " not in"; - string CompName = string.Join(",", SetInPara); - string Result = $"{Name} {Operator} ({CompName})"; - return Result; + case "Contains": + if (MethodCall.Object != null) + return Like(MethodCall); + return In(MethodCall, value); + case "Count": + return Len(MethodCall, value, expressiontype.Value); + case "LongCount": + return Len(MethodCall, value, expressiontype.Value); + default: + throw new Exception($"不支持{MethodName}方法的查找！"); } - private static string Like(MethodCallExpression expression) - { + } - var Temp = expression.Arguments[0]; - LambdaExpression lambda = Expression.Lambda(Temp); - Delegate fn = lambda.Compile(); - var tempValue = Expression.Constant(fn.DynamicInvoke(null), Temp.Type); - string Value = $"%{tempValue}%"; - string Name = (expression.Object as MemberExpression).Member.Name; - string Result = $"{Name} like {Value}"; - return Result; + private static string In(MethodCallExpression expression, object isTrue) + { + var Argument1 = (expression.Arguments[0] as MemberExpression).Expression as ConstantExpression; + var Argument2 = expression.Arguments[1] as MemberExpression; + var Field_Array = Argument1.Value.GetType().GetFields().First(); + object[] Array = Field_Array.GetValue(Argument1.Value) as object[]; + List SetInPara = new List(); + for (int i = 0; i < Array.Length; i++) + { + string Name_para = "InParameter" + i; + string Value = Array[i].ToString(); + SetInPara.Add(Value); } + string Name = Argument2.Member.Name; + string Operator = Convert.ToBoolean(isTrue) ? "in" : " not in"; + string CompName = string.Join(",", SetInPara); + string Result = $"{Name} {Operator} ({CompName})"; + return Result; + } + private static string Like(MethodCallExpression expression) + { + var Temp = expression.Arguments[0]; + LambdaExpression lambda = Expression.Lambda(Temp); + Delegate fn = lambda.Compile(); + var tempValue = Expression.Constant(fn.DynamicInvoke(null), Temp.Type); + string Value = $"%{tempValue}%"; + string Name = (expression.Object as MemberExpression).Member.Name; + string Result = $"{Name} like {Value}"; + return Result; + } - private static string Len(MethodCallExpression expression, object value, ExpressionType expressiontype) - { - object Name = (expression.Arguments[0] as MemberExpression).Member.Name; - string Operator = GetOperator(expressiontype); - string Result = $"len({Name}){Operator}{value.ToString()}"; - return Result; - } + private static string Len(MethodCallExpression expression, object value, ExpressionType expressiontype) + { + object Name = (expression.Arguments[0] as MemberExpression).Member.Name; + string Operator = GetOperator(expressiontype); + string Result = $"len({Name}){Operator}{value.ToString()}"; + return Result; } + } diff --git a/Tiobon.Core.Extensions/Apollo/ApolloOptions.cs b/Tiobon.Core.Extensions/Apollo/ApolloOptions.cs index 463cff12..f55f8152 100644 --- a/Tiobon.Core.Extensions/Apollo/ApolloOptions.cs +++ b/Tiobon.Core.Extensions/Apollo/ApolloOptions.cs @@ -1,27 +1,22 @@ - -using System.Collections.Generic; +namespace Tiobon.Core.Extensions.Apollo; - -namespace Tiobon.Core.Extensions.Apollo +/// +/// Apollo配置项 +/// +public class ApolloOptions { - /// - /// Apollo配置项 - /// - public class ApolloOptions - { - public bool Enable { get; set; } - public List Namespaces { get; set; } + public bool Enable { get; set; } + public List Namespaces { get; set; } - public class ChildNamespace - { - /// - /// 命名空间名字 - /// - public string Name { get; set; } - /// - /// 数据格式 Json/Yml/Yaml等 - /// - public string Format { get; set; } - } + public class ChildNamespace + { + /// + /// 命名空间名字 + /// + public string Name { get; set; } + /// + /// 数据格式 Json/Yml/Yaml等 + /// + public string Format { get; set; } } } diff --git a/Tiobon.Core.Extensions/Apollo/ConfigurationBuilderExtensions.cs b/Tiobon.Core.Extensions/Apollo/ConfigurationBuilderExtensions.cs index 78dd37de..1c9b4c71 100644 --- a/Tiobon.Core.Extensions/Apollo/ConfigurationBuilderExtensions.cs +++ b/Tiobon.Core.Extensions/Apollo/ConfigurationBuilderExtensions.cs @@ -1,84 +1,80 @@ using Com.Ctrip.Framework.Apollo; -using Microsoft.Extensions.Configuration; -using System; -using System.Collections.Generic; -using System.Linq; using Com.Ctrip.Framework.Apollo.Enums; using Com.Ctrip.Framework.Apollo.Logging; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Primitives; using System.Reflection; -namespace Tiobon.Core.Extensions.Apollo +namespace Tiobon.Core.Extensions.Apollo; + +public static class ConfigurationBuilderExtensions { - public static class ConfigurationBuilderExtensions + /// + /// 接入Apollo + /// + /// + /// apollo配置文件路径 如果写入appsettings.json中 则jsonPath传null即可 + public static void AddConfigurationApollo(this IConfigurationBuilder builder,string jsonPath) { - /// - /// 接入Apollo - /// - /// - /// apollo配置文件路径 如果写入appsettings.json中 则jsonPath传null即可 - public static void AddConfigurationApollo(this IConfigurationBuilder builder,string jsonPath) + if (!string.IsNullOrEmpty(jsonPath)) { - if (!string.IsNullOrEmpty(jsonPath)) + builder.AddJsonFile(jsonPath, true, false); + } + //阿波罗的日志级别调整 + LogManager.UseConsoleLogging(LogLevel.Warn); + var options = new ApolloOptions(); + var root = builder.Build(); + root.Bind("Apollo", options); + if (options.Enable) + { + var apolloBuilder = builder.AddApollo(root.GetSection("Apollo:Config")); + + foreach (var item in options.Namespaces) { - builder.AddJsonFile(jsonPath, true, false); + apolloBuilder.AddNamespace(item.Name, MatchConfigFileFormat(item.Format)); } - //阿波罗的日志级别调整 - LogManager.UseConsoleLogging(LogLevel.Warn); - var options = new ApolloOptions(); - var root = builder.Build(); - root.Bind("Apollo", options); - if (options.Enable) - { - var apolloBuilder = builder.AddApollo(root.GetSection("Apollo:Config")); + //监听apollo配置 + Monitor(builder.Build()); + } - foreach (var item in options.Namespaces) - { - apolloBuilder.AddNamespace(item.Name, MatchConfigFileFormat(item.Format)); - } - //监听apollo配置 - Monitor(builder.Build()); - } + } + #region private + /// + /// 监听配置 + /// + private static void Monitor(IConfigurationRoot root) + { + //TODO 需要根据改变执行特定的操作 如 mq redis 等其他跟配置相关的中间件 + //TODO 初步思路：将需要执行特定的操作key和value放入内存字典中，在赋值操作时通过标准事件来执行特定的操作。 - } - #region private - /// - /// 监听配置 - /// - private static void Monitor(IConfigurationRoot root) + //要重新Build 此时才将Apollo provider加入到ConfigurationBuilder中 + ChangeToken.OnChange(() => root.GetReloadToken(), () => { - //TODO 需要根据改变执行特定的操作 如 mq redis 等其他跟配置相关的中间件 - //TODO 初步思路：将需要执行特定的操作key和value放入内存字典中，在赋值操作时通过标准事件来执行特定的操作。 - - //要重新Build 此时才将Apollo provider加入到ConfigurationBuilder中 - ChangeToken.OnChange(() => root.GetReloadToken(), () => + foreach (var apolloProvider in root.Providers.Where(p => p is ApolloConfigurationProvider)) { - foreach (var apolloProvider in root.Providers.Where(p => p is ApolloConfigurationProvider)) + var property = apolloProvider.GetType().BaseType.GetProperty("Data", BindingFlags.Instance | BindingFlags.NonPublic); + var data = property.GetValue(apolloProvider) as IDictionary; + foreach (var item in data) { - var property = apolloProvider.GetType().BaseType.GetProperty("Data", BindingFlags.Instance | BindingFlags.NonPublic); - var data = property.GetValue(apolloProvider) as IDictionary; - foreach (var item in data) - { - Console.WriteLine($"key {item.Key} value {item.Value}"); - } + Console.WriteLine($"key {item.Key} value {item.Value}"); } - }); - } + } + }); + } - //匹配格式 - private static ConfigFileFormat MatchConfigFileFormat(string value) => value switch - { - "json" => ConfigFileFormat.Json, - "properties" => ConfigFileFormat.Properties, - "xml" => ConfigFileFormat.Xml, - "yml" => ConfigFileFormat.Yml, - "yaml" => ConfigFileFormat.Yaml, - "txt" => ConfigFileFormat.Txt, - _ => throw new FormatException($"与apollo命名空间的所允许的类型不匹配：{string.Join(",", GetConfigFileFormat())}"), - }; - //获取数据格式对应的枚举 - private static IEnumerable GetConfigFileFormat() => Enum.GetValues().Select(u => u.ToString().ToLower()); - #endregion + //匹配格式 + private static ConfigFileFormat MatchConfigFileFormat(string value) => value switch + { + "json" => ConfigFileFormat.Json, + "properties" => ConfigFileFormat.Properties, + "xml" => ConfigFileFormat.Xml, + "yml" => ConfigFileFormat.Yml, + "yaml" => ConfigFileFormat.Yaml, + "txt" => ConfigFileFormat.Txt, + _ => throw new FormatException($"与apollo命名空间的所允许的类型不匹配：{string.Join(",", GetConfigFileFormat())}"), + }; + //获取数据格式对应的枚举 + private static IEnumerable GetConfigFileFormat() => Enum.GetValues().Select(u => u.ToString().ToLower()); + #endregion - } } diff --git a/Tiobon.Core.IServices/Ghra/IGhra_JobServices.cs b/Tiobon.Core.IServices/Ghra/IGhra_JobServices.cs index e64ddfd2..54328c3f 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_JobServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_JobServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghra_Job(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// Ghra_Job(自定义服务接口) +/// 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_StaffLicenceServices.cs b/Tiobon.Core.IServices/Ghra/IGhra_StaffLicenceServices.cs index cf48599c..7306c9c0 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_StaffLicenceServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_StaffLicenceServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghra_StaffLicence(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// Ghra_StaffLicence(自定义服务接口) +/// 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_StaffServices.cs b/Tiobon.Core.IServices/Ghra/IGhra_StaffServices.cs index a3b36e34..e475ab19 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_StaffServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_StaffServices.cs @@ -2,13 +2,12 @@ using Tiobon.Core.Model; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghra_Staff(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// Ghra_Staff(自定义服务接口) +/// public interface IGhra_StaffServices :IBaseServices - { - Task> QuerySimple(int id); - } -} \ No newline at end of file +{ + Task> QuerySimple(int id); + } \ 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 7c41e175..3f4b6b34 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_StaffTrainingServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_StaffTrainingServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghra_StaffTraining(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// Ghra_StaffTraining(自定义服务接口) +/// 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_TitleServices.cs b/Tiobon.Core.IServices/Ghra/IGhra_TitleServices.cs index 0acde784..1a08b512 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_TitleServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_TitleServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghra_Title(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// Ghra_Title(自定义服务接口) +/// 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 aef89a5f..b9931553 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_ZoneServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_ZoneServices.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_ZoneServices :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 f9f8bb82..e91a21fe 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_AttachmentServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_AttachmentServices.cs @@ -3,14 +3,13 @@ using Tiobon.Core.Model; using Tiobon.Core.Model.Models; using Tiobon.Core.Model.ViewModels; -namespace Tiobon.Core.IServices -{ - /// - /// 附件(自定义服务接口) - /// - public interface IGhre_AttachmentServices :IBaseServices +namespace Tiobon.Core.IServices; + +/// +/// 附件(自定义服务接口) +/// +public interface IGhre_AttachmentServices :IBaseServices { - Task> UploadVideoAsync(ChunkUpload upload); + 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 2900719a..2ef58ddc 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CertificateRuleServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CertificateRuleServices.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 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 e4f28d4b..88998007 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CertificateServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CertificateServices.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 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 8592d2fc..62743dcb 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ConfigServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ConfigServices.cs @@ -2,13 +2,12 @@ using Tiobon.Core.Model; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// 参数配置(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// 参数配置(自定义服务接口) +/// 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 385f5764..14a94e33 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CourseClassServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CourseClassServices.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 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 7ec800a0..c1206dfc 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CourseSceneServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CourseSceneServices.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 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 69906497..63e8c0e6 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CourseServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CourseServices.cs @@ -3,26 +3,25 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices +namespace Tiobon.Core.IServices; + +/// +/// 课程(自定义服务接口) +/// +public interface IGhre_CourseServices : IBaseServices { - /// - /// 课程(自定义服务接口) - /// - 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); - Task UpdateStatus(long[] ids, string status); - Task> GetSelectAsync(long? linkId, string keyWords); + Task> QueryDeptID(int StaffID); + Task> QueryTeacher(long? linkId); + Task UpdateStatus(long[] ids, string status); + Task> GetSelectAsync(long? linkId, string keyWords); - Task> ExportExcel(QueryExport body, string status); + Task> ExportExcel(QueryExport body, string status); - Task> QueryPublicSearchFields(QueryBody body); + Task> QueryPublicSearchFields(QueryBody body); - Task> QueryPublic(QueryBody filter); + Task> QueryPublic(QueryBody filter); - } } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_CourseSnapServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_CourseSnapServices.cs index a98efed1..2c0fa1c0 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CourseSnapServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CourseSnapServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghre_CourseSnap(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// Ghre_CourseSnap(自定义服务接口) +/// 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 bf36af45..ad63fe67 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CourseWareAttachmentServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CourseWareAttachmentServices.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 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 6cc7318d..6873857b 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_CourseWareServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_CourseWareServices.cs @@ -2,14 +2,13 @@ using Tiobon.Core.Model; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// 课件(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// 课件(自定义服务接口) +/// 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 b697586b..6f6f6759 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamMessageLogServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamMessageLogServices.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 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 26e32f58..c030ad26 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperConfigServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperConfigServices.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 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 8433e9dc..585a7a90 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperQuestionServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperQuestionServices.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 IGhre_ExamPaperQuestionServices :IBaseServices - { - } -} \ No newline at end of file +{ + } \ 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 323538d4..216f8160 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordDetailServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordDetailServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghre_ExamRecordDetail(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// Ghre_ExamRecordDetail(自定义服务接口) +/// 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_ExamRecordServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs index 34cd0e2e..615a58f4 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs @@ -3,29 +3,28 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices +namespace Tiobon.Core.IServices; + +/// +/// 考试记录(自定义服务接口) +/// +public interface IGhre_ExamRecordServices : IBaseServices { - /// - /// 考试记录(自定义服务接口) - /// - public interface IGhre_ExamRecordServices : IBaseServices - { - Task> Query(string examId, QueryBody body); + Task> Query(string examId, QueryBody body); - Task ModifyAdjustScore(string examRecordId, EditGhre_ExamRecordInput edit); + Task ModifyAdjustScore(string examRecordId, EditGhre_ExamRecordInput edit); - Task> ExtendAsync(long examRecordId); + Task> ExtendAsync(long examRecordId); - Task CommentAsync(Ghre_ExamRecordExtend extend, long examRecordId); + Task CommentAsync(Ghre_ExamRecordExtend extend, long examRecordId); - Task> QueryExamAsync(long id); + Task> QueryExamAsync(long id); - Task StartExamAsync(long examRecordId); + Task StartExamAsync(long examRecordId); - Task RetakeExamAsync(long examRecordId); + Task RetakeExamAsync(long examRecordId); - Task AnswerExamAsync(List answers, long studyRecordId); + Task AnswerExamAsync(List answers, long studyRecordId); - Task ViewExamPaperCallBackAsync(long examRecordId); - } + Task ViewExamPaperCallBackAsync(long examRecordId); } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_ExamServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ExamServices.cs index 539515c2..3a725319 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamServices.cs @@ -3,38 +3,37 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices +namespace Tiobon.Core.IServices; + +/// +/// 考试(自定义服务接口) +/// +public interface IGhre_ExamServices : IBaseServices { - /// - /// 考试(自定义服务接口) - /// - public interface IGhre_ExamServices : IBaseServices - { - Task GetModuleInfo(ModuleParam param); - Task QueryList(QueryBody body, string status); + Task GetModuleInfo(ModuleParam param); + Task QueryList(QueryBody body, string status); - Task> QueryDefault(long Id); + Task> QueryDefault(long Id); - Task>> QueryStaff(List Ids, string type); + Task>> QueryStaff(List Ids, string type); - Task> Insert1(long id, DefaultGhre_ExamPageData pageData); + Task> Insert1(long id, DefaultGhre_ExamPageData pageData); - Task UpdateStatus(long[] ids, string status); + Task UpdateStatus(long[] ids, string status); - Task GetStatus(long id); + Task GetStatus(long id); - Task StartExam(long id); + Task StartExam(long id); - Task Copy(long id); + Task Copy(long id); - Task> QueryMessageLog(long id); + Task> QueryMessageLog(long id); - Task InsertMessageLog(Ghre_ExamMessageLogDto insert); + Task InsertMessageLog(Ghre_ExamMessageLogDto insert); - Task>> QueryRuleStaff(long examId); + Task>> QueryRuleStaff(long examId); - Task> ExportExcel(QueryExport body, string status); + Task> ExportExcel(QueryExport body, string status); - Task ExecuteExamOver(); - } + Task ExecuteExamOver(); } \ 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 7a27ed48..c410e941 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamStaffServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamStaffServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghre_ExamStaff(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// Ghre_ExamStaff(自定义服务接口) +/// 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 a8d1320f..9a590a52 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_QuestionAnswerServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_QuestionAnswerServices.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 IGhre_QuestionAnswerServices :IBaseServices - { - } -} \ No newline at end of file +{ + } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_QuestionServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_QuestionServices.cs index c640809b..b7e540f3 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_QuestionServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_QuestionServices.cs @@ -1,18 +1,16 @@ -using Microsoft.AspNetCore.Http; -using Tiobon.Core.IServices.BASE; +using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices +namespace Tiobon.Core.IServices; + +/// +/// 题目(自定义服务接口) +/// +public interface IGhre_QuestionServices : IBaseServices { - /// - /// 题目(自定义服务接口) - /// - public interface IGhre_QuestionServices : IBaseServices - { - Task> QueryFrom(long Id); - Task InsertFrom(FromGhre_QuestionPageData insertModel); + Task> QueryFrom(long Id); + Task InsertFrom(FromGhre_QuestionPageData insertModel); - Task UpdareFrom(long Id, FromGhre_QuestionPageData insertModel); - } + Task UpdareFrom(long Id, FromGhre_QuestionPageData insertModel); } \ 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 a7f0d7b7..42bca7b3 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_RequiredCourseServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_RequiredCourseServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// 必选修查询(自定义服务接口) - /// - public interface IGhre_RequiredCourseServices :IBaseServices +namespace Tiobon.Core.IServices; + +/// +/// 必选修查询(自定义服务接口) +/// +public interface IGhre_RequiredCourseServices :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 19d328b0..2c53d4d7 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_StudyRecordServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_StudyRecordServices.cs @@ -4,31 +4,30 @@ using Tiobon.Core.Model; using Tiobon.Core.Model.Models; using Tiobon.Core.Model.ViewModels.Extend; -namespace Tiobon.Core.IServices -{ - /// - /// 培训记录(自定义服务接口) - /// - public interface IGhre_StudyRecordServices :IBaseServices +namespace Tiobon.Core.IServices; + +/// +/// 培训记录(自定义服务接口) +/// +public interface IGhre_StudyRecordServices :IBaseServices { Task> QueryESSSearchFields(QueryBody body); Task> QueryESS(QueryBody filter, string condition, bool? IsEnable = true); - Task> QueryStaff(QueryBody filter); + Task> QueryStaff(QueryBody filter); - Task> QueryCourse(QueryBody body, long id); + Task> QueryCourse(QueryBody body, long id); - Task Join(long courseId); + Task Join(long courseId); - Task RecordDuration(long studyRecordId, decimal? duration); + Task RecordDuration(long studyRecordId, decimal? duration); - Task> ExportStaffExcel(QueryExport body); + Task> ExportStaffExcel(QueryExport body); - Task SyncToESS(); + Task SyncToESS(); - Task> QueryTeacherClassAnalysis(QueryBody filter); - } + Task> QueryTeacherClassAnalysis(QueryBody filter); } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleResultServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleResultServices.cs index 53b7dee4..d4f718db 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleResultServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleResultServices.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 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 3dbee79e..e157c6c9 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleServices.cs @@ -1,13 +1,12 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// 必选修规则(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// 必选修规则(自定义服务接口) +/// 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 c644c7cd..438704f2 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleStaffServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_StudyRuleStaffServices.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 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 8a864d22..7e722007 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_TeacherAttachmentServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_TeacherAttachmentServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghre_TeacherAttachment(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// Ghre_TeacherAttachment(自定义服务接口) +/// 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 fa80466c..e3c3c0b0 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_TeacherChangeAttachmentServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_TeacherChangeAttachmentServices.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 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 68117d5a..86fa31cc 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_TeacherChangeServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_TeacherChangeServices.cs @@ -2,17 +2,16 @@ using Tiobon.Core.Model; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ +namespace Tiobon.Core.IServices; + /// /// 培训讲师异动(自定义服务接口) /// - public interface IGhre_TeacherChangeServices :IBaseServices +public interface IGhre_TeacherChangeServices :IBaseServices { - Task UpdateStatus(InsertGhre_TeacherChangeInput input, string status); + Task UpdateStatus(InsertGhre_TeacherChangeInput input, string status); - Task> InsertByStatus(InsertGhre_TeacherChangeInput insertModel, string status); + Task> InsertByStatus(InsertGhre_TeacherChangeInput insertModel, string status); - Task> QueryLast(int teacherId); - } + Task> QueryLast(int teacherId); } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_TeacherServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_TeacherServices.cs index faf5b296..4239f108 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_TeacherServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_TeacherServices.cs @@ -2,15 +2,14 @@ using Tiobon.Core.Model; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghre_Teacher(自定义服务接口) - /// - public interface IGhre_TeacherServices :IBaseServices +namespace Tiobon.Core.IServices; + +/// +/// Ghre_Teacher(自定义服务接口) +/// +public interface IGhre_TeacherServices :IBaseServices { - Task UpdateStatus(InsertGhre_TeacherInput input, string status); + Task UpdateStatus(InsertGhre_TeacherInput input, string status); - Task> InsertByStatus(InsertGhre_TeacherInput insertModel, string status); - } + Task> InsertByStatus(InsertGhre_TeacherInput insertModel, string status); } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_HumanRequestServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_HumanRequestServices.cs index fb40a21e..7c931309 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_HumanRequestServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_HumanRequestServices.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 IGhrh_HumanRequestServices :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 6f8604d1..fb740dba 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeEduBGServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeEduBGServices.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 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 88c1ae8d..4cec347c 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeHomeServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeHomeServices.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 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 6718a326..87dd4170 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeInfoColumnServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeInfoColumnServices.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 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 16556531..bbbbb2f5 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeInfoGroupServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeInfoGroupServices.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 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 6d59472e..94f86253 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeLicenceServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeLicenceServices.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 IGhrh_ResumeLicenceServices :IBaseServices - { - } -} \ No newline at end of file +{ + } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeServices.cs index 5ec0b0d9..f4a8abac 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeServices.cs @@ -4,33 +4,32 @@ using Tiobon.Core.Model; using Tiobon.Core.Model.Models; using Tiobon.Core.Model.ViewModels.Extend; -namespace Tiobon.Core.IServices +namespace Tiobon.Core.IServices; + +/// +/// 个人简历(自定义服务接口) +/// +public interface IGhrh_ResumeServices : IBaseServices { - /// - /// 个人简历(自定义服务接口) - /// - public interface IGhrh_ResumeServices : IBaseServices - { - ServiceResult> QueryViewTab(); + ServiceResult> QueryViewTab(); - Task>> QueryConditions(); + Task>> QueryConditions(); - Task SwitchIsRecommend(List ids, bool isRecommend); + Task SwitchIsRecommend(List ids, bool isRecommend); - Task UpdateStatus(List ids, string status); + Task UpdateStatus(List ids, string status); - Task MarkTags(List ids, List tags); + Task MarkTags(List ids, List tags); - Task> CheckIsExist(EditGhrh_ResumeInput input); + Task> CheckIsExist(EditGhrh_ResumeInput input); - Task>> QueryCompanyInfo(string companySpecCode); + Task>> QueryCompanyInfo(string companySpecCode); - Task> Query(long id, int langId); + Task> Query(long id, int langId); - Task Submit(long id, string status, ResumeFormColumnSubmit resume); + Task Submit(long id, string status, ResumeFormColumnSubmit resume); - Task> QueryResult(long id, int langId); + Task> QueryResult(long id, int langId); - Task> Export(QueryBody filter, string condition, bool? IsEnable = true); - } + Task> Export(QueryBody filter, string condition, bool? IsEnable = true); } \ 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 43132192..d8772d7f 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeStatementServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeStatementServices.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 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 3f27e0bd..f94224ca 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTagServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTagServices.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 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 5cb790af..d71d443d 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTemplateServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTemplateServices.cs @@ -4,27 +4,26 @@ using Tiobon.Core.Model; using Tiobon.Core.Model.Models; using Tiobon.Core.Model.ViewModels.Extend; -namespace Tiobon.Core.IServices -{ - /// - /// 简历模板(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// 简历模板(自定义服务接口) +/// 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 1f3c5c7d..21e29f13 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTrainingServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTrainingServices.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 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 061925ae..35766878 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeWorkExpServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeWorkExpServices.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 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 646714eb..a6c2f910 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_StatementServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_StatementServices.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 IGhrh_StatementServices :IBaseServices - { - } -} \ No newline at end of file +{ + } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_YearHumanSettingsServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_YearHumanSettingsServices.cs index 6298cd92..dbd6633d 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_YearHumanSettingsServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_YearHumanSettingsServices.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 IGhrh_YearHumanSettingsServices :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 a3c24249..a323c5c1 100644 --- a/Tiobon.Core.IServices/Ghro/IGhro_DeptServices.cs +++ b/Tiobon.Core.IServices/Ghro/IGhro_DeptServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghro_Dept(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// Ghro_Dept(自定义服务接口) +/// 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 8fdc6540..bb54a405 100644 --- a/Tiobon.Core.IServices/Ghrs/IGhrs_AttachmentServices.cs +++ b/Tiobon.Core.IServices/Ghrs/IGhrs_AttachmentServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghrs_Attachment(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// Ghrs_Attachment(自定义服务接口) +/// 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 f10c5a50..fc8bfe2d 100644 --- a/Tiobon.Core.IServices/Ghrs/IGhrs_DataRoleDetailServices.cs +++ b/Tiobon.Core.IServices/Ghrs/IGhrs_DataRoleDetailServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghrs_DataRoleDetail(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// Ghrs_DataRoleDetail(自定义服务接口) +/// 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_MenuServices.cs b/Tiobon.Core.IServices/Ghrs/IGhrs_MenuServices.cs index 2edf52ad..510ba574 100644 --- a/Tiobon.Core.IServices/Ghrs/IGhrs_MenuServices.cs +++ b/Tiobon.Core.IServices/Ghrs/IGhrs_MenuServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghrs_Menu(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// Ghrs_Menu(自定义服务接口) +/// 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 f7543a99..1b320e4e 100644 --- a/Tiobon.Core.IServices/Ghrs/IGhrs_ParaDetailServices.cs +++ b/Tiobon.Core.IServices/Ghrs/IGhrs_ParaDetailServices.cs @@ -1,12 +1,11 @@ using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model.Models; -namespace Tiobon.Core.IServices -{ - /// - /// Ghrs_ParaDetail(自定义服务接口) - /// +namespace Tiobon.Core.IServices; + +/// +/// Ghrs_ParaDetail(自定义服务接口) +/// 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 58a3dfaa..848a84b0 100644 --- a/Tiobon.Core.IServices/Ghrs/IGhrs_UserServices.cs +++ b/Tiobon.Core.IServices/Ghrs/IGhrs_UserServices.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 IGhrs_UserServices :IBaseServices - { - } -} \ No newline at end of file +{ + } \ No newline at end of file diff --git a/Tiobon.Core.Model/Edit/Ghra/Ghra_Grade.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghra/Ghra_Grade.Dto.EditInput.cs index 2da5e391..a1d469ea 100644 --- a/Tiobon.Core.Model/Edit/Ghra/Ghra_Grade.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghra/Ghra_Grade.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 年级 (Dto.EditInput) - /// - public class EditGhra_GradeInput : Ghra_GradeBase - { - } +/// +/// 年级 (Dto.EditInput) +/// +public class EditGhra_GradeInput : Ghra_GradeBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghra/Ghra_Job.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghra/Ghra_Job.Dto.EditInput.cs index c6d278d5..5509e694 100644 --- a/Tiobon.Core.Model/Edit/Ghra/Ghra_Job.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghra/Ghra_Job.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghra_Job (Dto.EditInput) - /// - public class EditGhra_JobInput : Ghra_JobBase - { - } +/// +/// Ghra_Job (Dto.EditInput) +/// +public class EditGhra_JobInput : Ghra_JobBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghra/Ghra_Staff.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghra/Ghra_Staff.Dto.EditInput.cs index c0a5d8da..7e18ee09 100644 --- a/Tiobon.Core.Model/Edit/Ghra/Ghra_Staff.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghra/Ghra_Staff.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghra_Staff (Dto.EditInput) - /// - public class EditGhra_StaffInput : Ghra_StaffBase - { - } +/// +/// Ghra_Staff (Dto.EditInput) +/// +public class EditGhra_StaffInput : Ghra_StaffBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghra/Ghra_StaffLicence.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghra/Ghra_StaffLicence.Dto.EditInput.cs index 328cebe7..246d262a 100644 --- a/Tiobon.Core.Model/Edit/Ghra/Ghra_StaffLicence.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghra/Ghra_StaffLicence.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghra_StaffLicence (Dto.EditInput) - /// - public class EditGhra_StaffLicenceInput : Ghra_StaffLicenceBase - { - } +/// +/// Ghra_StaffLicence (Dto.EditInput) +/// +public class EditGhra_StaffLicenceInput : Ghra_StaffLicenceBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghra/Ghra_StaffTraining.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghra/Ghra_StaffTraining.Dto.EditInput.cs index 8db2362b..2db3686b 100644 --- a/Tiobon.Core.Model/Edit/Ghra/Ghra_StaffTraining.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghra/Ghra_StaffTraining.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghra_StaffTraining (Dto.EditInput) - /// - public class EditGhra_StaffTrainingInput : Ghra_StaffTrainingBase - { - } +/// +/// Ghra_StaffTraining (Dto.EditInput) +/// +public class EditGhra_StaffTrainingInput : Ghra_StaffTrainingBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghra/Ghra_Title.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghra/Ghra_Title.Dto.EditInput.cs index 2f258284..bee81ef3 100644 --- a/Tiobon.Core.Model/Edit/Ghra/Ghra_Title.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghra/Ghra_Title.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghra_Title (Dto.EditInput) - /// - public class EditGhra_TitleInput : Ghra_TitleBase - { - } +/// +/// Ghra_Title (Dto.EditInput) +/// +public class EditGhra_TitleInput : Ghra_TitleBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghra/Ghra_Zone.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghra/Ghra_Zone.Dto.EditInput.cs index aa53ae7b..41e94ef9 100644 --- a/Tiobon.Core.Model/Edit/Ghra/Ghra_Zone.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghra/Ghra_Zone.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 厂区 (Dto.EditInput) - /// - public class EditGhra_ZoneInput : Ghra_ZoneBase - { - } +/// +/// 厂区 (Dto.EditInput) +/// +public class EditGhra_ZoneInput : Ghra_ZoneBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_Attachment.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_Attachment.Dto.EditInput.cs index e751ea2d..c8437805 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_Attachment.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_Attachment.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 附件 (Dto.EditInput) - /// - public class EditGhre_AttachmentInput : Ghre_AttachmentBase - { - } +/// +/// 附件 (Dto.EditInput) +/// +public class EditGhre_AttachmentInput : Ghre_AttachmentBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_Certificate.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_Certificate.Dto.EditInput.cs index ec7252d0..a9d018c9 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_Certificate.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_Certificate.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 培训记录 (Dto.EditInput) - /// - public class EditGhre_CertificateInput : Ghre_CertificateBase - { - } +/// +/// 培训记录 (Dto.EditInput) +/// +public class EditGhre_CertificateInput : Ghre_CertificateBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_CertificateRule.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_CertificateRule.Dto.EditInput.cs index eb72732d..1661db26 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_CertificateRule.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_CertificateRule.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 培训证书规则 (Dto.EditInput) - /// - public class EditGhre_CertificateRuleInput : Ghre_CertificateRuleBase - { - } +/// +/// 培训证书规则 (Dto.EditInput) +/// +public class EditGhre_CertificateRuleInput : Ghre_CertificateRuleBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_Config.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_Config.Dto.EditInput.cs index 18b6d2ac..6e9e5300 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_Config.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_Config.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 参数配置 (Dto.EditInput) - /// - public class EditGhre_ConfigInput : Ghre_ConfigBase - { - } +/// +/// 参数配置 (Dto.EditInput) +/// +public class EditGhre_ConfigInput : Ghre_ConfigBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_Course.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_Course.Dto.EditInput.cs index 5ecef5c8..67bc8f17 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_Course.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_Course.Dto.EditInput.cs @@ -15,19 +15,18 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 课程 (Dto.EditInput) - /// - public class EditGhre_CourseInput : Ghre_CourseBase - { - - public List ExamPaperIds { get; set; } - public List CourseClassIds { get; set; } +/// +/// 课程 (Dto.EditInput) +/// +public class EditGhre_CourseInput : Ghre_CourseBase +{ + + public List ExamPaperIds { get; set; } + public List CourseClassIds { get; set; } - public string IsOPenLabel { get; set; } - } + public string IsOPenLabel { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseClass.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseClass.Dto.EditInput.cs index 7d7ddbae..86418e6a 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseClass.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseClass.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 课程分类 (Dto.EditInput) - /// - public class EditGhre_CourseClassInput : Ghre_CourseClassBase - { - } +/// +/// 课程分类 (Dto.EditInput) +/// +public class EditGhre_CourseClassInput : Ghre_CourseClassBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseScene.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseScene.Dto.EditInput.cs index c94d2cb6..453a6781 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseScene.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseScene.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 课程场景 (Dto.EditInput) - /// - public class EditGhre_CourseSceneInput : Ghre_CourseSceneBase - { - } +/// +/// 课程场景 (Dto.EditInput) +/// +public class EditGhre_CourseSceneInput : Ghre_CourseSceneBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseSnap.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseSnap.Dto.EditInput.cs index 40f0e771..8848eb2d 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseSnap.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseSnap.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghre_CourseSnap (Dto.EditInput) - /// - public class EditGhre_CourseSnapInput : Ghre_CourseSnapBase - { - } +/// +/// Ghre_CourseSnap (Dto.EditInput) +/// +public class EditGhre_CourseSnapInput : Ghre_CourseSnapBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseWare.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseWare.Dto.EditInput.cs index 4924dff1..fb862ba6 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseWare.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseWare.Dto.EditInput.cs @@ -15,16 +15,15 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 课件 (Dto.EditInput) - /// - public class EditGhre_CourseWareInput : Ghre_CourseWareBase - { - public List CourseIds2 { get; set; } +/// +/// 课件 (Dto.EditInput) +/// +public class EditGhre_CourseWareInput : Ghre_CourseWareBase +{ + public List CourseIds2 { get; set; } - public List Attachments { get; set; } - } + public List Attachments { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseWareAttachment.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseWareAttachment.Dto.EditInput.cs index 4126a800..1dbe8c3d 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseWareAttachment.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_CourseWareAttachment.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 课件附件 (Dto.EditInput) - /// - public class EditGhre_CourseWareAttachmentInput : Ghre_CourseWareAttachmentBase - { - } +/// +/// 课件附件 (Dto.EditInput) +/// +public class EditGhre_CourseWareAttachmentInput : Ghre_CourseWareAttachmentBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_CreditPoint.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_CreditPoint.Dto.EditInput.cs index 5aacefb3..040b23d4 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_CreditPoint.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_CreditPoint.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 学分记录 (Dto.EditInput) - /// - public class EditGhre_CreditPointInput : Ghre_CreditPointBase - { - } +/// +/// 学分记录 (Dto.EditInput) +/// +public class EditGhre_CreditPointInput : Ghre_CreditPointBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_Exam.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_Exam.Dto.EditInput.cs index f14ba94e..b26eb076 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_Exam.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_Exam.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 考试 (Dto.EditInput) - /// - public class EditGhre_ExamInput : Ghre_ExamBase - { - } +/// +/// 考试 (Dto.EditInput) +/// +public class EditGhre_ExamInput : Ghre_ExamBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamMessageLog.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamMessageLog.Dto.EditInput.cs index 486ceb94..fc12bf96 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamMessageLog.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamMessageLog.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 考试通知记录 (Dto.EditInput) - /// - public class EditGhre_ExamMessageLogInput : Ghre_ExamMessageLogBase - { - } +/// +/// 考试通知记录 (Dto.EditInput) +/// +public class EditGhre_ExamMessageLogInput : Ghre_ExamMessageLogBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamPaper.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamPaper.Dto.EditInput.cs index 7a891aea..7e46789c 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamPaper.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamPaper.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 试卷 (Dto.EditInput) - /// - public class EditGhre_ExamPaperInput : Ghre_ExamPaperBase - { - } +/// +/// 试卷 (Dto.EditInput) +/// +public class EditGhre_ExamPaperInput : Ghre_ExamPaperBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamPaperConfig.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamPaperConfig.Dto.EditInput.cs index c1cc8799..ec61aed9 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamPaperConfig.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamPaperConfig.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 试卷配置 (Dto.EditInput) - /// - public class EditGhre_ExamPaperConfigInput : Ghre_ExamPaperConfigBase - { - } +/// +/// 试卷配置 (Dto.EditInput) +/// +public class EditGhre_ExamPaperConfigInput : Ghre_ExamPaperConfigBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamPaperQuestion.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamPaperQuestion.Dto.EditInput.cs index b8b81ac7..9c69d544 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamPaperQuestion.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamPaperQuestion.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 试卷题目 (Dto.EditInput) - /// - public class EditGhre_ExamPaperQuestionInput : Ghre_ExamPaperQuestionBase - { - } +/// +/// 试卷题目 (Dto.EditInput) +/// +public class EditGhre_ExamPaperQuestionInput : Ghre_ExamPaperQuestionBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamRecord.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamRecord.Dto.EditInput.cs index ce96f0f3..642b30b9 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamRecord.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamRecord.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 考试记录 (Dto.EditInput) - /// - public class EditGhre_ExamRecordInput : Ghre_ExamRecordBase - { - } +/// +/// 考试记录 (Dto.EditInput) +/// +public class EditGhre_ExamRecordInput : Ghre_ExamRecordBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamRecordAnswer.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamRecordAnswer.Dto.EditInput.cs index f09ba444..69d07afb 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamRecordAnswer.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamRecordAnswer.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghre_ExamRecordAnswer (Dto.EditInput) - /// - public class EditGhre_ExamRecordAnswerInput : Ghre_ExamRecordAnswerBase - { - } +/// +/// Ghre_ExamRecordAnswer (Dto.EditInput) +/// +public class EditGhre_ExamRecordAnswerInput : Ghre_ExamRecordAnswerBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamRecordDetail.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamRecordDetail.Dto.EditInput.cs index 9155a513..debf62d7 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamRecordDetail.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamRecordDetail.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghre_ExamRecordDetail (Dto.EditInput) - /// - public class EditGhre_ExamRecordDetailInput : Ghre_ExamRecordDetailBase - { - } +/// +/// Ghre_ExamRecordDetail (Dto.EditInput) +/// +public class EditGhre_ExamRecordDetailInput : Ghre_ExamRecordDetailBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamStaff.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamStaff.Dto.EditInput.cs index bded1769..2d37f080 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamStaff.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamStaff.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghre_ExamStaff (Dto.EditInput) - /// - public class EditGhre_ExamStaffInput : Ghre_ExamStaffBase - { - } +/// +/// Ghre_ExamStaff (Dto.EditInput) +/// +public class EditGhre_ExamStaffInput : Ghre_ExamStaffBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_Question.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_Question.Dto.EditInput.cs index cce9f4b8..b0cee02b 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_Question.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_Question.Dto.EditInput.cs @@ -15,19 +15,18 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models +namespace Tiobon.Core.Model.Models; + + +/// +/// 题目 (Dto.EditInput) +/// +public class EditGhre_QuestionInput : Ghre_QuestionBase { + /// - /// 题目 (Dto.EditInput) + /// 答案 /// - public class EditGhre_QuestionInput : Ghre_QuestionBase - { - - - /// - /// 答案 - /// - public List Answers { get; set; } - } + public List Answers { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_QuestionAnswer.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_QuestionAnswer.Dto.EditInput.cs index 30d8a3b6..26a61872 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_QuestionAnswer.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_QuestionAnswer.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 题目答案 (Dto.EditInput) - /// - public class EditGhre_QuestionAnswerInput : Ghre_QuestionAnswerBase - { - } +/// +/// 题目答案 (Dto.EditInput) +/// +public class EditGhre_QuestionAnswerInput : Ghre_QuestionAnswerBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_Request.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_Request.Dto.EditInput.cs index e9d90850..69adcbbe 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_Request.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_Request.Dto.EditInput.cs @@ -15,14 +15,13 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 培训需求 (Dto.EditInput) - /// - public class EditGhre_RequestInput : Ghre_RequestBase - { - public List TrainStaffIds { get; set; } - } +/// +/// 培训需求 (Dto.EditInput) +/// +public class EditGhre_RequestInput : Ghre_RequestBase +{ + public List TrainStaffIds { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_RequiredCourse.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_RequiredCourse.Dto.EditInput.cs index a938f72b..43834caf 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_RequiredCourse.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_RequiredCourse.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 必选修查询 (Dto.EditInput) - /// - public class EditGhre_RequiredCourseInput : Ghre_RequiredCourseBase - { - } +/// +/// 必选修查询 (Dto.EditInput) +/// +public class EditGhre_RequiredCourseInput : Ghre_RequiredCourseBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_School.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_School.Dto.EditInput.cs index c0402e86..5eaec64d 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_School.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_School.Dto.EditInput.cs @@ -17,16 +17,15 @@ using System.ComponentModel.DataAnnotations.Schema; -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 培训机构 (Dto.EditInput) - /// - public class EditGhre_SchoolInput : Ghre_SchoolBase - { +/// +/// 培训机构 (Dto.EditInput) +/// +public class EditGhre_SchoolInput : Ghre_SchoolBase +{ - [NotMapped] - public List SchoolAttachments { get; set; } - } + [NotMapped] + public List SchoolAttachments { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_SchoolAttachment.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_SchoolAttachment.Dto.EditInput.cs index 9e506b77..60b6a7d5 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_SchoolAttachment.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_SchoolAttachment.Dto.EditInput.cs @@ -17,16 +17,15 @@ using System.ComponentModel.DataAnnotations.Schema; -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 培训机构附件 (Dto.EditInput) - /// - public class EditGhre_SchoolAttachmentInput : Ghre_SchoolAttachmentBase - { +/// +/// 培训机构附件 (Dto.EditInput) +/// +public class EditGhre_SchoolAttachmentInput : Ghre_SchoolAttachmentBase +{ - [NotMapped] - public List Attachments { get; set; } - } + [NotMapped] + public List Attachments { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_StudyRecord.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_StudyRecord.Dto.EditInput.cs index db661598..61b811d2 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_StudyRecord.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_StudyRecord.Dto.EditInput.cs @@ -15,33 +15,32 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models +namespace Tiobon.Core.Model.Models; + + +/// +/// 培训记录 (Dto.EditInput) +/// +public class EditGhre_StudyRecordInput : Ghre_StudyRecordBase { /// - /// 培训记录 (Dto.EditInput) + /// 得分 /// - public class EditGhre_StudyRecordInput : Ghre_StudyRecordBase - { - - /// - /// 得分 - /// - public decimal? Score { get; set; } + public decimal? Score { get; set; } - /// - /// 调整得分 - /// - public decimal? AdjustScore { get; set; } + /// + /// 调整得分 + /// + public decimal? AdjustScore { get; set; } - /// - /// 考试日期 - /// - public DateTime? ExamDate { get; set; } + /// + /// 考试日期 + /// + public DateTime? ExamDate { get; set; } - /// - /// 是否合格 - /// - public bool? IsPass { get; set; } - } + /// + /// 是否合格 + /// + public bool? IsPass { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_StudyRuleResult.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_StudyRuleResult.Dto.EditInput.cs index 16df9359..7ac5bf2a 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_StudyRuleResult.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_StudyRuleResult.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 必选修规则结果 (Dto.EditInput) - /// - public class EditGhre_StudyRuleResultInput : Ghre_StudyRuleResultBase - { - } +/// +/// 必选修规则结果 (Dto.EditInput) +/// +public class EditGhre_StudyRuleResultInput : Ghre_StudyRuleResultBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_StudyRuleStaff.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_StudyRuleStaff.Dto.EditInput.cs index 41ed6462..5a557a61 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_StudyRuleStaff.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_StudyRuleStaff.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 必选修规则人员 (Dto.EditInput) - /// - public class EditGhre_StudyRuleStaffInput : Ghre_StudyRuleStaffBase - { - } +/// +/// 必选修规则人员 (Dto.EditInput) +/// +public class EditGhre_StudyRuleStaffInput : Ghre_StudyRuleStaffBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_Teacher.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_Teacher.Dto.EditInput.cs index 3ec06c1a..02529ae5 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_Teacher.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_Teacher.Dto.EditInput.cs @@ -17,17 +17,16 @@ using System.ComponentModel.DataAnnotations.Schema; -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghre_Teacher (Dto.EditInput) - /// - public class EditGhre_TeacherInput : Ghre_TeacherBase - { +/// +/// Ghre_Teacher (Dto.EditInput) +/// +public class EditGhre_TeacherInput : Ghre_TeacherBase +{ - [NotMapped] - public List TeacherAttachments { get; set; } - } + [NotMapped] + public List TeacherAttachments { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_TeacherAttachment.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_TeacherAttachment.Dto.EditInput.cs index 9c88cc2e..dd668029 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_TeacherAttachment.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_TeacherAttachment.Dto.EditInput.cs @@ -17,16 +17,15 @@ using System.ComponentModel.DataAnnotations.Schema; -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghre_TeacherAttachment (Dto.EditInput) - /// - public class EditGhre_TeacherAttachmentInput : Ghre_TeacherAttachmentBase - { +/// +/// Ghre_TeacherAttachment (Dto.EditInput) +/// +public class EditGhre_TeacherAttachmentInput : Ghre_TeacherAttachmentBase +{ - [NotMapped] - public List Attachments { get; set; } - } + [NotMapped] + public List Attachments { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_TeacherChange.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_TeacherChange.Dto.EditInput.cs index 45374f9c..b8a6084a 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_TeacherChange.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_TeacherChange.Dto.EditInput.cs @@ -17,17 +17,16 @@ using System.ComponentModel.DataAnnotations.Schema; -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 培训讲师异动 (Dto.EditInput) - /// - public class EditGhre_TeacherChangeInput : Ghre_TeacherChangeBase - { +/// +/// 培训讲师异动 (Dto.EditInput) +/// +public class EditGhre_TeacherChangeInput : Ghre_TeacherChangeBase +{ - [NotMapped] - public List TeacherAttachments { get; set; } - } + [NotMapped] + public List TeacherAttachments { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_TeacherChangeAttachment.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_TeacherChangeAttachment.Dto.EditInput.cs index 15157c77..1142acf5 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_TeacherChangeAttachment.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_TeacherChangeAttachment.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 培训讲师异动附件 (Dto.EditInput) - /// - public class EditGhre_TeacherChangeAttachmentInput : Ghre_TeacherChangeAttachmentBase - { - } +/// +/// 培训讲师异动附件 (Dto.EditInput) +/// +public class EditGhre_TeacherChangeAttachmentInput : Ghre_TeacherChangeAttachmentBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_HumanRequest.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_HumanRequest.Dto.EditInput.cs index e16074d6..82981b65 100644 --- a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_HumanRequest.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_HumanRequest.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 人力需求维护 (Dto.EditInput) - /// - public class EditGhrh_HumanRequestInput : Ghrh_HumanRequestBase - { - } +/// +/// 人力需求维护 (Dto.EditInput) +/// +public class EditGhrh_HumanRequestInput : Ghrh_HumanRequestBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_Resume.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_Resume.Dto.EditInput.cs index 6959157a..b5e1cf2c 100644 --- a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_Resume.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_Resume.Dto.EditInput.cs @@ -17,15 +17,14 @@ using Tiobon.Core.Model.ViewModels.Extend; -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 个人简历 (Dto.EditInput) - /// - public class EditGhrh_ResumeInput : Ghrh_ResumeBase - { +/// +/// 个人简历 (Dto.EditInput) +/// +public class EditGhrh_ResumeInput : Ghrh_ResumeBase +{ - public List PhotoUrls { get; set; } - } + public List PhotoUrls { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeEduBG.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeEduBG.Dto.EditInput.cs index ddfce90f..b143e564 100644 --- a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeEduBG.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeEduBG.Dto.EditInput.cs @@ -15,15 +15,14 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 教育背景 (Dto.EditInput) - /// - public class EditGhrh_ResumeEduBGInput : Ghrh_ResumeEduBGBase - { +/// +/// 教育背景 (Dto.EditInput) +/// +public class EditGhrh_ResumeEduBGInput : Ghrh_ResumeEduBGBase +{ - public List AttachmentIDs { get; set; } - } + public List AttachmentIDs { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeHome.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeHome.Dto.EditInput.cs index 0770a00c..74cdf209 100644 --- a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeHome.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeHome.Dto.EditInput.cs @@ -15,15 +15,14 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 家庭关系 (Dto.EditInput) - /// - public class EditGhrh_ResumeHomeInput : Ghrh_ResumeHomeBase - { - public List AttachmentIDs { get; set; } +/// +/// 家庭关系 (Dto.EditInput) +/// +public class EditGhrh_ResumeHomeInput : Ghrh_ResumeHomeBase +{ + public List AttachmentIDs { get; set; } - } } diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeInfoColumn.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeInfoColumn.Dto.EditInput.cs index 4885d60b..3692af40 100644 --- a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeInfoColumn.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeInfoColumn.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 简历信息栏位 (Dto.EditInput) - /// - public class EditGhrh_ResumeInfoColumnInput : Ghrh_ResumeInfoColumnBase - { - } +/// +/// 简历信息栏位 (Dto.EditInput) +/// +public class EditGhrh_ResumeInfoColumnInput : Ghrh_ResumeInfoColumnBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeInfoGroup.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeInfoGroup.Dto.EditInput.cs index c0026183..3af09965 100644 --- a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeInfoGroup.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeInfoGroup.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 简历组别 (Dto.EditInput) - /// - public class EditGhrh_ResumeInfoGroupInput : Ghrh_ResumeInfoGroupBase - { - } +/// +/// 简历组别 (Dto.EditInput) +/// +public class EditGhrh_ResumeInfoGroupInput : Ghrh_ResumeInfoGroupBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeLicence.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeLicence.Dto.EditInput.cs index 9843f010..9f7d2a68 100644 --- a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeLicence.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeLicence.Dto.EditInput.cs @@ -15,14 +15,13 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 证件 (Dto.EditInput) - /// - public class EditGhrh_ResumeLicenceInput : Ghrh_ResumeLicenceBase - { - public List AttachmentIDs { get; set; } - } +/// +/// 证件 (Dto.EditInput) +/// +public class EditGhrh_ResumeLicenceInput : Ghrh_ResumeLicenceBase +{ + public List AttachmentIDs { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeStatement.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeStatement.Dto.EditInput.cs index dd4b61fd..afc2a4e5 100644 --- a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeStatement.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeStatement.Dto.EditInput.cs @@ -15,14 +15,13 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 简历声明 (Dto.EditInput) - /// - public class EditGhrh_ResumeStatementInput : Ghrh_ResumeStatementBase - { - public List AttachmentIDs { get; set; } - } +/// +/// 简历声明 (Dto.EditInput) +/// +public class EditGhrh_ResumeStatementInput : Ghrh_ResumeStatementBase +{ + public List AttachmentIDs { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeTag.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeTag.Dto.EditInput.cs index fdca1cde..72f5d5a5 100644 --- a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeTag.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeTag.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 简历标签 (Dto.EditInput) - /// - public class EditGhrh_ResumeTagInput : Ghrh_ResumeTagBase - { - } +/// +/// 简历标签 (Dto.EditInput) +/// +public class EditGhrh_ResumeTagInput : Ghrh_ResumeTagBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeTemplate.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeTemplate.Dto.EditInput.cs index 51372fb3..e8d21cbe 100644 --- a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeTemplate.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeTemplate.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 简历模板 (Dto.EditInput) - /// - public class EditGhrh_ResumeTemplateInput : Ghrh_ResumeTemplateBase - { - } +/// +/// 简历模板 (Dto.EditInput) +/// +public class EditGhrh_ResumeTemplateInput : Ghrh_ResumeTemplateBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeTraining.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeTraining.Dto.EditInput.cs index b6a25c46..1dcda868 100644 --- a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeTraining.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeTraining.Dto.EditInput.cs @@ -15,14 +15,13 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 简历培训记录 (Dto.EditInput) - /// - public class EditGhrh_ResumeTrainingInput : Ghrh_ResumeTrainingBase - { - public List AttachmentIDs { get; set; } - } +/// +/// 简历培训记录 (Dto.EditInput) +/// +public class EditGhrh_ResumeTrainingInput : Ghrh_ResumeTrainingBase +{ + public List AttachmentIDs { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeWorkExp.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeWorkExp.Dto.EditInput.cs index 194262f5..9aa2e5b1 100644 --- a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeWorkExp.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeWorkExp.Dto.EditInput.cs @@ -15,14 +15,13 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 工作经历 (Dto.EditInput) - /// - public class EditGhrh_ResumeWorkExpInput : Ghrh_ResumeWorkExpBase - { - public List AttachmentIDs { get; set; } - } +/// +/// 工作经历 (Dto.EditInput) +/// +public class EditGhrh_ResumeWorkExpInput : Ghrh_ResumeWorkExpBase +{ + public List AttachmentIDs { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_Statement.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_Statement.Dto.EditInput.cs index 26a6a8a9..1f9454bd 100644 --- a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_Statement.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_Statement.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 声明 (Dto.EditInput) - /// - public class EditGhrh_StatementInput : Ghrh_StatementBase - { - } +/// +/// 声明 (Dto.EditInput) +/// +public class EditGhrh_StatementInput : Ghrh_StatementBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_YearHumanSettings.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_YearHumanSettings.Dto.EditInput.cs index 5646114a..f69184b2 100644 --- a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_YearHumanSettings.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_YearHumanSettings.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 年度人力配置 (Dto.EditInput) - /// - public class EditGhrh_YearHumanSettingsInput : Ghrh_YearHumanSettingsBase - { - } +/// +/// 年度人力配置 (Dto.EditInput) +/// +public class EditGhrh_YearHumanSettingsInput : Ghrh_YearHumanSettingsBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghro/Ghro_Dept.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghro/Ghro_Dept.Dto.EditInput.cs index a69479b3..13563332 100644 --- a/Tiobon.Core.Model/Edit/Ghro/Ghro_Dept.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghro/Ghro_Dept.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghro_Dept (Dto.EditInput) - /// - public class EditGhro_DeptInput : Ghro_DeptBase - { - } +/// +/// Ghro_Dept (Dto.EditInput) +/// +public class EditGhro_DeptInput : Ghro_DeptBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghrs/Ghrs_Attachment.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrs/Ghrs_Attachment.Dto.EditInput.cs index dee4e5e5..94dda0e9 100644 --- a/Tiobon.Core.Model/Edit/Ghrs/Ghrs_Attachment.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrs/Ghrs_Attachment.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghrs_Attachment (Dto.EditInput) - /// - public class EditGhrs_AttachmentInput : Ghrs_AttachmentBase - { - } +/// +/// Ghrs_Attachment (Dto.EditInput) +/// +public class EditGhrs_AttachmentInput : Ghrs_AttachmentBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghrs/Ghrs_DataRoleDetail.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrs/Ghrs_DataRoleDetail.Dto.EditInput.cs index dadeb553..e5f2bd22 100644 --- a/Tiobon.Core.Model/Edit/Ghrs/Ghrs_DataRoleDetail.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrs/Ghrs_DataRoleDetail.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghrs_DataRoleDetail (Dto.EditInput) - /// - public class EditGhrs_DataRoleDetailInput : Ghrs_DataRoleDetailBase - { - } +/// +/// Ghrs_DataRoleDetail (Dto.EditInput) +/// +public class EditGhrs_DataRoleDetailInput : Ghrs_DataRoleDetailBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghrs/Ghrs_Menu.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrs/Ghrs_Menu.Dto.EditInput.cs index 591347a5..3c89ab88 100644 --- a/Tiobon.Core.Model/Edit/Ghrs/Ghrs_Menu.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrs/Ghrs_Menu.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghrs_Menu (Dto.EditInput) - /// - public class EditGhrs_MenuInput : Ghrs_MenuBase - { - } +/// +/// Ghrs_Menu (Dto.EditInput) +/// +public class EditGhrs_MenuInput : Ghrs_MenuBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghrs/Ghrs_ParaDetail.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrs/Ghrs_ParaDetail.Dto.EditInput.cs index b52b08d0..d558aed6 100644 --- a/Tiobon.Core.Model/Edit/Ghrs/Ghrs_ParaDetail.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrs/Ghrs_ParaDetail.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghrs_ParaDetail (Dto.EditInput) - /// - public class EditGhrs_ParaDetailInput : Ghrs_ParaDetailBase - { - } +/// +/// Ghrs_ParaDetail (Dto.EditInput) +/// +public class EditGhrs_ParaDetailInput : Ghrs_ParaDetailBase +{ } diff --git a/Tiobon.Core.Model/Edit/Ghrs/Ghrs_User.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrs/Ghrs_User.Dto.EditInput.cs index 54866978..a2753f6b 100644 --- a/Tiobon.Core.Model/Edit/Ghrs/Ghrs_User.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrs/Ghrs_User.Dto.EditInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 系统用户 (Dto.EditInput) - /// - public class EditGhrs_UserInput : Ghrs_UserBase - { - } +/// +/// 系统用户 (Dto.EditInput) +/// +public class EditGhrs_UserInput : Ghrs_UserBase +{ } diff --git a/Tiobon.Core.Model/GlobalUsings.cs b/Tiobon.Core.Model/GlobalUsings.cs new file mode 100644 index 00000000..78bc57a9 --- /dev/null +++ b/Tiobon.Core.Model/GlobalUsings.cs @@ -0,0 +1,4 @@ +global using System.ComponentModel; +global using System.ComponentModel.DataAnnotations; +global using System.ComponentModel.DataAnnotations.Schema; +global using SqlSugar; \ No newline at end of file diff --git a/Tiobon.Core.Model/Insert/Ghra/Ghra_Grade.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghra/Ghra_Grade.Dto.InsertInput.cs index b63c3a64..92ee4add 100644 --- a/Tiobon.Core.Model/Insert/Ghra/Ghra_Grade.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghra/Ghra_Grade.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 年级 (Dto.InsertInput) - /// - public class InsertGhra_GradeInput : Ghra_GradeBase - { - } +/// +/// 年级 (Dto.InsertInput) +/// +public class InsertGhra_GradeInput : Ghra_GradeBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghra/Ghra_Job.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghra/Ghra_Job.Dto.InsertInput.cs index 4bbbe8e5..b4608ba3 100644 --- a/Tiobon.Core.Model/Insert/Ghra/Ghra_Job.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghra/Ghra_Job.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghra_Job (Dto.InsertInput) - /// - public class InsertGhra_JobInput : Ghra_JobBase - { - } +/// +/// Ghra_Job (Dto.InsertInput) +/// +public class InsertGhra_JobInput : Ghra_JobBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghra/Ghra_Staff.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghra/Ghra_Staff.Dto.InsertInput.cs index bc0e53ba..7d8b0212 100644 --- a/Tiobon.Core.Model/Insert/Ghra/Ghra_Staff.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghra/Ghra_Staff.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghra_Staff (Dto.InsertInput) - /// - public class InsertGhra_StaffInput : Ghra_StaffBase - { - } +/// +/// Ghra_Staff (Dto.InsertInput) +/// +public class InsertGhra_StaffInput : Ghra_StaffBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghra/Ghra_StaffLicence.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghra/Ghra_StaffLicence.Dto.InsertInput.cs index d9268f26..1964305a 100644 --- a/Tiobon.Core.Model/Insert/Ghra/Ghra_StaffLicence.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghra/Ghra_StaffLicence.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghra_StaffLicence (Dto.InsertInput) - /// - public class InsertGhra_StaffLicenceInput : Ghra_StaffLicenceBase - { - } +/// +/// Ghra_StaffLicence (Dto.InsertInput) +/// +public class InsertGhra_StaffLicenceInput : Ghra_StaffLicenceBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghra/Ghra_StaffTraining.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghra/Ghra_StaffTraining.Dto.InsertInput.cs index 9c68655a..adac9ec8 100644 --- a/Tiobon.Core.Model/Insert/Ghra/Ghra_StaffTraining.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghra/Ghra_StaffTraining.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghra_StaffTraining (Dto.InsertInput) - /// - public class InsertGhra_StaffTrainingInput : Ghra_StaffTrainingBase - { - } +/// +/// Ghra_StaffTraining (Dto.InsertInput) +/// +public class InsertGhra_StaffTrainingInput : Ghra_StaffTrainingBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghra/Ghra_Title.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghra/Ghra_Title.Dto.InsertInput.cs index ad88e1f4..1edbd70d 100644 --- a/Tiobon.Core.Model/Insert/Ghra/Ghra_Title.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghra/Ghra_Title.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghra_Title (Dto.InsertInput) - /// - public class InsertGhra_TitleInput : Ghra_TitleBase - { - } +/// +/// Ghra_Title (Dto.InsertInput) +/// +public class InsertGhra_TitleInput : Ghra_TitleBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghra/Ghra_Zone.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghra/Ghra_Zone.Dto.InsertInput.cs index 58260def..f71d57b0 100644 --- a/Tiobon.Core.Model/Insert/Ghra/Ghra_Zone.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghra/Ghra_Zone.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 厂区 (Dto.InsertInput) - /// - public class InsertGhra_ZoneInput : Ghra_ZoneBase - { - } +/// +/// 厂区 (Dto.InsertInput) +/// +public class InsertGhra_ZoneInput : Ghra_ZoneBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_Attachment.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_Attachment.Dto.InsertInput.cs index 93b4c8e2..c208c74d 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_Attachment.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_Attachment.Dto.InsertInput.cs @@ -15,14 +15,13 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 附件 (Dto.InsertInput) - /// - public class InsertGhre_AttachmentInput : Ghre_AttachmentBase - { - public long? AttachmentID { get; set; } - } +/// +/// 附件 (Dto.InsertInput) +/// +public class InsertGhre_AttachmentInput : Ghre_AttachmentBase +{ + public long? AttachmentID { get; set; } } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_Certificate.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_Certificate.Dto.InsertInput.cs index 957d479d..baf36d68 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_Certificate.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_Certificate.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 培训记录 (Dto.InsertInput) - /// - public class InsertGhre_CertificateInput : Ghre_CertificateBase - { - } +/// +/// 培训记录 (Dto.InsertInput) +/// +public class InsertGhre_CertificateInput : Ghre_CertificateBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_CertificateRule.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_CertificateRule.Dto.InsertInput.cs index 1ea68496..9826913b 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_CertificateRule.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_CertificateRule.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 培训证书规则 (Dto.InsertInput) - /// - public class InsertGhre_CertificateRuleInput : Ghre_CertificateRuleBase - { - } +/// +/// 培训证书规则 (Dto.InsertInput) +/// +public class InsertGhre_CertificateRuleInput : Ghre_CertificateRuleBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_Config.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_Config.Dto.InsertInput.cs index 9a8af4c4..e1eb56e8 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_Config.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_Config.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 参数配置 (Dto.InsertInput) - /// - public class InsertGhre_ConfigInput : Ghre_ConfigBase - { - } +/// +/// 参数配置 (Dto.InsertInput) +/// +public class InsertGhre_ConfigInput : Ghre_ConfigBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_Course.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_Course.Dto.InsertInput.cs index 4316e2a4..e505b288 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_Course.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_Course.Dto.InsertInput.cs @@ -15,18 +15,17 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 课程 (Dto.InsertInput) - /// - public class InsertGhre_CourseInput : Ghre_CourseBase - { - public List ExamPaperIds { get; set;} - public List CourseClassIds { get; set; } - public string IsOPenLabel { get; set; } +/// +/// 课程 (Dto.InsertInput) +/// +public class InsertGhre_CourseInput : Ghre_CourseBase +{ + public List ExamPaperIds { get; set;} + public List CourseClassIds { get; set; } + public string IsOPenLabel { get; set; } - } } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseClass.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseClass.Dto.InsertInput.cs index d269233a..e62470eb 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseClass.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseClass.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 课程分类 (Dto.InsertInput) - /// - public class InsertGhre_CourseClassInput : Ghre_CourseClassBase - { - } +/// +/// 课程分类 (Dto.InsertInput) +/// +public class InsertGhre_CourseClassInput : Ghre_CourseClassBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseScene.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseScene.Dto.InsertInput.cs index 4ab0c62d..e7d6f040 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseScene.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseScene.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 课程场景 (Dto.InsertInput) - /// - public class InsertGhre_CourseSceneInput : Ghre_CourseSceneBase - { - } +/// +/// 课程场景 (Dto.InsertInput) +/// +public class InsertGhre_CourseSceneInput : Ghre_CourseSceneBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseSnap.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseSnap.Dto.InsertInput.cs index 25059d32..b6295148 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseSnap.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseSnap.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghre_CourseSnap (Dto.InsertInput) - /// - public class InsertGhre_CourseSnapInput : Ghre_CourseSnapBase - { - } +/// +/// Ghre_CourseSnap (Dto.InsertInput) +/// +public class InsertGhre_CourseSnapInput : Ghre_CourseSnapBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseWare.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseWare.Dto.InsertInput.cs index 572c0e4a..af7f0a01 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseWare.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseWare.Dto.InsertInput.cs @@ -15,16 +15,15 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 课件 (Dto.InsertInput) - /// - public class InsertGhre_CourseWareInput : Ghre_CourseWareBase - { - public List CourseIds2 { get; set; } +/// +/// 课件 (Dto.InsertInput) +/// +public class InsertGhre_CourseWareInput : Ghre_CourseWareBase +{ + public List CourseIds2 { get; set; } - public List Attachments { get; set; } - } + public List Attachments { get; set; } } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseWareAttachment.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseWareAttachment.Dto.InsertInput.cs index 6db240af..1ba26374 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseWareAttachment.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_CourseWareAttachment.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 课件附件 (Dto.InsertInput) - /// - public class InsertGhre_CourseWareAttachmentInput : Ghre_CourseWareAttachmentBase - { - } +/// +/// 课件附件 (Dto.InsertInput) +/// +public class InsertGhre_CourseWareAttachmentInput : Ghre_CourseWareAttachmentBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_CreditPoint.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_CreditPoint.Dto.InsertInput.cs index 36ffca0d..ad554ba4 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_CreditPoint.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_CreditPoint.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 学分记录 (Dto.InsertInput) - /// - public class InsertGhre_CreditPointInput : Ghre_CreditPointBase - { - } +/// +/// 学分记录 (Dto.InsertInput) +/// +public class InsertGhre_CreditPointInput : Ghre_CreditPointBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_Exam.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_Exam.Dto.InsertInput.cs index 2abbf85a..bc1b4088 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_Exam.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_Exam.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 考试 (Dto.InsertInput) - /// - public class InsertGhre_ExamInput : Ghre_ExamBase - { - } +/// +/// 考试 (Dto.InsertInput) +/// +public class InsertGhre_ExamInput : Ghre_ExamBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamMessageLog.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamMessageLog.Dto.InsertInput.cs index 5c608960..443f7de3 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamMessageLog.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamMessageLog.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 考试通知记录 (Dto.InsertInput) - /// - public class InsertGhre_ExamMessageLogInput : Ghre_ExamMessageLogBase - { - } +/// +/// 考试通知记录 (Dto.InsertInput) +/// +public class InsertGhre_ExamMessageLogInput : Ghre_ExamMessageLogBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamPaper.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamPaper.Dto.InsertInput.cs index 9dbdbcf6..28011030 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamPaper.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamPaper.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 试卷 (Dto.InsertInput) - /// - public class InsertGhre_ExamPaperInput : Ghre_ExamPaperBase - { - } +/// +/// 试卷 (Dto.InsertInput) +/// +public class InsertGhre_ExamPaperInput : Ghre_ExamPaperBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamPaperConfig.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamPaperConfig.Dto.InsertInput.cs index 019f4d98..74fcd8fe 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamPaperConfig.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamPaperConfig.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 试卷配置 (Dto.InsertInput) - /// - public class InsertGhre_ExamPaperConfigInput : Ghre_ExamPaperConfigBase - { - } +/// +/// 试卷配置 (Dto.InsertInput) +/// +public class InsertGhre_ExamPaperConfigInput : Ghre_ExamPaperConfigBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamPaperQuestion.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamPaperQuestion.Dto.InsertInput.cs index fce500c7..c73130a7 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamPaperQuestion.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamPaperQuestion.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 试卷题目 (Dto.InsertInput) - /// - public class InsertGhre_ExamPaperQuestionInput : Ghre_ExamPaperQuestionBase - { - } +/// +/// 试卷题目 (Dto.InsertInput) +/// +public class InsertGhre_ExamPaperQuestionInput : Ghre_ExamPaperQuestionBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamRecord.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamRecord.Dto.InsertInput.cs index fe0b4e4f..071ecb2f 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamRecord.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamRecord.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 考试记录 (Dto.InsertInput) - /// - public class InsertGhre_ExamRecordInput : Ghre_ExamRecordBase - { - } +/// +/// 考试记录 (Dto.InsertInput) +/// +public class InsertGhre_ExamRecordInput : Ghre_ExamRecordBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamRecordAnswer.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamRecordAnswer.Dto.InsertInput.cs index 180e4b39..266e06bc 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamRecordAnswer.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamRecordAnswer.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghre_ExamRecordAnswer (Dto.InsertInput) - /// - public class InsertGhre_ExamRecordAnswerInput : Ghre_ExamRecordAnswerBase - { - } +/// +/// Ghre_ExamRecordAnswer (Dto.InsertInput) +/// +public class InsertGhre_ExamRecordAnswerInput : Ghre_ExamRecordAnswerBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamRecordDetail.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamRecordDetail.Dto.InsertInput.cs index 89558f92..2412bd9a 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamRecordDetail.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamRecordDetail.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghre_ExamRecordDetail (Dto.InsertInput) - /// - public class InsertGhre_ExamRecordDetailInput : Ghre_ExamRecordDetailBase - { - } +/// +/// Ghre_ExamRecordDetail (Dto.InsertInput) +/// +public class InsertGhre_ExamRecordDetailInput : Ghre_ExamRecordDetailBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamStaff.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamStaff.Dto.InsertInput.cs index 64a2ffd8..446d3ab0 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamStaff.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamStaff.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghre_ExamStaff (Dto.InsertInput) - /// - public class InsertGhre_ExamStaffInput : Ghre_ExamStaffBase - { - } +/// +/// Ghre_ExamStaff (Dto.InsertInput) +/// +public class InsertGhre_ExamStaffInput : Ghre_ExamStaffBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_QuestionAnswer.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_QuestionAnswer.Dto.InsertInput.cs index ef757248..1fbfa9bf 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_QuestionAnswer.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_QuestionAnswer.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 题目答案 (Dto.InsertInput) - /// - public class InsertGhre_QuestionAnswerInput : Ghre_QuestionAnswerBase - { - } +/// +/// 题目答案 (Dto.InsertInput) +/// +public class InsertGhre_QuestionAnswerInput : Ghre_QuestionAnswerBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_Request.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_Request.Dto.InsertInput.cs index c7a7e070..420b8739 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_Request.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_Request.Dto.InsertInput.cs @@ -15,16 +15,15 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 培训需求 (Dto.InsertInput) - /// - public class InsertGhre_RequestInput : Ghre_RequestBase - { +/// +/// 培训需求 (Dto.InsertInput) +/// +public class InsertGhre_RequestInput : Ghre_RequestBase +{ - public List TrainStaffIds { get; set; } - public List Ids { get; set; } - } + public List TrainStaffIds { get; set; } + public List Ids { get; set; } } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_RequiredCourse.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_RequiredCourse.Dto.InsertInput.cs index 534166d8..c75ac678 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_RequiredCourse.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_RequiredCourse.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 必选修查询 (Dto.InsertInput) - /// - public class InsertGhre_RequiredCourseInput : Ghre_RequiredCourseBase - { - } +/// +/// 必选修查询 (Dto.InsertInput) +/// +public class InsertGhre_RequiredCourseInput : Ghre_RequiredCourseBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_School.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_School.Dto.InsertInput.cs index 2acb40ab..82066f79 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_School.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_School.Dto.InsertInput.cs @@ -17,16 +17,15 @@ using System.ComponentModel.DataAnnotations.Schema; -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 培训机构 (Dto.InsertInput) - /// - public class InsertGhre_SchoolInput : Ghre_SchoolBase - { - [NotMapped] - public List SchoolAttachments { get; set; } +/// +/// 培训机构 (Dto.InsertInput) +/// +public class InsertGhre_SchoolInput : Ghre_SchoolBase +{ + [NotMapped] + public List SchoolAttachments { get; set; } - } } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_SchoolAttachment.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_SchoolAttachment.Dto.InsertInput.cs index fc2d16cf..202611a4 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_SchoolAttachment.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_SchoolAttachment.Dto.InsertInput.cs @@ -17,15 +17,14 @@ using System.ComponentModel.DataAnnotations.Schema; -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 培训机构附件 (Dto.InsertInput) - /// - public class InsertGhre_SchoolAttachmentInput : Ghre_SchoolAttachmentBase - { - [NotMapped] - public List Attachments { get; set; } - } +/// +/// 培训机构附件 (Dto.InsertInput) +/// +public class InsertGhre_SchoolAttachmentInput : Ghre_SchoolAttachmentBase +{ + [NotMapped] + public List Attachments { get; set; } } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_StudyRecord.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_StudyRecord.Dto.InsertInput.cs index 05efe386..277f7b1a 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_StudyRecord.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_StudyRecord.Dto.InsertInput.cs @@ -15,33 +15,32 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models +namespace Tiobon.Core.Model.Models; + + +/// +/// 培训记录 (Dto.InsertInput) +/// +public class InsertGhre_StudyRecordInput : Ghre_StudyRecordBase { /// - /// 培训记录 (Dto.InsertInput) + /// 得分 /// - public class InsertGhre_StudyRecordInput : Ghre_StudyRecordBase - { - - /// - /// 得分 - /// - public decimal? Score { get; set; } + public decimal? Score { get; set; } - /// - /// 调整得分 - /// - public decimal? AdjustScore { get; set; } + /// + /// 调整得分 + /// + public decimal? AdjustScore { get; set; } - /// - /// 考试日期 - /// - public DateTime? ExamDate { get; set; } + /// + /// 考试日期 + /// + public DateTime? ExamDate { get; set; } - /// - /// 是否合格 - /// - public bool? IsPass { get; set; } - } + /// + /// 是否合格 + /// + public bool? IsPass { get; set; } } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_StudyRuleResult.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_StudyRuleResult.Dto.InsertInput.cs index 6b58dac1..5dec81eb 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_StudyRuleResult.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_StudyRuleResult.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 必选修规则结果 (Dto.InsertInput) - /// - public class InsertGhre_StudyRuleResultInput : Ghre_StudyRuleResultBase - { - } +/// +/// 必选修规则结果 (Dto.InsertInput) +/// +public class InsertGhre_StudyRuleResultInput : Ghre_StudyRuleResultBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_StudyRuleStaff.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_StudyRuleStaff.Dto.InsertInput.cs index 17ec0293..79e6feed 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_StudyRuleStaff.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_StudyRuleStaff.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 必选修规则人员 (Dto.InsertInput) - /// - public class InsertGhre_StudyRuleStaffInput : Ghre_StudyRuleStaffBase - { - } +/// +/// 必选修规则人员 (Dto.InsertInput) +/// +public class InsertGhre_StudyRuleStaffInput : Ghre_StudyRuleStaffBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_Teacher.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_Teacher.Dto.InsertInput.cs index 64e62c6b..a528de38 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_Teacher.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_Teacher.Dto.InsertInput.cs @@ -17,22 +17,21 @@ using System.ComponentModel.DataAnnotations.Schema; -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghre_Teacher (Dto.InsertInput) - /// - public class InsertGhre_TeacherInput : Ghre_TeacherBase - { +/// +/// Ghre_Teacher (Dto.InsertInput) +/// +public class InsertGhre_TeacherInput : Ghre_TeacherBase +{ - [NotMapped] - public List TeacherAttachments { get; set; } + [NotMapped] + public List TeacherAttachments { get; set; } - public List Ids { get; set; } + public List Ids { get; set; } - public string Reason { get; set; } + public string Reason { get; set; } - } } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherAttachment.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherAttachment.Dto.InsertInput.cs index 19ec3207..89fd379a 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherAttachment.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherAttachment.Dto.InsertInput.cs @@ -17,15 +17,14 @@ using System.ComponentModel.DataAnnotations.Schema; -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; - /// - /// Ghre_TeacherAttachment (Dto.InsertInput) - /// - public class InsertGhre_TeacherAttachmentInput : Ghre_TeacherAttachmentBase - { - [NotMapped] - public List Attachments { get; set; } - } + +/// +/// Ghre_TeacherAttachment (Dto.InsertInput) +/// +public class InsertGhre_TeacherAttachmentInput : Ghre_TeacherAttachmentBase +{ + [NotMapped] + public List Attachments { get; set; } } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherChange.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherChange.Dto.InsertInput.cs index 97aaba59..bac3aeb9 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherChange.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherChange.Dto.InsertInput.cs @@ -17,20 +17,19 @@ using System.ComponentModel.DataAnnotations.Schema; -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 培训讲师异动 (Dto.InsertInput) - /// - public class InsertGhre_TeacherChangeInput : Ghre_TeacherChangeBase - { +/// +/// 培训讲师异动 (Dto.InsertInput) +/// +public class InsertGhre_TeacherChangeInput : Ghre_TeacherChangeBase +{ - [NotMapped] - public List TeacherAttachments { get; set; } + [NotMapped] + public List TeacherAttachments { get; set; } - public List Ids { get; set; } + public List Ids { get; set; } - public string Reason { get; set; } - } + public string Reason { get; set; } } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherChangeAttachment.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherChangeAttachment.Dto.InsertInput.cs index 66d32687..88160bf8 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherChangeAttachment.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherChangeAttachment.Dto.InsertInput.cs @@ -17,16 +17,15 @@ using System.ComponentModel.DataAnnotations.Schema; -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 培训讲师异动附件 (Dto.InsertInput) - /// - public class InsertGhre_TeacherChangeAttachmentInput : Ghre_TeacherChangeAttachmentBase - { +/// +/// 培训讲师异动附件 (Dto.InsertInput) +/// +public class InsertGhre_TeacherChangeAttachmentInput : Ghre_TeacherChangeAttachmentBase +{ - [NotMapped] - public List Attachments { get; set; } - } + [NotMapped] + public List Attachments { get; set; } } diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_HumanRequest.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_HumanRequest.Dto.InsertInput.cs index 5d89ab70..39a4f4d9 100644 --- a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_HumanRequest.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_HumanRequest.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 人力需求维护 (Dto.InsertInput) - /// - public class InsertGhrh_HumanRequestInput : Ghrh_HumanRequestBase - { - } +/// +/// 人力需求维护 (Dto.InsertInput) +/// +public class InsertGhrh_HumanRequestInput : Ghrh_HumanRequestBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_Resume.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_Resume.Dto.InsertInput.cs index 468ac68c..e0440871 100644 --- a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_Resume.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_Resume.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 个人简历 (Dto.InsertInput) - /// - public class InsertGhrh_ResumeInput : Ghrh_ResumeBase - { - } +/// +/// 个人简历 (Dto.InsertInput) +/// +public class InsertGhrh_ResumeInput : Ghrh_ResumeBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeEduBG.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeEduBG.Dto.InsertInput.cs index 2c4e7c9f..fb518f6d 100644 --- a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeEduBG.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeEduBG.Dto.InsertInput.cs @@ -15,15 +15,14 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 教育背景 (Dto.InsertInput) - /// - public class InsertGhrh_ResumeEduBGInput : Ghrh_ResumeEduBGBase - { - public List AttachmentIDs { get; set; } +/// +/// 教育背景 (Dto.InsertInput) +/// +public class InsertGhrh_ResumeEduBGInput : Ghrh_ResumeEduBGBase +{ + public List AttachmentIDs { get; set; } - } } diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeHome.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeHome.Dto.InsertInput.cs index 7b183c3f..4650cab1 100644 --- a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeHome.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeHome.Dto.InsertInput.cs @@ -15,15 +15,14 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 家庭关系 (Dto.InsertInput) - /// - public class InsertGhrh_ResumeHomeInput : Ghrh_ResumeHomeBase - { - public List AttachmentIDs { get; set; } +/// +/// 家庭关系 (Dto.InsertInput) +/// +public class InsertGhrh_ResumeHomeInput : Ghrh_ResumeHomeBase +{ + public List AttachmentIDs { get; set; } - } } diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeInfoColumn.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeInfoColumn.Dto.InsertInput.cs index 07889902..238956dd 100644 --- a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeInfoColumn.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeInfoColumn.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 简历信息栏位 (Dto.InsertInput) - /// - public class InsertGhrh_ResumeInfoColumnInput : Ghrh_ResumeInfoColumnBase - { - } +/// +/// 简历信息栏位 (Dto.InsertInput) +/// +public class InsertGhrh_ResumeInfoColumnInput : Ghrh_ResumeInfoColumnBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeInfoGroup.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeInfoGroup.Dto.InsertInput.cs index d8655c78..3f151dd3 100644 --- a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeInfoGroup.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeInfoGroup.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 简历组别 (Dto.InsertInput) - /// - public class InsertGhrh_ResumeInfoGroupInput : Ghrh_ResumeInfoGroupBase - { - } +/// +/// 简历组别 (Dto.InsertInput) +/// +public class InsertGhrh_ResumeInfoGroupInput : Ghrh_ResumeInfoGroupBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeLicence.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeLicence.Dto.InsertInput.cs index 404ac805..aeb2614c 100644 --- a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeLicence.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeLicence.Dto.InsertInput.cs @@ -15,15 +15,14 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 证件 (Dto.InsertInput) - /// - public class InsertGhrh_ResumeLicenceInput : Ghrh_ResumeLicenceBase - { - public List AttachmentIDs { get; set; } +/// +/// 证件 (Dto.InsertInput) +/// +public class InsertGhrh_ResumeLicenceInput : Ghrh_ResumeLicenceBase +{ + public List AttachmentIDs { get; set; } - } } diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeStatement.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeStatement.Dto.InsertInput.cs index 99199b5f..8b7e0ff3 100644 --- a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeStatement.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeStatement.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 简历声明 (Dto.InsertInput) - /// - public class InsertGhrh_ResumeStatementInput : Ghrh_ResumeStatementBase - { - } +/// +/// 简历声明 (Dto.InsertInput) +/// +public class InsertGhrh_ResumeStatementInput : Ghrh_ResumeStatementBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeTag.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeTag.Dto.InsertInput.cs index 566448a5..455bfd60 100644 --- a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeTag.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeTag.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 简历标签 (Dto.InsertInput) - /// - public class InsertGhrh_ResumeTagInput : Ghrh_ResumeTagBase - { - } +/// +/// 简历标签 (Dto.InsertInput) +/// +public class InsertGhrh_ResumeTagInput : Ghrh_ResumeTagBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeTemplate.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeTemplate.Dto.InsertInput.cs index b16722b0..07730618 100644 --- a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeTemplate.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeTemplate.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 简历模板 (Dto.InsertInput) - /// - public class InsertGhrh_ResumeTemplateInput : Ghrh_ResumeTemplateBase - { - } +/// +/// 简历模板 (Dto.InsertInput) +/// +public class InsertGhrh_ResumeTemplateInput : Ghrh_ResumeTemplateBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeTraining.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeTraining.Dto.InsertInput.cs index 3e50bc47..4af57507 100644 --- a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeTraining.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeTraining.Dto.InsertInput.cs @@ -15,15 +15,14 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 简历培训记录 (Dto.InsertInput) - /// - public class InsertGhrh_ResumeTrainingInput : Ghrh_ResumeTrainingBase - { - public List AttachmentIDs { get; set; } +/// +/// 简历培训记录 (Dto.InsertInput) +/// +public class InsertGhrh_ResumeTrainingInput : Ghrh_ResumeTrainingBase +{ + public List AttachmentIDs { get; set; } - } } diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeWorkExp.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeWorkExp.Dto.InsertInput.cs index 1befb011..69a20c34 100644 --- a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeWorkExp.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeWorkExp.Dto.InsertInput.cs @@ -15,15 +15,14 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 工作经历 (Dto.InsertInput) - /// - public class InsertGhrh_ResumeWorkExpInput : Ghrh_ResumeWorkExpBase - { - public List AttachmentIDs { get; set; } +/// +/// 工作经历 (Dto.InsertInput) +/// +public class InsertGhrh_ResumeWorkExpInput : Ghrh_ResumeWorkExpBase +{ + public List AttachmentIDs { get; set; } - } } diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_Statement.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_Statement.Dto.InsertInput.cs index 4d0a74cf..d19098d8 100644 --- a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_Statement.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_Statement.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 声明 (Dto.InsertInput) - /// - public class InsertGhrh_StatementInput : Ghrh_StatementBase - { - } +/// +/// 声明 (Dto.InsertInput) +/// +public class InsertGhrh_StatementInput : Ghrh_StatementBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_YearHumanSettings.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_YearHumanSettings.Dto.InsertInput.cs index 6a8f0853..dfbcddb1 100644 --- a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_YearHumanSettings.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_YearHumanSettings.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 年度人力配置 (Dto.InsertInput) - /// - public class InsertGhrh_YearHumanSettingsInput : Ghrh_YearHumanSettingsBase - { - } +/// +/// 年度人力配置 (Dto.InsertInput) +/// +public class InsertGhrh_YearHumanSettingsInput : Ghrh_YearHumanSettingsBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghro/Ghro_Dept.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghro/Ghro_Dept.Dto.InsertInput.cs index 81bd2145..0ee22b04 100644 --- a/Tiobon.Core.Model/Insert/Ghro/Ghro_Dept.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghro/Ghro_Dept.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghro_Dept (Dto.InsertInput) - /// - public class InsertGhro_DeptInput : Ghro_DeptBase - { - } +/// +/// Ghro_Dept (Dto.InsertInput) +/// +public class InsertGhro_DeptInput : Ghro_DeptBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghrs/Ghrs_Attachment.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrs/Ghrs_Attachment.Dto.InsertInput.cs index 4143f4c9..255ceb81 100644 --- a/Tiobon.Core.Model/Insert/Ghrs/Ghrs_Attachment.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrs/Ghrs_Attachment.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghrs_Attachment (Dto.InsertInput) - /// - public class InsertGhrs_AttachmentInput : Ghrs_AttachmentBase - { - } +/// +/// Ghrs_Attachment (Dto.InsertInput) +/// +public class InsertGhrs_AttachmentInput : Ghrs_AttachmentBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghrs/Ghrs_DataRoleDetail.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrs/Ghrs_DataRoleDetail.Dto.InsertInput.cs index 7165ff7b..883e56a1 100644 --- a/Tiobon.Core.Model/Insert/Ghrs/Ghrs_DataRoleDetail.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrs/Ghrs_DataRoleDetail.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghrs_DataRoleDetail (Dto.InsertInput) - /// - public class InsertGhrs_DataRoleDetailInput : Ghrs_DataRoleDetailBase - { - } +/// +/// Ghrs_DataRoleDetail (Dto.InsertInput) +/// +public class InsertGhrs_DataRoleDetailInput : Ghrs_DataRoleDetailBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghrs/Ghrs_Menu.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrs/Ghrs_Menu.Dto.InsertInput.cs index 1221d0bc..3258e7c9 100644 --- a/Tiobon.Core.Model/Insert/Ghrs/Ghrs_Menu.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrs/Ghrs_Menu.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghrs_Menu (Dto.InsertInput) - /// - public class InsertGhrs_MenuInput : Ghrs_MenuBase - { - } +/// +/// Ghrs_Menu (Dto.InsertInput) +/// +public class InsertGhrs_MenuInput : Ghrs_MenuBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghrs/Ghrs_ParaDetail.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrs/Ghrs_ParaDetail.Dto.InsertInput.cs index 25d766bf..1e8a35fa 100644 --- a/Tiobon.Core.Model/Insert/Ghrs/Ghrs_ParaDetail.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrs/Ghrs_ParaDetail.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// Ghrs_ParaDetail (Dto.InsertInput) - /// - public class InsertGhrs_ParaDetailInput : Ghrs_ParaDetailBase - { - } +/// +/// Ghrs_ParaDetail (Dto.InsertInput) +/// +public class InsertGhrs_ParaDetailInput : Ghrs_ParaDetailBase +{ } diff --git a/Tiobon.Core.Model/Insert/Ghrs/Ghrs_User.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrs/Ghrs_User.Dto.InsertInput.cs index 6721e0f9..748670ae 100644 --- a/Tiobon.Core.Model/Insert/Ghrs/Ghrs_User.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrs/Ghrs_User.Dto.InsertInput.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 系统用户 (Dto.InsertInput) - /// - public class InsertGhrs_UserInput : Ghrs_UserBase - { - } +/// +/// 系统用户 (Dto.InsertInput) +/// +public class InsertGhrs_UserInput : Ghrs_UserBase +{ } diff --git a/Tiobon.Core.Model/Models/Ghra/Ghra_Grade.cs b/Tiobon.Core.Model/Models/Ghra/Ghra_Grade.cs index e0b73b9e..a9d22583 100644 --- a/Tiobon.Core.Model/Models/Ghra/Ghra_Grade.cs +++ b/Tiobon.Core.Model/Models/Ghra/Ghra_Grade.cs @@ -14,113 +14,108 @@ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ */ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 年级 (Model) +/// +[SugarTable("Ghra_Grade", "Ghra_Grade"), Entity(TableCnName = "年级", TableName = "Ghra_Grade")] +public class Ghra_Grade : BasePoco1 { + + /// + /// TitleID + /// + [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false), Display(Name = "表主键")] + public int GradeID { get; set; } + /// + /// 编号 + /// + [EntityColumn] + [Display(Name = "GradeNo"), Description("编号"), MaxLength(100, ErrorMessage = "GradeNo 不能超过 100 个字符")] + public string GradeNo { get; set; } + + /// + /// 名称 + /// + [EntityColumn] + [Display(Name = "GradeName"), Description("名称"), 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; } + /// - /// 年级 (Model) - /// - [SugarTable("Ghra_Grade", "Ghra_Grade"), Entity(TableCnName = "年级", TableName = "Ghra_Grade")] - public class Ghra_Grade : BasePoco1 - { - - - /// - /// TitleID - /// - [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false), Display(Name = "表主键")] - public int GradeID { get; set; } - /// - /// 编号 - /// - [EntityColumn] - [Display(Name = "GradeNo"), Description("编号"), MaxLength(100, ErrorMessage = "GradeNo 不能超过 100 个字符")] - public string GradeNo { get; set; } - - /// - /// 名称 - /// - [EntityColumn] - [Display(Name = "GradeName"), Description("名称"), 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; } - } + /// 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; } } diff --git a/Tiobon.Core.Model/Models/Ghra/Ghra_Job.cs b/Tiobon.Core.Model/Models/Ghra/Ghra_Job.cs index 637f14a9..3c9bdddc 100644 --- a/Tiobon.Core.Model/Models/Ghra/Ghra_Job.cs +++ b/Tiobon.Core.Model/Models/Ghra/Ghra_Job.cs @@ -13,140 +13,134 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; - -namespace Tiobon.Core.Model.Models +*/ +namespace Tiobon.Core.Model.Models; + +/// +/// Ghra_Job (Model) +/// +[SugarTable("Ghra_Job", "Ghra_Job"), Entity(TableCnName = "Ghra_Job", TableName = "Ghra_Job")] +public class Ghra_Job : BasePoco1 { /// - /// Ghra_Job (Model) - /// - [SugarTable("Ghra_Job", "Ghra_Job"), Entity(TableCnName = "Ghra_Job", TableName = "Ghra_Job")] - public class Ghra_Job : BasePoco1 - { - - /// - /// 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/Models/Ghra/Ghra_Staff.cs b/Tiobon.Core.Model/Models/Ghra/Ghra_Staff.cs index d99146b3..fcf18199 100644 --- a/Tiobon.Core.Model/Models/Ghra/Ghra_Staff.cs +++ b/Tiobon.Core.Model/Models/Ghra/Ghra_Staff.cs @@ -13,701 +13,695 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghra_Staff (Model) +/// +[SugarTable("Ghra_Staff", "Ghra_Staff"), Entity(TableCnName = "Ghra_Staff", TableName = "Ghra_Staff")] +public class Ghra_Staff : BasePoco1 { /// - /// Ghra_Staff (Model) - /// - [SugarTable("Ghra_Staff", "Ghra_Staff"), Entity(TableCnName = "Ghra_Staff", TableName = "Ghra_Staff")] - public class Ghra_Staff : BasePoco1 - { - - /// - /// StaffID - /// - [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false), Display(Name = "表主键")] - 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 + /// + [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false), Display(Name = "表主键")] + 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/Models/Ghra/Ghra_StaffLicence.cs b/Tiobon.Core.Model/Models/Ghra/Ghra_StaffLicence.cs index 098b81eb..8dec4b62 100644 --- a/Tiobon.Core.Model/Models/Ghra/Ghra_StaffLicence.cs +++ b/Tiobon.Core.Model/Models/Ghra/Ghra_StaffLicence.cs @@ -13,136 +13,131 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghra_StaffLicence (Model) +/// +[SugarTable("Ghra_StaffLicence", "Ghra_StaffLicence"), Entity(TableCnName = "Ghra_StaffLicence", TableName = "Ghra_StaffLicence")] +public class Ghra_StaffLicence : BasePoco { /// - /// Ghra_StaffLicence (Model) - /// - [SugarTable("Ghra_StaffLicence", "Ghra_StaffLicence"), Entity(TableCnName = "Ghra_StaffLicence", TableName = "Ghra_StaffLicence")] - public class Ghra_StaffLicence : BasePoco - { - - /// - /// 证件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/Models/Ghra/Ghra_StaffTraining.cs b/Tiobon.Core.Model/Models/Ghra/Ghra_StaffTraining.cs index 26f6dafb..c5e3e885 100644 --- a/Tiobon.Core.Model/Models/Ghra/Ghra_StaffTraining.cs +++ b/Tiobon.Core.Model/Models/Ghra/Ghra_StaffTraining.cs @@ -14,131 +14,125 @@ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ */ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using SqlSugar; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghra_StaffTraining (Model) +/// +[SugarTable("Ghra_StaffTraining", "Ghra_StaffTraining"), Entity(TableCnName = "Ghra_StaffTraining", TableName = "Ghra_StaffTraining")] +public class Ghra_StaffTraining : BasePoco1 { /// - /// Ghra_StaffTraining (Model) - /// - [SugarTable("Ghra_StaffTraining", "Ghra_StaffTraining"), Entity(TableCnName = "Ghra_StaffTraining", TableName = "Ghra_StaffTraining")] - public class Ghra_StaffTraining : BasePoco1 - { - - /// - /// StaffTrainingID - /// - [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = true), Display(Name = "表主键")] - 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 + /// + [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = true), Display(Name = "表主键")] + 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/Models/Ghra/Ghra_Title.cs b/Tiobon.Core.Model/Models/Ghra/Ghra_Title.cs index dff32ca7..e314b436 100644 --- a/Tiobon.Core.Model/Models/Ghra/Ghra_Title.cs +++ b/Tiobon.Core.Model/Models/Ghra/Ghra_Title.cs @@ -13,164 +13,159 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghra_Title (Model) +/// +[SugarTable("Ghra_Title", "Ghra_Title"), Entity(TableCnName = "Ghra_Title", TableName = "Ghra_Title")] +public class Ghra_Title : BasePoco1 { /// - /// Ghra_Title (Model) - /// - [SugarTable("Ghra_Title", "Ghra_Title"), Entity(TableCnName = "Ghra_Title", TableName = "Ghra_Title")] - public class Ghra_Title : BasePoco1 - { - - /// - /// TitleID - /// - public int? TitleID { get; set; } - - /// - /// TitleNo - /// - [Display(Name = "TitleNo"), Description("TitleNo"), MaxLength(100, ErrorMessage = "TitleNo 不能超过 100 个字符")] - public string TitleNo { get; set; } - - /// - /// TitleName - /// - [Display(Name = "TitleName"), Description("TitleName"), MaxLength(1000, ErrorMessage = "TitleName 不能超过 1000 个字符")] - public string TitleName { get; set; } - - /// - /// MKey - /// - [Display(Name = "MKey"), Description("MKey"), MaxLength(200, ErrorMessage = "MKey 不能超过 200 个字符")] - public string MKey { get; set; } - - /// - /// DataBelongID - /// - public int? DataBelongID { get; set; } - - /// - /// DeptID - /// - public int? DeptID { get; set; } - - /// - /// TitleTypeID - /// - public int? TitleTypeID { get; set; } - - /// - /// TitleLevelID - /// - public int? TitleLevelID { get; set; } - - /// - /// TitleQualifiy - /// - [Display(Name = "TitleQualifiy"), Description("TitleQualifiy"), MaxLength(2000, ErrorMessage = "TitleQualifiy 不能超过 2000 个字符")] - public string TitleQualifiy { get; set; } - - /// - /// TitleDesc - /// - [Display(Name = "TitleDesc"), Description("TitleDesc"), MaxLength(2000, ErrorMessage = "TitleDesc 不能超过 2000 个字符")] - public string TitleDesc { 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; } - - /// - /// ReverseI1 - /// - public int? ReverseI1 { get; set; } - - /// - /// ReverseI2 - /// - public int? ReverseI2 { get; set; } - - /// - /// ReverseI3 - /// - public int? ReverseI3 { get; set; } - - /// - /// ReverseI4 - /// - public int? ReverseI4 { get; set; } - } + /// TitleID + /// + public int? TitleID { get; set; } + + /// + /// TitleNo + /// + [Display(Name = "TitleNo"), Description("TitleNo"), MaxLength(100, ErrorMessage = "TitleNo 不能超过 100 个字符")] + public string TitleNo { get; set; } + + /// + /// TitleName + /// + [Display(Name = "TitleName"), Description("TitleName"), MaxLength(1000, ErrorMessage = "TitleName 不能超过 1000 个字符")] + public string TitleName { get; set; } + + /// + /// MKey + /// + [Display(Name = "MKey"), Description("MKey"), MaxLength(200, ErrorMessage = "MKey 不能超过 200 个字符")] + public string MKey { get; set; } + + /// + /// DataBelongID + /// + public int? DataBelongID { get; set; } + + /// + /// DeptID + /// + public int? DeptID { get; set; } + + /// + /// TitleTypeID + /// + public int? TitleTypeID { get; set; } + + /// + /// TitleLevelID + /// + public int? TitleLevelID { get; set; } + + /// + /// TitleQualifiy + /// + [Display(Name = "TitleQualifiy"), Description("TitleQualifiy"), MaxLength(2000, ErrorMessage = "TitleQualifiy 不能超过 2000 个字符")] + public string TitleQualifiy { get; set; } + + /// + /// TitleDesc + /// + [Display(Name = "TitleDesc"), Description("TitleDesc"), MaxLength(2000, ErrorMessage = "TitleDesc 不能超过 2000 个字符")] + public string TitleDesc { 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; } + + /// + /// ReverseI1 + /// + public int? ReverseI1 { get; set; } + + /// + /// ReverseI2 + /// + public int? ReverseI2 { get; set; } + + /// + /// ReverseI3 + /// + public int? ReverseI3 { get; set; } + + /// + /// ReverseI4 + /// + public int? ReverseI4 { get; set; } } diff --git a/Tiobon.Core.Model/Models/Ghra/Ghra_Zone.cs b/Tiobon.Core.Model/Models/Ghra/Ghra_Zone.cs index 1938da8a..10bcb339 100644 --- a/Tiobon.Core.Model/Models/Ghra/Ghra_Zone.cs +++ b/Tiobon.Core.Model/Models/Ghra/Ghra_Zone.cs @@ -13,117 +13,112 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 厂区 (Model) +/// +[SugarTable("Ghra_Zone", "Ghra_Zone"), Entity(TableCnName = "厂区", TableName = "Ghra_Zone")] +public class Ghra_Zone : BasePoco1 { /// - /// 厂区 (Model) - /// - [SugarTable("Ghra_Zone", "Ghra_Zone"), Entity(TableCnName = "厂区", TableName = "Ghra_Zone")] - public class Ghra_Zone : BasePoco1 - { - - /// - /// 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/Models/Ghre/Ghre_Attachment.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_Attachment.cs index fffc678a..f84052a6 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_Attachment.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_Attachment.cs @@ -13,200 +13,195 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 附件 (Model) +/// +[SugarTable("Ghre_Attachment", "Ghre_Attachment"), Entity(TableCnName = "附件", TableName = "Ghre_Attachment")] +public class Ghre_Attachment : BasePoco { /// - /// 附件 (Model) - /// - [SugarTable("Ghre_Attachment", "Ghre_Attachment"), Entity(TableCnName = "附件", TableName = "Ghre_Attachment")] - public class Ghre_Attachment : BasePoco - { - - /// - /// 附件编号 - /// - [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; } - - /// - /// 附件大小 - /// - public long? 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; } - - /// - /// 缩略图路径 - /// - [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; } + + /// + /// 附件大小 + /// + public long? 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; } + + /// + /// 缩略图路径 + /// + [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/Models/Ghre/Ghre_Certificate.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_Certificate.cs index 30b35004..e457fd96 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_Certificate.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_Certificate.cs @@ -13,149 +13,144 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训记录 (Model) +/// +[SugarTable("Ghre_Certificate", "Ghre_Certificate"), Entity(TableCnName = "培训记录", TableName = "Ghre_Certificate")] +public class Ghre_Certificate : BasePoco { /// - /// 培训记录 (Model) - /// - [SugarTable("Ghre_Certificate", "Ghre_Certificate"), Entity(TableCnName = "培训记录", TableName = "Ghre_Certificate")] - public class Ghre_Certificate : BasePoco - { - - /// - /// 员工ID - /// - public int? StaffId { get; set; } - - /// - /// 课程快照ID - /// - public long? CourseSnapId { get; set; } - - /// - /// 课程ID - /// - public long? CourseId { get; set; } - - /// - /// 证书类型 - /// - [Display(Name = "CertificateType"), Description("证书类型"), MaxLength(32, ErrorMessage = "证书类型 不能超过 32 个字符")] - public string CertificateType { get; set; } - - /// - /// 证书Url - /// - [Display(Name = "CertificateUrl"), Description("证书Url"), MaxLength(128, ErrorMessage = "证书Url 不能超过 128 个字符")] - public string CertificateUrl { get; set; } - - /// - /// 颁发日期 - /// - public DateTime? AwardDate { get; set; } - - /// - /// 有效期 - /// - [Display(Name = "ValidityPeriod"), Description("有效期"), MaxLength(32, ErrorMessage = "有效期 不能超过 32 个字符")] - public string ValidityPeriod { get; set; } - - /// - /// 结束时间 - /// - public DateTime? ValidityPeriodTime { get; set; } - - /// - /// 颁发来源 - /// - [Display(Name = "AwardSource"), Description("颁发来源"), MaxLength(32, ErrorMessage = "颁发来源 不能超过 32 个字符")] - public string AwardSource { 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? CourseSnapId { get; set; } + + /// + /// 课程ID + /// + public long? CourseId { get; set; } + + /// + /// 证书类型 + /// + [Display(Name = "CertificateType"), Description("证书类型"), MaxLength(32, ErrorMessage = "证书类型 不能超过 32 个字符")] + public string CertificateType { get; set; } + + /// + /// 证书Url + /// + [Display(Name = "CertificateUrl"), Description("证书Url"), MaxLength(128, ErrorMessage = "证书Url 不能超过 128 个字符")] + public string CertificateUrl { get; set; } + + /// + /// 颁发日期 + /// + public DateTime? AwardDate { get; set; } + + /// + /// 有效期 + /// + [Display(Name = "ValidityPeriod"), Description("有效期"), MaxLength(32, ErrorMessage = "有效期 不能超过 32 个字符")] + public string ValidityPeriod { get; set; } + + /// + /// 结束时间 + /// + public DateTime? ValidityPeriodTime { get; set; } + + /// + /// 颁发来源 + /// + [Display(Name = "AwardSource"), Description("颁发来源"), MaxLength(32, ErrorMessage = "颁发来源 不能超过 32 个字符")] + public string AwardSource { 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/Ghre/Ghre_CertificateRule.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_CertificateRule.cs index 40b9c4c6..c861d53c 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_CertificateRule.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_CertificateRule.cs @@ -14,165 +14,160 @@ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ */ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训证书规则 (Model) +/// +[SugarTable("Ghre_CertificateRule", "Ghre_CertificateRule"), Entity(TableCnName = "培训证书规则", TableName = "Ghre_CertificateRule")] +public class Ghre_CertificateRule : BasePoco { /// - /// 培训证书规则 (Model) - /// - [SugarTable("Ghre_CertificateRule", "Ghre_CertificateRule"), Entity(TableCnName = "培训证书规则", TableName = "Ghre_CertificateRule")] - public class Ghre_CertificateRule : BasePoco - { - - /// - /// 规则类型 - /// - [Display(Name = "RuleType"), Description("规则类型"), MaxLength(32, ErrorMessage = "规则类型 不能超过 32 个字符")] - public string RuleType { get; set; } - - /// - /// 规则编号 - /// - [Display(Name = "RuleNo"), Description("规则编号"), MaxLength(32, ErrorMessage = "规则编号 不能超过 32 个字符"), EntityColumn] - 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 个字符"), EntityColumn] + 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/Models/Ghre/Ghre_Config.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_Config.cs index 136c891a..9b3764b6 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_Config.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_Config.cs @@ -13,140 +13,135 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 参数配置 (Model) +/// +[SugarTable("Ghre_Config", "Ghre_Config"), Entity(TableCnName = "参数配置", TableName = "Ghre_Config")] +public class Ghre_Config : BasePoco { /// - /// 参数配置 (Model) - /// - [SugarTable("Ghre_Config", "Ghre_Config"), Entity(TableCnName = "参数配置", TableName = "Ghre_Config")] - public class Ghre_Config : BasePoco - { - - /// - /// 参数名称 - /// - [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/Models/Ghre/Ghre_Course.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_Course.cs index 3127e78a..04c3d2c5 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_Course.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_Course.cs @@ -14,252 +14,246 @@ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ */ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using SqlSugar; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 课程 (Model) +/// +[SugarTable("Ghre_Course", "Ghre_Course"), Entity(TableCnName = "课程", TableName = "Ghre_Course")] +public class Ghre_Course : BasePoco { /// - /// 课程 (Model) - /// - [SugarTable("Ghre_Course", "Ghre_Course"), Entity(TableCnName = "课程", TableName = "Ghre_Course")] - public class Ghre_Course : BasePoco - { - - /// - /// 课程编号 - /// - [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; } - - /// - /// 课程场景ID - /// - public long? CourseSceneId { get; set; } - - /// - /// 课件ID - /// - public long? 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 long? TeacherId { get; set; } - - /// - /// 讲师部门ID - /// - public long? 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 virtual string 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; } - - /// - /// 课程大纲 - /// - [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; } - - /// - /// 发布时间 - /// - public DateTime? PublishTime { 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 = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] - public string Status { 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 = "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; } + + /// + /// 课程场景ID + /// + public long? CourseSceneId { get; set; } + + /// + /// 课件ID + /// + public long? 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 long? TeacherId { get; set; } + + /// + /// 讲师部门ID + /// + public long? 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 virtual string 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; } + + /// + /// 课程大纲 + /// + [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; } + + /// + /// 发布时间 + /// + public DateTime? PublishTime { 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 = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] + public string Status { 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/Models/Ghre/Ghre_CourseClass.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_CourseClass.cs index 82eeaf2d..8623422b 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_CourseClass.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_CourseClass.cs @@ -13,117 +13,112 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 课程分类 (Model) +/// +[SugarTable("Ghre_CourseClass", "Ghre_CourseClass"), Entity(TableCnName = "课程分类", TableName = "Ghre_CourseClass")] +public class Ghre_CourseClass : BasePoco { /// - /// 课程分类 (Model) - /// - [SugarTable("Ghre_CourseClass", "Ghre_CourseClass"), Entity(TableCnName = "课程分类", TableName = "Ghre_CourseClass")] - public class Ghre_CourseClass : BasePoco - { - - /// - /// 分类编号 - /// - [Display(Name = "ClassNo"), Description("分类编号"), MaxLength(32, ErrorMessage = "分类编号 不能超过 32 个字符")] - public string ClassNo { get; set; } - - /// - /// 分类名称 - /// - [Display(Name = "ClassName"), Description("分类名称"), MaxLength(32, ErrorMessage = "分类名称 不能超过 32 个字符")] - 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 个字符")] + public string ClassNo { get; set; } + + /// + /// 分类名称 + /// + [Display(Name = "ClassName"), Description("分类名称"), MaxLength(32, ErrorMessage = "分类名称 不能超过 32 个字符")] + 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/Models/Ghre/Ghre_CourseScene.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_CourseScene.cs index e7c418ce..83b1a541 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_CourseScene.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_CourseScene.cs @@ -13,156 +13,151 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 课程场景 (Model) +/// +[SugarTable("Ghre_CourseScene", "Ghre_CourseScene"), Entity(TableCnName = "课程场景", TableName = "Ghre_CourseScene")] +public class Ghre_CourseScene : BasePoco { /// - /// 课程场景 (Model) - /// - [SugarTable("Ghre_CourseScene", "Ghre_CourseScene"), Entity(TableCnName = "课程场景", TableName = "Ghre_CourseScene")] - public class Ghre_CourseScene : BasePoco - { - - /// - /// 场景编号 - /// - [Display(Name = "SceneNo"), Description("场景编号"), MaxLength(32, ErrorMessage = "场景编号 不能超过 32 个字符"), EntityColumn(Unique = true)] - public string SceneNo { get; set; } - - /// - /// 场景名称 - /// - [Display(Name = "SceneName"), Description("场景名称"), MaxLength(32, ErrorMessage = "场景名称 不能超过 32 个字符"), EntityColumn(Unique = true)] - public string SceneName { get; set; } - - /// - /// 课程ID - /// - [Display(Name = "CourseId"), Description("课程ID"), MaxLength(2000, ErrorMessage = "课程ID 不能超过 2000 个字符")] - public string CourseId { get; set; } - - /// - /// 课程 - /// - [Display(Name = "CourseName"), Description("课程ID"), MaxLength(2000, ErrorMessage = "课程ID 不能超过 2000 个字符")] - public string CourseName { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// 排序 - /// - public int? SortNo { get; set; } - - /// - /// 标准课时 - /// - public int? StandardHour { get; set; } - - /// - /// 学分 - /// - public int? CreditPoints { 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; } - - /// - /// 默认标志 - /// - 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 = "SceneNo"), Description("场景编号"), MaxLength(32, ErrorMessage = "场景编号 不能超过 32 个字符"), EntityColumn(Unique = true)] + public string SceneNo { get; set; } + + /// + /// 场景名称 + /// + [Display(Name = "SceneName"), Description("场景名称"), MaxLength(32, ErrorMessage = "场景名称 不能超过 32 个字符"), EntityColumn(Unique = true)] + public string SceneName { get; set; } + + /// + /// 课程ID + /// + [Display(Name = "CourseId"), Description("课程ID"), MaxLength(2000, ErrorMessage = "课程ID 不能超过 2000 个字符")] + public string CourseId { get; set; } + + /// + /// 课程 + /// + [Display(Name = "CourseName"), Description("课程ID"), MaxLength(2000, ErrorMessage = "课程ID 不能超过 2000 个字符")] + public string CourseName { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// 排序 + /// + public int? SortNo { get; set; } + + /// + /// 标准课时 + /// + public int? StandardHour { get; set; } + + /// + /// 学分 + /// + public int? CreditPoints { 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; } + + /// + /// 默认标志 + /// + 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/Ghre/Ghre_CourseSnap.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_CourseSnap.cs index fbcb371c..e221685d 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_CourseSnap.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_CourseSnap.cs @@ -13,272 +13,266 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghre_CourseSnap (Model) +/// +[SugarTable("Ghre_CourseSnap", "Ghre_CourseSnap"), Entity(TableCnName = "Ghre_CourseSnap", TableName = "Ghre_CourseSnap")] +public class Ghre_CourseSnap : BasePoco { /// - /// Ghre_CourseSnap (Model) - /// - [SugarTable("Ghre_CourseSnap", "Ghre_CourseSnap"), Entity(TableCnName = "Ghre_CourseSnap", TableName = "Ghre_CourseSnap")] - public class Ghre_CourseSnap : BasePoco - { - - /// - /// 课程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/Models/Ghre/Ghre_CourseWare.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_CourseWare.cs index 73d728eb..8ad93bd5 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_CourseWare.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_CourseWare.cs @@ -14,156 +14,151 @@ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ */ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 课件 (Model) +/// +[SugarTable("Ghre_CourseWare", "Ghre_CourseWare"), Entity(TableCnName = "课件", TableName = "Ghre_CourseWare")] +public class Ghre_CourseWare : BasePoco { /// - /// 课件 (Model) - /// - [SugarTable("Ghre_CourseWare", "Ghre_CourseWare"), Entity(TableCnName = "课件", TableName = "Ghre_CourseWare")] - public class Ghre_CourseWare : BasePoco - { - - /// - /// 课件编号 - /// - [Display(Name = "CourseWareNo"), Description("课件编号"), MaxLength(32, ErrorMessage = "课件编号 不能超过 32 个字符"), EntityColumn(Unique = true)] - 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 个字符"), EntityColumn(Unique = true)] + 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/Models/Ghre/Ghre_CourseWareAttachment.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_CourseWareAttachment.cs index fdd88fed..0560aa57 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_CourseWareAttachment.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_CourseWareAttachment.cs @@ -13,11 +13,7 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; - +*/ namespace Tiobon.Core.Model.Models { diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_CreditPoint.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_CreditPoint.cs index 45f80e52..79504126 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_CreditPoint.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_CreditPoint.cs @@ -13,130 +13,125 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 学分记录 (Model) +/// +[SugarTable("Ghre_CreditPoint", "Ghre_CreditPoint"), Entity(TableCnName = "学分记录", TableName = "Ghre_CreditPoint")] +public class Ghre_CreditPoint : BasePoco { /// - /// 学分记录 (Model) - /// - [SugarTable("Ghre_CreditPoint", "Ghre_CreditPoint"), Entity(TableCnName = "学分记录", TableName = "Ghre_CreditPoint")] - public class Ghre_CreditPoint : BasePoco - { - - /// - /// 员工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/Models/Ghre/Ghre_Exam.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_Exam.cs index 9ebdf558..8710cf51 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_Exam.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_Exam.cs @@ -14,198 +14,193 @@ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ */ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 考试 (Model) +/// +[SugarTable("Ghre_Exam", "Ghre_Exam"), Entity(TableCnName = "考试", TableName = "Ghre_Exam")] +public class Ghre_Exam : BasePoco { /// - /// 考试 (Model) - /// - [SugarTable("Ghre_Exam", "Ghre_Exam"), Entity(TableCnName = "考试", TableName = "Ghre_Exam")] - public class Ghre_Exam : BasePoco - { - - /// - /// 关联类型 - /// - [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/Models/Ghre/Ghre_ExamMessageLog.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamMessageLog.cs index 489da18f..5fda1eba 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_ExamMessageLog.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamMessageLog.cs @@ -13,129 +13,124 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 考试通知记录 (Model) +/// +[SugarTable("Ghre_ExamMessageLog", "Ghre_ExamMessageLog"), Entity(TableCnName = "考试通知记录", TableName = "Ghre_ExamMessageLog")] +public class Ghre_ExamMessageLog : BasePoco { /// - /// 考试通知记录 (Model) - /// - [SugarTable("Ghre_ExamMessageLog", "Ghre_ExamMessageLog"), Entity(TableCnName = "考试通知记录", TableName = "Ghre_ExamMessageLog")] - public class Ghre_ExamMessageLog : BasePoco - { - - /// - /// 试卷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/Models/Ghre/Ghre_ExamPaper.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamPaper.cs index cddd4abf..f01b34b3 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_ExamPaper.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamPaper.cs @@ -14,186 +14,180 @@ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ */ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using SqlSugar; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 试卷 (Model) +/// +[SugarTable("Ghre_ExamPaper", "Ghre_ExamPaper"), Entity(TableCnName = "试卷", TableName = "Ghre_ExamPaper")] +public class Ghre_ExamPaper : BasePoco { /// - /// 试卷 (Model) - /// - [SugarTable("Ghre_ExamPaper", "Ghre_ExamPaper"), Entity(TableCnName = "试卷", TableName = "Ghre_ExamPaper")] - public class Ghre_ExamPaper : BasePoco - { - - /// - /// 试卷编号 - /// - [Display(Name = "PaperNo"), Description("试卷编号"), MaxLength(32, ErrorMessage = "试卷编号 不能超过 32 个字符"), EntityColumn(Unique = true)] - 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 个字符"), EntityColumn(Unique = true)] + 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/Models/Ghre/Ghre_ExamPaperConfig.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamPaperConfig.cs index 90bdfc43..da84ceab 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_ExamPaperConfig.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamPaperConfig.cs @@ -13,144 +13,138 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 试卷配置 (Model) +/// +[SugarTable("Ghre_ExamPaperConfig", "Ghre_ExamPaperConfig"), Entity(TableCnName = "试卷配置", TableName = "Ghre_ExamPaperConfig")] +public class Ghre_ExamPaperConfig : BasePoco { /// - /// 试卷配置 (Model) - /// - [SugarTable("Ghre_ExamPaperConfig", "Ghre_ExamPaperConfig"), Entity(TableCnName = "试卷配置", TableName = "Ghre_ExamPaperConfig")] - public class Ghre_ExamPaperConfig : BasePoco - { - - /// - /// 试卷ID - /// - public long? ExamPaperId { get; set; } - - /// - /// 课程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 - /// - 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 + /// + public long? ExamPaperId { get; set; } + + /// + /// 课程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 + /// + 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/Models/Ghre/Ghre_ExamPaperQuestion.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamPaperQuestion.cs index 8e353958..b4d95bf4 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_ExamPaperQuestion.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamPaperQuestion.cs @@ -13,128 +13,122 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 试卷题目 (Model) +/// +[SugarTable("Ghre_ExamPaperQuestion", "Ghre_ExamPaperQuestion"), Entity(TableCnName = "试卷题目", TableName = "Ghre_ExamPaperQuestion")] +public class Ghre_ExamPaperQuestion : BasePoco { /// - /// 试卷题目 (Model) - /// - [SugarTable("Ghre_ExamPaperQuestion", "Ghre_ExamPaperQuestion"), Entity(TableCnName = "试卷题目", TableName = "Ghre_ExamPaperQuestion")] - public class Ghre_ExamPaperQuestion : BasePoco - { - - /// - /// 试卷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/Models/Ghre/Ghre_ExamRecord.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecord.cs index b09b3716..fe759db4 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecord.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecord.cs @@ -13,207 +13,201 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 考试记录 (Model) +/// +[SugarTable("Ghre_ExamRecord", "Ghre_ExamRecord"), Entity(TableCnName = "考试记录", TableName = "Ghre_ExamRecord")] +public class Ghre_ExamRecord : BasePoco { /// - /// 考试记录 (Model) - /// - [SugarTable("Ghre_ExamRecord", "Ghre_ExamRecord"), Entity(TableCnName = "考试记录", TableName = "Ghre_ExamRecord")] - public class Ghre_ExamRecord : BasePoco - { - - /// - /// 试卷ID - /// - public long? ExamId { get; set; } - - /// - /// 培训记录ID - /// - public long? StudyRecordId { get; set; } - - /// - /// 员工ID - /// - public int? StaffId { get; set; } - - /// - /// 课程快照ID - /// - public long? CourseSnapId { get; set; } - - /// - /// 试卷ID - /// - public long? ExamPaperId { 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 DateTime? ExamDate { get; set; } - - /// - /// 开始时间 - /// - public DateTime? BeginTime { get; set; } - - /// - /// 结束时间 - /// - public DateTime? EndTime { get; set; } - - /// - /// 实际开始时间 - /// - public DateTime? ActualBeginTime { get; set; } - - /// - /// 实际结束时间 - /// - public DateTime? ActualEndTime { get; set; } - - /// - /// 重考次数 - /// - public int? RetakeTimes { get; set; } - - /// - /// 状态 - /// - [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] - public string Status { get; set; } - - /// - /// 评分状态 - /// - [Display(Name = "ScoreStatus"), Description("评分状态"), MaxLength(32, ErrorMessage = "评分状态 不能超过 32 个字符")] - public string ScoreStatus { get; set; } - - /// - /// 评语 - /// - [Display(Name = "Comment"), Description("评语"), MaxLength(2000, ErrorMessage = "评语 不能超过 2000 个字符")] - public string Comment { get; set; } - - /// - /// 是否合格 - /// - public bool? IsPass { get; set; } - - /// - /// 来源 - /// - [Display(Name = "Source"), Description("来源"), MaxLength(32, ErrorMessage = "来源 不能超过 32 个字符")] - public string Source { get; set; } - - /// - /// 是否查看试卷 - /// - public bool? IsView { get; set; } - - /// - /// 查看试卷时间 - /// - public DateTime? ViewTime { 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 long? StudyRecordId { get; set; } + + /// + /// 员工ID + /// + public int? StaffId { get; set; } + + /// + /// 课程快照ID + /// + public long? CourseSnapId { get; set; } + + /// + /// 试卷ID + /// + public long? ExamPaperId { 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 DateTime? ExamDate { get; set; } + + /// + /// 开始时间 + /// + public DateTime? BeginTime { get; set; } + + /// + /// 结束时间 + /// + public DateTime? EndTime { get; set; } + + /// + /// 实际开始时间 + /// + public DateTime? ActualBeginTime { get; set; } + + /// + /// 实际结束时间 + /// + public DateTime? ActualEndTime { get; set; } + + /// + /// 重考次数 + /// + public int? RetakeTimes { get; set; } + + /// + /// 状态 + /// + [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] + public string Status { get; set; } + + /// + /// 评分状态 + /// + [Display(Name = "ScoreStatus"), Description("评分状态"), MaxLength(32, ErrorMessage = "评分状态 不能超过 32 个字符")] + public string ScoreStatus { get; set; } + + /// + /// 评语 + /// + [Display(Name = "Comment"), Description("评语"), MaxLength(2000, ErrorMessage = "评语 不能超过 2000 个字符")] + public string Comment { get; set; } + + /// + /// 是否合格 + /// + public bool? IsPass { get; set; } + + /// + /// 来源 + /// + [Display(Name = "Source"), Description("来源"), MaxLength(32, ErrorMessage = "来源 不能超过 32 个字符")] + public string Source { get; set; } + + /// + /// 是否查看试卷 + /// + public bool? IsView { get; set; } + + /// + /// 查看试卷时间 + /// + public DateTime? ViewTime { 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/Ghre/Ghre_ExamRecordAnswer.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecordAnswer.cs index fd39aa79..4a87dd1b 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecordAnswer.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecordAnswer.cs @@ -13,126 +13,121 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghre_ExamRecordAnswer (Model) +/// +[SugarTable("Ghre_ExamRecordAnswer", "Ghre_ExamRecordAnswer"), Entity(TableCnName = "Ghre_ExamRecordAnswer", TableName = "Ghre_ExamRecordAnswer")] +public class Ghre_ExamRecordAnswer : BasePoco { /// - /// Ghre_ExamRecordAnswer (Model) - /// - [SugarTable("Ghre_ExamRecordAnswer", "Ghre_ExamRecordAnswer"), Entity(TableCnName = "Ghre_ExamRecordAnswer", TableName = "Ghre_ExamRecordAnswer")] - public class Ghre_ExamRecordAnswer : BasePoco - { - - /// - /// 答题记录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/Models/Ghre/Ghre_ExamRecordDetail.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecordDetail.cs index 85b17ea4..fe37081a 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecordDetail.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecordDetail.cs @@ -13,12 +13,7 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using SqlSugar; - +*/ namespace Tiobon.Core.Model.Models { diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_ExamStaff.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamStaff.cs index ee205acd..bdab8cd8 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_ExamStaff.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamStaff.cs @@ -13,121 +13,116 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghre_ExamStaff (Model) +/// +[SugarTable("Ghre_ExamStaff", "Ghre_ExamStaff"), Entity(TableCnName = "Ghre_ExamStaff", TableName = "Ghre_ExamStaff")] +public class Ghre_ExamStaff : BasePoco { /// - /// Ghre_ExamStaff (Model) - /// - [SugarTable("Ghre_ExamStaff", "Ghre_ExamStaff"), Entity(TableCnName = "Ghre_ExamStaff", TableName = "Ghre_ExamStaff")] - public class Ghre_ExamStaff : BasePoco - { - - /// - /// 试卷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/Models/Ghre/Ghre_Question.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_Question.cs index f34ca7de..0a6d6733 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_Question.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_Question.cs @@ -13,136 +13,131 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 题目 (Model) +/// +[SugarTable("Ghre_Question", "Ghre_Question"), Entity(TableCnName = "题目", TableName = "Ghre_Question")] +public class Ghre_Question : BasePoco { /// - /// 题目 (Model) - /// - [SugarTable("Ghre_Question", "Ghre_Question"), Entity(TableCnName = "题目", TableName = "Ghre_Question")] - public class Ghre_Question : BasePoco - { - - /// - /// 课程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/Models/Ghre/Ghre_QuestionAnswer.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_QuestionAnswer.cs index f544f7b9..5baebc50 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_QuestionAnswer.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_QuestionAnswer.cs @@ -13,143 +13,138 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 题目答案 (Model) +/// +[SugarTable("Ghre_QuestionAnswer", "Ghre_QuestionAnswer"), Entity(TableCnName = "题目答案", TableName = "Ghre_QuestionAnswer")] +public class Ghre_QuestionAnswer : BasePoco { /// - /// 题目答案 (Model) - /// - [SugarTable("Ghre_QuestionAnswer", "Ghre_QuestionAnswer"), Entity(TableCnName = "题目答案", TableName = "Ghre_QuestionAnswer")] - public class Ghre_QuestionAnswer : BasePoco - { - - /// - /// 题目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/Models/Ghre/Ghre_Request.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_Request.cs index 129a73c4..297ed40f 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_Request.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_Request.cs @@ -13,291 +13,285 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训需求 (Model) +/// +[SugarTable("Ghre_Request", "Ghre_Request"), Entity(TableCnName = "培训需求", TableName = "Ghre_Request")] +public class Ghre_Request : BasePoco { /// - /// 培训需求 (Model) - /// - [SugarTable("Ghre_Request", "Ghre_Request"), Entity(TableCnName = "培训需求", TableName = "Ghre_Request")] - public class Ghre_Request : BasePoco - { - - /// - /// 课程来源 - /// - [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/Models/Ghre/Ghre_RequiredCourse.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_RequiredCourse.cs index 6bf3c170..82bcf3e9 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_RequiredCourse.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_RequiredCourse.cs @@ -13,148 +13,143 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 必选修查询 (Model) +/// +[SugarTable("Ghre_RequiredCourse", "Ghre_RequiredCourse"), Entity(TableCnName = "Ghre_RequiredCourse", TableName = "Ghre_RequiredCourse")] +public class Ghre_RequiredCourse : BasePoco { /// - /// 必选修查询 (Model) - /// - [SugarTable("Ghre_RequiredCourse", "Ghre_RequiredCourse"), Entity(TableCnName = "Ghre_RequiredCourse", TableName = "Ghre_RequiredCourse")] - public class Ghre_RequiredCourse : BasePoco - { - - /// - /// 员工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/Models/Ghre/Ghre_School.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_School.cs index 314babcc..019c32dc 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_School.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_School.cs @@ -14,151 +14,146 @@ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ */ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训机构 (Model) +/// +[SugarTable("Ghre_School", "Ghre_School"), Entity(TableCnName = "培训机构", TableName = "Ghre_School")] +public class Ghre_School : BasePoco { /// - /// 培训机构 (Model) - /// - [SugarTable("Ghre_School", "Ghre_School"), Entity(TableCnName = "培训机构", TableName = "Ghre_School")] - public class Ghre_School : BasePoco - { - - /// - /// 机构编号 - /// - [Display(Name = "SchoolNo"), Description("机构编号"), MaxLength(32, ErrorMessage = "机构编号 不能超过 32 个字符"), EntityColumn(Unique = true)] - 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 个字符"), EntityColumn(Unique = true)] + 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/Models/Ghre/Ghre_SchoolAttachment.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_SchoolAttachment.cs index 939e8254..21d09214 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_SchoolAttachment.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_SchoolAttachment.cs @@ -13,127 +13,122 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训机构附件 (Model) +/// +[SugarTable("Ghre_SchoolAttachment", "Ghre_SchoolAttachment"), Entity(TableCnName = "培训机构附件", TableName = "Ghre_SchoolAttachment")] +public class Ghre_SchoolAttachment : BasePoco { /// - /// 培训机构附件 (Model) - /// - [SugarTable("Ghre_SchoolAttachment", "Ghre_SchoolAttachment"), Entity(TableCnName = "培训机构附件", TableName = "Ghre_SchoolAttachment")] - public class Ghre_SchoolAttachment : BasePoco - { - - /// - /// 机构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/Models/Ghre/Ghre_StudyRecord.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRecord.cs index cf3323b6..4efb46b9 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRecord.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRecord.cs @@ -13,199 +13,194 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训记录 (Model) +/// +[SugarTable("Ghre_StudyRecord", "Ghre_StudyRecord"), Entity(TableCnName = "培训记录", TableName = "Ghre_StudyRecord")] +public class Ghre_StudyRecord : BasePoco { /// - /// 培训记录 (Model) - /// - [SugarTable("Ghre_StudyRecord", "Ghre_StudyRecord"), Entity(TableCnName = "培训记录", TableName = "Ghre_StudyRecord")] - public class Ghre_StudyRecord : BasePoco - { - - /// - /// 员工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/Models/Ghre/Ghre_StudyRule.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRule.cs index 9f201593..5b04a69f 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRule.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRule.cs @@ -14,185 +14,180 @@ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ */ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 必选修规则 (Model) +/// +[SugarTable("Ghre_StudyRule", "Ghre_StudyRule"), Entity(TableCnName = "必选修规则", TableName = "Ghre_StudyRule")] +public class Ghre_StudyRule : BasePoco { /// - /// 必选修规则 (Model) - /// - [SugarTable("Ghre_StudyRule", "Ghre_StudyRule"), Entity(TableCnName = "必选修规则", TableName = "Ghre_StudyRule")] - public class Ghre_StudyRule : BasePoco - { - - /// - /// 规则类型 - /// - [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 个字符"), EntityColumn(Unique = true)] - 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 个字符"), EntityColumn(Unique = true)] + 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/Models/Ghre/Ghre_StudyRuleResult.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRuleResult.cs index 13163a19..e8172ffd 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRuleResult.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRuleResult.cs @@ -13,128 +13,123 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 必选修规则结果 (Model) +/// +[SugarTable("Ghre_StudyRuleResult", "Ghre_StudyRuleResult"), Entity(TableCnName = "必选修规则结果", TableName = "Ghre_StudyRuleResult")] +public class Ghre_StudyRuleResult : BasePoco { /// - /// 必选修规则结果 (Model) - /// - [SugarTable("Ghre_StudyRuleResult", "Ghre_StudyRuleResult"), Entity(TableCnName = "必选修规则结果", TableName = "Ghre_StudyRuleResult")] - public class Ghre_StudyRuleResult : BasePoco - { - - /// - /// 必选修规则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/Models/Ghre/Ghre_StudyRuleStaff.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRuleStaff.cs index 293d4a12..2dc45e6e 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRuleStaff.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRuleStaff.cs @@ -13,116 +13,111 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 必选修规则人员 (Model) +/// +[SugarTable("Ghre_StudyRuleStaff", "Ghre_StudyRuleStaff"), Entity(TableCnName = "必选修规则人员", TableName = "Ghre_StudyRuleStaff")] +public class Ghre_StudyRuleStaff : BasePoco { /// - /// 必选修规则人员 (Model) - /// - [SugarTable("Ghre_StudyRuleStaff", "Ghre_StudyRuleStaff"), Entity(TableCnName = "必选修规则人员", TableName = "Ghre_StudyRuleStaff")] - public class Ghre_StudyRuleStaff : BasePoco - { - - /// - /// 必选修规则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/Models/Ghre/Ghre_Teacher.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_Teacher.cs index a7aa9905..c348988e 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_Teacher.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_Teacher.cs @@ -13,274 +13,268 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训讲师 (Model) +/// +[SugarTable("Ghre_Teacher", "Ghre_Teacher"), Entity(TableCnName = "培训讲师", TableName = "Ghre_Teacher")] +public class Ghre_Teacher : BasePoco { /// - /// 培训讲师 (Model) - /// - [SugarTable("Ghre_Teacher", "Ghre_Teacher"), Entity(TableCnName = "培训讲师", TableName = "Ghre_Teacher")] - public class Ghre_Teacher : BasePoco - { - - /// - /// 机构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/Models/Ghre/Ghre_TeacherAttachment.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_TeacherAttachment.cs index d320b2a8..359a3185 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_TeacherAttachment.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_TeacherAttachment.cs @@ -13,133 +13,128 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghre_TeacherAttachment (Model) +/// +[SugarTable("Ghre_TeacherAttachment", "Ghre_TeacherAttachment"), Entity(TableCnName = "Ghre_TeacherAttachment", TableName = "Ghre_TeacherAttachment")] +public class Ghre_TeacherAttachment : BasePoco { /// - /// Ghre_TeacherAttachment (Model) - /// - [SugarTable("Ghre_TeacherAttachment", "Ghre_TeacherAttachment"), Entity(TableCnName = "Ghre_TeacherAttachment", TableName = "Ghre_TeacherAttachment")] - public class Ghre_TeacherAttachment : BasePoco - { - - /// - /// 机构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 = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// 来源 - /// - [Display(Name = "Source"), Description("来源"), MaxLength(2000, ErrorMessage = "来源 不能超过 32 个字符")] - public string Source { 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 = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// 来源 + /// + [Display(Name = "Source"), Description("来源"), MaxLength(2000, ErrorMessage = "来源 不能超过 32 个字符")] + public string Source { 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/Ghre/Ghre_TeacherChange.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_TeacherChange.cs index 3371a561..b8eca581 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_TeacherChange.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_TeacherChange.cs @@ -14,318 +14,312 @@ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ */ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using SqlSugar; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训讲师异动 (Model) +/// +[SugarTable("Ghre_TeacherChange", "Ghre_TeacherChange"), Entity(TableCnName = "培训讲师异动", TableName = "Ghre_TeacherChange")] +public class Ghre_TeacherChange : BasePoco { /// - /// 培训讲师异动 (Model) - /// - [SugarTable("Ghre_TeacherChange", "Ghre_TeacherChange"), Entity(TableCnName = "培训讲师异动", TableName = "Ghre_TeacherChange")] - public class Ghre_TeacherChange : BasePoco - { - - /// - /// 机构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; } - - /// - /// 状态 - /// - [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] - public string Status { get; set; } - - /// - /// 发起人 - /// - public long? SponsorId { 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; } + + /// + /// 状态 + /// + [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] + public string Status { get; set; } + + /// + /// 发起人 + /// + public long? SponsorId { 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/Models/Ghre/Ghre_TeacherChangeAttachment.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_TeacherChangeAttachment.cs index 4c02223a..e362cee1 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_TeacherChangeAttachment.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_TeacherChangeAttachment.cs @@ -13,127 +13,122 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 培训讲师异动附件 (Model) +/// +[SugarTable("Ghre_TeacherChangeAttachment", "Ghre_TeacherChangeAttachment"), Entity(TableCnName = "培训讲师异动附件", TableName = "Ghre_TeacherChangeAttachment")] +public class Ghre_TeacherChangeAttachment : BasePoco { /// - /// 培训讲师异动附件 (Model) - /// - [SugarTable("Ghre_TeacherChangeAttachment", "Ghre_TeacherChangeAttachment"), Entity(TableCnName = "培训讲师异动附件", TableName = "Ghre_TeacherChangeAttachment")] - public class Ghre_TeacherChangeAttachment : BasePoco - { - - /// - /// 讲师异动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/Models/Ghre/TasksLog.cs b/Tiobon.Core.Model/Models/Ghre/TasksLog.cs index 64c47c6d..4ef5ea73 100644 --- a/Tiobon.Core.Model/Models/Ghre/TasksLog.cs +++ b/Tiobon.Core.Model/Models/Ghre/TasksLog.cs @@ -1,57 +1,53 @@ -using SqlSugar; -using System; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models +/// +/// 任务日志表 +/// +public class Ghre_TasksLog : BasePoco { /// - /// 任务日志表 - /// - public class Ghre_TasksLog : BasePoco - { - /// - /// 任务ID - /// - public long JobId { get; set; } - /// - /// 任务耗时 - /// - public double TotalTime { get; set; } - /// - /// 执行结果(0-失败 1-成功) - /// - public bool RunResult { get; set; } - /// - /// 运行时间 - /// - public DateTime RunTime { get; set; } - /// - /// 结束时间 - /// - public DateTime EndTime { get; set; } - /// - /// 执行参数 - /// - [SugarColumn(Length = 500, IsNullable = true)] - public string RunPars { get; set; } - /// - /// 异常信息 - /// - [SugarColumn(Length = 500, IsNullable = true)] - public string ErrMessage { get; set; } - /// - /// 异常堆栈 - /// - [SugarColumn(Length = 2000, IsNullable = true)] - public string ErrStackTrace { get; set; } - /// - /// 任务名称 - /// - [SugarColumn(IsIgnore = true)] - public string Name { get; set; } - /// - /// 任务分组 - /// - [SugarColumn(IsIgnore = true)] - public string JobGroup { get; set; } - } + /// 任务ID + /// + public long JobId { get; set; } + /// + /// 任务耗时 + /// + public double TotalTime { get; set; } + /// + /// 执行结果(0-失败 1-成功) + /// + public bool RunResult { get; set; } + /// + /// 运行时间 + /// + public DateTime RunTime { get; set; } + /// + /// 结束时间 + /// + public DateTime EndTime { get; set; } + /// + /// 执行参数 + /// + [SugarColumn(Length = 500, IsNullable = true)] + public string RunPars { get; set; } + /// + /// 异常信息 + /// + [SugarColumn(Length = 500, IsNullable = true)] + public string ErrMessage { get; set; } + /// + /// 异常堆栈 + /// + [SugarColumn(Length = 2000, IsNullable = true)] + public string ErrStackTrace { get; set; } + /// + /// 任务名称 + /// + [SugarColumn(IsIgnore = true)] + public string Name { get; set; } + /// + /// 任务分组 + /// + [SugarColumn(IsIgnore = true)] + public string JobGroup { get; set; } } diff --git a/Tiobon.Core.Model/Models/Ghre/TasksQz.cs b/Tiobon.Core.Model/Models/Ghre/TasksQz.cs index 5deb6512..d006b0fa 100644 --- a/Tiobon.Core.Model/Models/Ghre/TasksQz.cs +++ b/Tiobon.Core.Model/Models/Ghre/TasksQz.cs @@ -1,5 +1,4 @@ -using SqlSugar; -using Tiobon.Core.Model.ViewModels; +using Tiobon.Core.Model.ViewModels; namespace Tiobon.Core.Model.Models; diff --git a/Tiobon.Core.Model/Models/Ghrh/Ghrh_HumanRequest.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_HumanRequest.cs index ce006e06..d16824f1 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_HumanRequest.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_HumanRequest.cs @@ -13,11 +13,7 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; - +*/ namespace Tiobon.Core.Model.Models { diff --git a/Tiobon.Core.Model/Models/Ghrh/Ghrh_Resume.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_Resume.cs index fb89600a..91a96660 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_Resume.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_Resume.cs @@ -13,421 +13,415 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 个人简历 (Model) +/// +[SugarTable("Ghrh_Resume", "Ghrh_Resume"), Entity(TableCnName = "个人简历", TableName = "Ghrh_Resume")] +public class Ghrh_Resume : BasePoco { /// - /// 个人简历 (Model) - /// - [SugarTable("Ghrh_Resume", "Ghrh_Resume"), Entity(TableCnName = "个人简历", TableName = "Ghrh_Resume")] - public class Ghrh_Resume : BasePoco - { - - /// - /// 姓名 - /// - [Display(Name = "StaffName"), Description("姓名"), MaxLength(32, ErrorMessage = "姓名 不能超过 32 个字符")] - public string StaffName { get; set; } - - /// - /// 英文名 - /// - [Display(Name = "StaffEname"), Description("英文名"), MaxLength(32, ErrorMessage = "英文名 不能超过 32 个字符")] - public string StaffEname { get; set; } - - /// - /// 头像 - /// - [Display(Name = "PhotoUrl"), Description("头像"), MaxLength(1000, ErrorMessage = "头像 不能超过 1000 个字符")] - public string PhotoUrl { get; set; } - - /// - /// 民族 - /// - [Display(Name = "Nation"), Description("民族"), MaxLength(32, ErrorMessage = "民族 不能超过 32 个字符")] - public string Nation { get; set; } - - /// - /// 出生日期 - /// - public DateTime? Birthday { get; set; } - - /// - /// 籍贯 - /// - [Display(Name = "NativePlace"), Description("籍贯"), MaxLength(32, ErrorMessage = "籍贯 不能超过 32 个字符")] - public string NativePlace { get; set; } - - /// - /// 性别 - /// - [Display(Name = "Gender"), Description("性别"), MaxLength(32, ErrorMessage = "性别 不能超过 32 个字符")] - public string Gender { get; set; } - - /// - /// 年龄 - /// - [Display(Name = "Age"), Description("年龄"), Column(TypeName = "decimal(3,1)")] - public decimal? Age { get; set; } - - /// - /// 学历 - /// - [Display(Name = "Education"), Description("学历"), MaxLength(1000, ErrorMessage = "学历 不能超过 1000 个字符")] - public string Education { get; set; } - - /// - /// 毕业院校 - /// - [Display(Name = "School"), Description("毕业院校"), MaxLength(128, ErrorMessage = "毕业院校 不能超过 128 个字符")] - public string School { get; set; } - - /// - /// 毕业日期 - /// - public DateTime? GraduateDate { get; set; } - - /// - /// 求职状态 - /// - [Display(Name = "ApplyStatus"), Description("求职状态"), MaxLength(32, ErrorMessage = "求职状态 不能超过 32 个字符")] - public string ApplyStatus { get; set; } - - /// - /// 岗位ID - /// - [Display(Name = "TitleId"), Description("岗位ID") ] - public int? TitleId { get; set; } - - /// - /// 婚姻状况 - /// - [Display(Name = "MaritalStatus"), Description("婚姻状况"), MaxLength(32, ErrorMessage = "婚姻状况 不能超过 32 个字符")] - public string MaritalStatus { get; set; } - - /// - /// 政治面貌 - /// - [Display(Name = "PoliticStatus"), Description("政治面貌"), MaxLength(32, ErrorMessage = "政治面貌 不能超过 32 个字符")] - public string PoliticStatus { 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; } - - /// - /// 入职日期 - /// - public DateTime? Indate { get; set; } - - /// - /// 紧急联系人关系 - /// - [Display(Name = "UrgentRelation"), Description("紧急联系人关系"), MaxLength(32, ErrorMessage = "紧急联系人关系 不能超过 32 个字符")] - public string UrgentRelation { get; set; } - - /// - /// 紧急联系人 - /// - [Display(Name = "UrgentContact"), Description("紧急联系人"), MaxLength(32, ErrorMessage = "紧急联系人 不能超过 32 个字符")] - public string UrgentContact { get; set; } - - /// - /// 紧急联系人电话 - /// - [Display(Name = "UrgentContactTel"), Description("紧急联系人电话"), MaxLength(32, ErrorMessage = "紧急联系人电话 不能超过 32 个字符")] - public string UrgentContactTel { get; set; } - - /// - /// 紧急联系人地址 - /// - [Display(Name = "UrgentContactAddress"), Description("紧急联系人地址"), MaxLength(128, ErrorMessage = "紧急联系人地址 不能超过 128 个字符")] - public string UrgentContactAddress { get; set; } - - /// - /// 紧急联系人关系2 - /// - [Display(Name = "Urgent2Relation"), Description("紧急联系人关系2"), MaxLength(32, ErrorMessage = "紧急联系人关系2 不能超过 32 个字符")] - public string Urgent2Relation { get; set; } - - /// - /// 紧急联系人2 - /// - [Display(Name = "Urgent2Contact"), Description("紧急联系人2"), MaxLength(32, ErrorMessage = "紧急联系人2 不能超过 32 个字符")] - public string Urgent2Contact { get; set; } - - /// - /// 紧急联系人电话2 - /// - [Display(Name = "Urgent2ContactTel"), Description("紧急联系人电话2"), MaxLength(32, ErrorMessage = "紧急联系人电话2 不能超过 32 个字符")] - public string Urgent2ContactTel { get; set; } - - /// - /// 紧急联系人地址2 - /// - [Display(Name = "Urgent2ContactAddress"), Description("紧急联系人地址2"), MaxLength(128, ErrorMessage = "紧急联系人地址2 不能超过 128 个字符")] - public string Urgent2ContactAddress { get; set; } - - /// - /// 职前年资 - /// - [Display(Name = "PreJobSeniority"), Description("职前年资"), MaxLength(32, ErrorMessage = "职前年资 不能超过 32 个字符")] - public string PreJobSeniority { get; set; } - - /// - /// 最高学历 - /// - [Display(Name = "EduDegree"), Description("最高学历"), MaxLength(32, ErrorMessage = "最高学历 不能超过 32 个字符")] - public string EduDegree { get; set; } - - /// - /// 证照类型 - /// - [Display(Name = "CertificateType"), Description("证照类型"), MaxLength(32, ErrorMessage = "证照类型 不能超过 32 个字符")] - public string CertificateType { get; set; } - - /// - /// 身份证号 - /// - [Display(Name = "IdCardNo"), Description("身份证号"), MaxLength(64, ErrorMessage = "身份证号 不能超过 64 个字符")] - public string IdCardNo { get; set; } - - /// - /// 身份证开始有效期 - /// - public DateTime? IDCardBegin { get; set; } - - /// - /// 身份证结束有效期 - /// - public DateTime? IDCardEnd { get; set; } - - /// - /// 户口性质 - /// - [Display(Name = "RegisteredType"), Description("户口性质"), MaxLength(32, ErrorMessage = "户口性质 不能超过 32 个字符")] - public string RegisteredType { get; set; } - - /// - /// 发证机关 - /// - [Display(Name = "IDCardOrg"), Description("发证机关"), MaxLength(256, ErrorMessage = "发证机关 不能超过 256 个字符")] - public string IDCardOrg { get; set; } - - /// - /// 家庭住址 - /// - [Display(Name = "RegisteredAddress"), Description("家庭住址"), MaxLength(256, ErrorMessage = "家庭住址 不能超过 256 个字符")] - public string RegisteredAddress { get; set; } - - /// - /// 现居住地 - /// - [Display(Name = "NowAddress"), Description("现居住地"), MaxLength(256, ErrorMessage = "现居住地 不能超过 256 个字符")] - public string NowAddress { get; set; } - - /// - /// 介绍人 - /// - [Display(Name = "Introducer"), Description("介绍人"), MaxLength(32, ErrorMessage = "介绍人 不能超过 32 个字符")] - public string Introducer { get; set; } - - /// - /// 国籍 - /// - [Display(Name = "NationNo"), Description("国籍"), MaxLength(32, ErrorMessage = "国籍 不能超过 32 个字符")] - public string NationNo { get; set; } - - /// - /// 公积金账号 - /// - [Display(Name = "FundAccountID"), Description("公积金账号"), MaxLength(128, ErrorMessage = "公积金账号 不能超过 128 个字符")] - public string FundAccountID { get; set; } - - /// - /// 公积金基数 - /// - [Display(Name = "FundBase"), Description("公积金基数"), Column(TypeName = "decimal(20,2)")] - public decimal? FundBase { get; set; } - - /// - /// 社保帐套 - /// - [Display(Name = "InInsureAccountNo"), Description("社保帐套"), MaxLength(32, ErrorMessage = "社保帐套 不能超过 32 个字符")] - public string InInsureAccountNo { get; set; } - - /// - /// 社保账号 - /// - [Display(Name = "InsureAccountID"), Description("社保账号"), MaxLength(128, ErrorMessage = "社保账号 不能超过 128 个字符")] - public string InsureAccountID { get; set; } - - /// - /// 社保基数 - /// - [Display(Name = "InsureBase"), Description("社保基数"), Column(TypeName = "decimal(20,2)")] - public decimal? InsureBase { get; set; } - - /// - /// 是否缴纳社保 - /// - public bool? IsInsure { get; set; } - - /// - /// 是否缴纳公积金 - /// - public bool? IsFund { get; set; } - - /// - /// 是否推荐 - /// - public bool? IsRecommend { get; set; } - - /// - /// 是否住宿 - /// - public bool? IsStay { get; set; } - - /// - /// 车牌号 - /// - [Display(Name = "CarNo"), Description("车牌号"), MaxLength(32, ErrorMessage = "车牌号 不能超过 32 个字符")] - public string CarNo { get; set; } - - /// - /// 标签 - /// - [Display(Name = "Tags"), Description("标签"), MaxLength(2000, ErrorMessage = "标签 不能超过 2000 个字符")] - public string Tags { get; set; } - - /// - /// 状态 - /// - [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] - public string Status { get; set; } - - /// - /// 工作年限 - /// - [Display(Name = "WorkYears"), Description("工作年限"), Column(TypeName = "decimal(3,1)")] - public decimal? WorkYears { get; set; } - - /// - /// 申请状态 - /// - [Display(Name = "ApplicationStatus"), Description("申请状态"), MaxLength(2000, ErrorMessage = "申请状态 不能超过 32 个字符")] - public string ApplicationStatus { get; set; } - - /// - /// 申请时间 - /// - public DateTime? ApplicationTime { get; set; } - - /// - /// 职称类型/级别 - /// - [Display(Name = "TitleType"), Description("职称类型/级别"), MaxLength(2000, ErrorMessage = "职称类型/级别 不能超过 32 个字符")] - public string TitleType { get; set; } - - /// - /// 直间接 - /// - [Display(Name = "StaffType1"), Description("直间接"), MaxLength(2000, ErrorMessage = "直间接 不能超过 32 个字符")] - public string StaffType1 { 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 = "StaffName"), Description("姓名"), MaxLength(32, ErrorMessage = "姓名 不能超过 32 个字符")] + public string StaffName { get; set; } + + /// + /// 英文名 + /// + [Display(Name = "StaffEname"), Description("英文名"), MaxLength(32, ErrorMessage = "英文名 不能超过 32 个字符")] + public string StaffEname { get; set; } + + /// + /// 头像 + /// + [Display(Name = "PhotoUrl"), Description("头像"), MaxLength(1000, ErrorMessage = "头像 不能超过 1000 个字符")] + public string PhotoUrl { get; set; } + + /// + /// 民族 + /// + [Display(Name = "Nation"), Description("民族"), MaxLength(32, ErrorMessage = "民族 不能超过 32 个字符")] + public string Nation { get; set; } + + /// + /// 出生日期 + /// + public DateTime? Birthday { get; set; } + + /// + /// 籍贯 + /// + [Display(Name = "NativePlace"), Description("籍贯"), MaxLength(32, ErrorMessage = "籍贯 不能超过 32 个字符")] + public string NativePlace { get; set; } + + /// + /// 性别 + /// + [Display(Name = "Gender"), Description("性别"), MaxLength(32, ErrorMessage = "性别 不能超过 32 个字符")] + public string Gender { get; set; } + + /// + /// 年龄 + /// + [Display(Name = "Age"), Description("年龄"), Column(TypeName = "decimal(3,1)")] + public decimal? Age { get; set; } + + /// + /// 学历 + /// + [Display(Name = "Education"), Description("学历"), MaxLength(1000, ErrorMessage = "学历 不能超过 1000 个字符")] + public string Education { get; set; } + + /// + /// 毕业院校 + /// + [Display(Name = "School"), Description("毕业院校"), MaxLength(128, ErrorMessage = "毕业院校 不能超过 128 个字符")] + public string School { get; set; } + + /// + /// 毕业日期 + /// + public DateTime? GraduateDate { get; set; } + + /// + /// 求职状态 + /// + [Display(Name = "ApplyStatus"), Description("求职状态"), MaxLength(32, ErrorMessage = "求职状态 不能超过 32 个字符")] + public string ApplyStatus { get; set; } + + /// + /// 岗位ID + /// + [Display(Name = "TitleId"), Description("岗位ID") ] + public int? TitleId { get; set; } + + /// + /// 婚姻状况 + /// + [Display(Name = "MaritalStatus"), Description("婚姻状况"), MaxLength(32, ErrorMessage = "婚姻状况 不能超过 32 个字符")] + public string MaritalStatus { get; set; } + + /// + /// 政治面貌 + /// + [Display(Name = "PoliticStatus"), Description("政治面貌"), MaxLength(32, ErrorMessage = "政治面貌 不能超过 32 个字符")] + public string PoliticStatus { 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; } + + /// + /// 入职日期 + /// + public DateTime? Indate { get; set; } + + /// + /// 紧急联系人关系 + /// + [Display(Name = "UrgentRelation"), Description("紧急联系人关系"), MaxLength(32, ErrorMessage = "紧急联系人关系 不能超过 32 个字符")] + public string UrgentRelation { get; set; } + + /// + /// 紧急联系人 + /// + [Display(Name = "UrgentContact"), Description("紧急联系人"), MaxLength(32, ErrorMessage = "紧急联系人 不能超过 32 个字符")] + public string UrgentContact { get; set; } + + /// + /// 紧急联系人电话 + /// + [Display(Name = "UrgentContactTel"), Description("紧急联系人电话"), MaxLength(32, ErrorMessage = "紧急联系人电话 不能超过 32 个字符")] + public string UrgentContactTel { get; set; } + + /// + /// 紧急联系人地址 + /// + [Display(Name = "UrgentContactAddress"), Description("紧急联系人地址"), MaxLength(128, ErrorMessage = "紧急联系人地址 不能超过 128 个字符")] + public string UrgentContactAddress { get; set; } + + /// + /// 紧急联系人关系2 + /// + [Display(Name = "Urgent2Relation"), Description("紧急联系人关系2"), MaxLength(32, ErrorMessage = "紧急联系人关系2 不能超过 32 个字符")] + public string Urgent2Relation { get; set; } + + /// + /// 紧急联系人2 + /// + [Display(Name = "Urgent2Contact"), Description("紧急联系人2"), MaxLength(32, ErrorMessage = "紧急联系人2 不能超过 32 个字符")] + public string Urgent2Contact { get; set; } + + /// + /// 紧急联系人电话2 + /// + [Display(Name = "Urgent2ContactTel"), Description("紧急联系人电话2"), MaxLength(32, ErrorMessage = "紧急联系人电话2 不能超过 32 个字符")] + public string Urgent2ContactTel { get; set; } + + /// + /// 紧急联系人地址2 + /// + [Display(Name = "Urgent2ContactAddress"), Description("紧急联系人地址2"), MaxLength(128, ErrorMessage = "紧急联系人地址2 不能超过 128 个字符")] + public string Urgent2ContactAddress { get; set; } + + /// + /// 职前年资 + /// + [Display(Name = "PreJobSeniority"), Description("职前年资"), MaxLength(32, ErrorMessage = "职前年资 不能超过 32 个字符")] + public string PreJobSeniority { get; set; } + + /// + /// 最高学历 + /// + [Display(Name = "EduDegree"), Description("最高学历"), MaxLength(32, ErrorMessage = "最高学历 不能超过 32 个字符")] + public string EduDegree { get; set; } + + /// + /// 证照类型 + /// + [Display(Name = "CertificateType"), Description("证照类型"), MaxLength(32, ErrorMessage = "证照类型 不能超过 32 个字符")] + public string CertificateType { get; set; } + + /// + /// 身份证号 + /// + [Display(Name = "IdCardNo"), Description("身份证号"), MaxLength(64, ErrorMessage = "身份证号 不能超过 64 个字符")] + public string IdCardNo { get; set; } + + /// + /// 身份证开始有效期 + /// + public DateTime? IDCardBegin { get; set; } + + /// + /// 身份证结束有效期 + /// + public DateTime? IDCardEnd { get; set; } + + /// + /// 户口性质 + /// + [Display(Name = "RegisteredType"), Description("户口性质"), MaxLength(32, ErrorMessage = "户口性质 不能超过 32 个字符")] + public string RegisteredType { get; set; } + + /// + /// 发证机关 + /// + [Display(Name = "IDCardOrg"), Description("发证机关"), MaxLength(256, ErrorMessage = "发证机关 不能超过 256 个字符")] + public string IDCardOrg { get; set; } + + /// + /// 家庭住址 + /// + [Display(Name = "RegisteredAddress"), Description("家庭住址"), MaxLength(256, ErrorMessage = "家庭住址 不能超过 256 个字符")] + public string RegisteredAddress { get; set; } + + /// + /// 现居住地 + /// + [Display(Name = "NowAddress"), Description("现居住地"), MaxLength(256, ErrorMessage = "现居住地 不能超过 256 个字符")] + public string NowAddress { get; set; } + + /// + /// 介绍人 + /// + [Display(Name = "Introducer"), Description("介绍人"), MaxLength(32, ErrorMessage = "介绍人 不能超过 32 个字符")] + public string Introducer { get; set; } + + /// + /// 国籍 + /// + [Display(Name = "NationNo"), Description("国籍"), MaxLength(32, ErrorMessage = "国籍 不能超过 32 个字符")] + public string NationNo { get; set; } + + /// + /// 公积金账号 + /// + [Display(Name = "FundAccountID"), Description("公积金账号"), MaxLength(128, ErrorMessage = "公积金账号 不能超过 128 个字符")] + public string FundAccountID { get; set; } + + /// + /// 公积金基数 + /// + [Display(Name = "FundBase"), Description("公积金基数"), Column(TypeName = "decimal(20,2)")] + public decimal? FundBase { get; set; } + + /// + /// 社保帐套 + /// + [Display(Name = "InInsureAccountNo"), Description("社保帐套"), MaxLength(32, ErrorMessage = "社保帐套 不能超过 32 个字符")] + public string InInsureAccountNo { get; set; } + + /// + /// 社保账号 + /// + [Display(Name = "InsureAccountID"), Description("社保账号"), MaxLength(128, ErrorMessage = "社保账号 不能超过 128 个字符")] + public string InsureAccountID { get; set; } + + /// + /// 社保基数 + /// + [Display(Name = "InsureBase"), Description("社保基数"), Column(TypeName = "decimal(20,2)")] + public decimal? InsureBase { get; set; } + + /// + /// 是否缴纳社保 + /// + public bool? IsInsure { get; set; } + + /// + /// 是否缴纳公积金 + /// + public bool? IsFund { get; set; } + + /// + /// 是否推荐 + /// + public bool? IsRecommend { get; set; } + + /// + /// 是否住宿 + /// + public bool? IsStay { get; set; } + + /// + /// 车牌号 + /// + [Display(Name = "CarNo"), Description("车牌号"), MaxLength(32, ErrorMessage = "车牌号 不能超过 32 个字符")] + public string CarNo { get; set; } + + /// + /// 标签 + /// + [Display(Name = "Tags"), Description("标签"), MaxLength(2000, ErrorMessage = "标签 不能超过 2000 个字符")] + public string Tags { get; set; } + + /// + /// 状态 + /// + [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] + public string Status { get; set; } + + /// + /// 工作年限 + /// + [Display(Name = "WorkYears"), Description("工作年限"), Column(TypeName = "decimal(3,1)")] + public decimal? WorkYears { get; set; } + + /// + /// 申请状态 + /// + [Display(Name = "ApplicationStatus"), Description("申请状态"), MaxLength(2000, ErrorMessage = "申请状态 不能超过 32 个字符")] + public string ApplicationStatus { get; set; } + + /// + /// 申请时间 + /// + public DateTime? ApplicationTime { get; set; } + + /// + /// 职称类型/级别 + /// + [Display(Name = "TitleType"), Description("职称类型/级别"), MaxLength(2000, ErrorMessage = "职称类型/级别 不能超过 32 个字符")] + public string TitleType { get; set; } + + /// + /// 直间接 + /// + [Display(Name = "StaffType1"), Description("直间接"), MaxLength(2000, ErrorMessage = "直间接 不能超过 32 个字符")] + public string StaffType1 { 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/Ghrh/Ghrh_ResumeEduBG.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeEduBG.cs index 5e3f7d36..9c523405 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeEduBG.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeEduBG.cs @@ -13,138 +13,133 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 教育背景 (Model) +/// +[SugarTable("Ghrh_ResumeEduBG", "Ghrh_ResumeEduBG"), Entity(TableCnName = "教育背景", TableName = "Ghrh_ResumeEduBG")] +public class Ghrh_ResumeEduBG : BasePoco { /// - /// 教育背景 (Model) - /// - [SugarTable("Ghrh_ResumeEduBG", "Ghrh_ResumeEduBG"), Entity(TableCnName = "教育背景", TableName = "Ghrh_ResumeEduBG")] - public class Ghrh_ResumeEduBG : BasePoco - { - - /// - /// 简历ID - /// - public long? ResumeId { get; set; } - - /// - /// 学校名称 - /// - [Display(Name = "SchoolName"), Description("学校名称"), MaxLength(100, ErrorMessage = "学校名称 不能超过 100 个字符")] - public string SchoolName { get; set; } - - /// - /// 专业名称 - /// - [Display(Name = "DeptName"), Description("专业名称"), MaxLength(100, ErrorMessage = "专业名称 不能超过 100 个字符")] - public string DeptName { get; set; } - - /// - /// 开始日期 - /// - public DateTime? BeginDate { get; set; } - - /// - /// 结束日期 - /// - public DateTime? EndDate { get; set; } - - /// - /// 学历 - /// - [Display(Name = "DegreeLevel"), Description("学历"), MaxLength(32, ErrorMessage = "学历 不能超过 32 个字符")] - public string DegreeLevel { get; set; } - - /// - /// 是否毕业 - /// - public int? IsGraduate { 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 = "SchoolName"), Description("学校名称"), MaxLength(100, ErrorMessage = "学校名称 不能超过 100 个字符")] + public string SchoolName { get; set; } + + /// + /// 专业名称 + /// + [Display(Name = "DeptName"), Description("专业名称"), MaxLength(100, ErrorMessage = "专业名称 不能超过 100 个字符")] + public string DeptName { get; set; } + + /// + /// 开始日期 + /// + public DateTime? BeginDate { get; set; } + + /// + /// 结束日期 + /// + public DateTime? EndDate { get; set; } + + /// + /// 学历 + /// + [Display(Name = "DegreeLevel"), Description("学历"), MaxLength(32, ErrorMessage = "学历 不能超过 32 个字符")] + public string DegreeLevel { get; set; } + + /// + /// 是否毕业 + /// + public int? IsGraduate { 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/Ghrh/Ghrh_ResumeHome.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeHome.cs index b12a969c..7c3fe124 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeHome.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeHome.cs @@ -14,157 +14,152 @@ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ */ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 家庭关系 (Model) +/// +[SugarTable("Ghrh_ResumeHome", "Ghrh_ResumeHome"), Entity(TableCnName = "家庭关系", TableName = "Ghrh_ResumeHome")] +public class Ghrh_ResumeHome : BasePoco { /// - /// 家庭关系 (Model) - /// - [SugarTable("Ghrh_ResumeHome", "Ghrh_ResumeHome"), Entity(TableCnName = "家庭关系", TableName = "Ghrh_ResumeHome")] - public class Ghrh_ResumeHome : BasePoco - { - - /// - /// 简历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/Models/Ghrh/Ghrh_ResumeInfoColumn.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeInfoColumn.cs index 4b444507..0afa8e52 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeInfoColumn.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeInfoColumn.cs @@ -13,254 +13,249 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 简历信息栏位 (Model) +/// +[SugarTable("Ghrh_ResumeInfoColumn", "Ghrh_ResumeInfoColumn"), Entity(TableCnName = "简历信息栏位", TableName = "Ghrh_ResumeInfoColumn")] +public class Ghrh_ResumeInfoColumn : BasePoco { /// - /// 简历信息栏位 (Model) - /// - [SugarTable("Ghrh_ResumeInfoColumn", "Ghrh_ResumeInfoColumn"), Entity(TableCnName = "简历信息栏位", TableName = "Ghrh_ResumeInfoColumn")] - public class Ghrh_ResumeInfoColumn : BasePoco - { - - /// - /// 简历组别ID - /// - public long? ResumeInfoGroupId { get; set; } - - /// - /// 栏位 - /// - [Display(Name = "ResumeInfoColumnNo"), Description("栏位"), MaxLength(100, ErrorMessage = "栏位 不能超过 100 个字符")] - public string ResumeInfoColumnNo { get; set; } - - /// - /// 栏位说明 - /// - [Display(Name = "ResumeInfoColumnName"), Description("栏位说明"), MaxLength(1000, ErrorMessage = "栏位说明 不能超过 1000 个字符")] - public string ResumeInfoColumnName { get; set; } - - /// - /// 多语Key - /// - [Display(Name = "MKey"), Description("多语Key"), MaxLength(200, ErrorMessage = "多语Key 不能超过 200 个字符")] - public string MKey { get; set; } - - /// - /// 表名 - /// - [Display(Name = "TableName"), Description("表名"), MaxLength(100, ErrorMessage = "表名 不能超过 100 个字符")] - public string TableName { get; set; } - - /// - /// 表栏位 - /// - [Display(Name = "ColumnName"), Description("表栏位"), MaxLength(100, ErrorMessage = "表栏位 不能超过 100 个字符")] - public string ColumnName { get; set; } - - /// - /// 一行一栏 - /// - public int? IsSingleColumn { get; set; } - - /// - /// 栏位类型 - /// - [Display(Name = "ColumnType"), Description("栏位类型"), MaxLength(100, ErrorMessage = "栏位类型 不能超过 100 个字符")] - public string ColumnType { get; set; } - - /// - /// 数据类型 - /// - [Display(Name = "DataType"), Description("数据类型"), MaxLength(100, ErrorMessage = "数据类型 不能超过 100 个字符")] - public string DataType { get; set; } - - /// - /// 数据来源方式 - /// - [Display(Name = "DataSourceType"), Description("数据来源方式"), MaxLength(2000, ErrorMessage = "数据来源方式 不能超过 2000 个字符")] - public string DataSourceType { get; set; } - - /// - /// 数据来源 - /// - [Display(Name = "DataSource"), Description("数据来源"), MaxLength(2000, ErrorMessage = "数据来源 不能超过 2000 个字符")] - public string DataSource { get; set; } - - /// - /// 初始值 - /// - [Display(Name = "DefaultValue"), Description("初始值"), MaxLength(2000, ErrorMessage = "初始值 不能超过 2000 个字符")] - public string DefaultValue { get; set; } - - /// - /// 必填项 - /// - public bool? IsRequired { get; set; } - - /// - /// 可编辑 - /// - public int? Editable { get; set; } - - /// - /// IsBuildIn - /// - public int? IsBuildIn { get; set; } - - /// - /// IsRelease - /// - public int? IsRelease { get; set; } - - /// - /// 异动栏位 - /// - public int? IsChangeColumn { get; set; } - - /// - /// Column_43 - /// - public int? IsQuickJoinColumn { get; set; } - - /// - /// 初始化值 - /// - [Display(Name = "InitValue"), Description("初始化值"), MaxLength(2000, ErrorMessage = "初始化值 不能超过 2000 个字符")] - public string InitValue { get; set; } - - /// - /// 占位文字 - /// - [Display(Name = "Placeholder"), Description("占位文字"), MaxLength(2000, ErrorMessage = "占位文字 不能超过 2000 个字符")] - public string Placeholder { get; set; } - - /// - /// 是否主键栏位 - /// - public int? IsPrimaryKey { get; set; } - - /// - /// 员工可修改 - /// - public int? CanModifyBySelf { get; set; } - - /// - /// ESS 显示 - /// - public int? CanEssDisplay { get; set; } - - /// - /// 可多选 - /// - public int? MultipleSelect { get; set; } - - /// - /// 数据来源ID - /// - public int? DataSourceID { get; set; } - - /// - /// 关联表名 - /// - [Display(Name = "MapTableName"), Description("关联表名"), MaxLength(100, ErrorMessage = "关联表名 不能超过 100 个字符")] - public string MapTableName { get; set; } - - /// - /// 关联栏位 - /// - [Display(Name = "MapColumnName"), Description("关联栏位"), MaxLength(100, ErrorMessage = "关联栏位 不能超过 100 个字符")] - public string MapColumnName { 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; } - } + /// 简历组别ID + /// + public long? ResumeInfoGroupId { get; set; } + + /// + /// 栏位 + /// + [Display(Name = "ResumeInfoColumnNo"), Description("栏位"), MaxLength(100, ErrorMessage = "栏位 不能超过 100 个字符")] + public string ResumeInfoColumnNo { get; set; } + + /// + /// 栏位说明 + /// + [Display(Name = "ResumeInfoColumnName"), Description("栏位说明"), MaxLength(1000, ErrorMessage = "栏位说明 不能超过 1000 个字符")] + public string ResumeInfoColumnName { get; set; } + + /// + /// 多语Key + /// + [Display(Name = "MKey"), Description("多语Key"), MaxLength(200, ErrorMessage = "多语Key 不能超过 200 个字符")] + public string MKey { get; set; } + + /// + /// 表名 + /// + [Display(Name = "TableName"), Description("表名"), MaxLength(100, ErrorMessage = "表名 不能超过 100 个字符")] + public string TableName { get; set; } + + /// + /// 表栏位 + /// + [Display(Name = "ColumnName"), Description("表栏位"), MaxLength(100, ErrorMessage = "表栏位 不能超过 100 个字符")] + public string ColumnName { get; set; } + + /// + /// 一行一栏 + /// + public int? IsSingleColumn { get; set; } + + /// + /// 栏位类型 + /// + [Display(Name = "ColumnType"), Description("栏位类型"), MaxLength(100, ErrorMessage = "栏位类型 不能超过 100 个字符")] + public string ColumnType { get; set; } + + /// + /// 数据类型 + /// + [Display(Name = "DataType"), Description("数据类型"), MaxLength(100, ErrorMessage = "数据类型 不能超过 100 个字符")] + public string DataType { get; set; } + + /// + /// 数据来源方式 + /// + [Display(Name = "DataSourceType"), Description("数据来源方式"), MaxLength(2000, ErrorMessage = "数据来源方式 不能超过 2000 个字符")] + public string DataSourceType { get; set; } + + /// + /// 数据来源 + /// + [Display(Name = "DataSource"), Description("数据来源"), MaxLength(2000, ErrorMessage = "数据来源 不能超过 2000 个字符")] + public string DataSource { get; set; } + + /// + /// 初始值 + /// + [Display(Name = "DefaultValue"), Description("初始值"), MaxLength(2000, ErrorMessage = "初始值 不能超过 2000 个字符")] + public string DefaultValue { get; set; } + + /// + /// 必填项 + /// + public bool? IsRequired { get; set; } + + /// + /// 可编辑 + /// + public int? Editable { get; set; } + + /// + /// IsBuildIn + /// + public int? IsBuildIn { get; set; } + + /// + /// IsRelease + /// + public int? IsRelease { get; set; } + + /// + /// 异动栏位 + /// + public int? IsChangeColumn { get; set; } + + /// + /// Column_43 + /// + public int? IsQuickJoinColumn { get; set; } + + /// + /// 初始化值 + /// + [Display(Name = "InitValue"), Description("初始化值"), MaxLength(2000, ErrorMessage = "初始化值 不能超过 2000 个字符")] + public string InitValue { get; set; } + + /// + /// 占位文字 + /// + [Display(Name = "Placeholder"), Description("占位文字"), MaxLength(2000, ErrorMessage = "占位文字 不能超过 2000 个字符")] + public string Placeholder { get; set; } + + /// + /// 是否主键栏位 + /// + public int? IsPrimaryKey { get; set; } + + /// + /// 员工可修改 + /// + public int? CanModifyBySelf { get; set; } + + /// + /// ESS 显示 + /// + public int? CanEssDisplay { get; set; } + + /// + /// 可多选 + /// + public int? MultipleSelect { get; set; } + + /// + /// 数据来源ID + /// + public int? DataSourceID { get; set; } + + /// + /// 关联表名 + /// + [Display(Name = "MapTableName"), Description("关联表名"), MaxLength(100, ErrorMessage = "关联表名 不能超过 100 个字符")] + public string MapTableName { get; set; } + + /// + /// 关联栏位 + /// + [Display(Name = "MapColumnName"), Description("关联栏位"), MaxLength(100, ErrorMessage = "关联栏位 不能超过 100 个字符")] + public string MapColumnName { 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/Models/Ghrh/Ghrh_ResumeInfoGroup.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeInfoGroup.cs index 9cfc4840..08ee4c28 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeInfoGroup.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeInfoGroup.cs @@ -13,157 +13,152 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 简历组别 (Model) +/// +[SugarTable("Ghrh_ResumeInfoGroup", "Ghrh_ResumeInfoGroup"), Entity(TableCnName = "简历组别", TableName = "Ghrh_ResumeInfoGroup")] +public class Ghrh_ResumeInfoGroup : BasePoco { /// - /// 简历组别 (Model) - /// - [SugarTable("Ghrh_ResumeInfoGroup", "Ghrh_ResumeInfoGroup"), Entity(TableCnName = "简历组别", TableName = "Ghrh_ResumeInfoGroup")] - public class Ghrh_ResumeInfoGroup : BasePoco - { - - /// - /// 组别编号 - /// - [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/Models/Ghrh/Ghrh_ResumeLicence.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeLicence.cs index 8c7db82c..3ff3f3d3 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeLicence.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeLicence.cs @@ -13,127 +13,122 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 证件 (Model) +/// +[SugarTable("Ghrh_ResumeLicence", "Ghrh_ResumeLicence"), Entity(TableCnName = "证件", TableName = "Ghrh_ResumeLicence")] +public class Ghrh_ResumeLicence : BasePoco { /// - /// 证件 (Model) - /// - [SugarTable("Ghrh_ResumeLicence", "Ghrh_ResumeLicence"), Entity(TableCnName = "证件", TableName = "Ghrh_ResumeLicence")] - public class Ghrh_ResumeLicence : BasePoco - { - - /// - /// 简历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/Models/Ghrh/Ghrh_ResumeStatement.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeStatement.cs index e4279263..a4f352cd 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeStatement.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeStatement.cs @@ -13,121 +13,116 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 简历声明 (Model) +/// +[SugarTable("Ghrh_ResumeStatement", "Ghrh_ResumeStatement"), Entity(TableCnName = "简历声明", TableName = "Ghrh_ResumeStatement")] +public class Ghrh_ResumeStatement : BasePoco { /// - /// 简历声明 (Model) - /// - [SugarTable("Ghrh_ResumeStatement", "Ghrh_ResumeStatement"), Entity(TableCnName = "简历声明", TableName = "Ghrh_ResumeStatement")] - public class Ghrh_ResumeStatement : BasePoco - { - - /// - /// 简历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/Models/Ghrh/Ghrh_ResumeTag.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeTag.cs index b10a4e0e..cebde4cd 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeTag.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeTag.cs @@ -13,112 +13,107 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 简历标签 (Model) +/// +[SugarTable("Ghrh_ResumeTag", "Ghrh_ResumeTag"), Entity(TableCnName = "简历标签", TableName = "Ghrh_ResumeTag")] +public class Ghrh_ResumeTag : BasePoco { /// - /// 简历标签 (Model) - /// - [SugarTable("Ghrh_ResumeTag", "Ghrh_ResumeTag"), Entity(TableCnName = "简历标签", TableName = "Ghrh_ResumeTag")] - public class Ghrh_ResumeTag : BasePoco - { - - /// - /// 标签分类 - /// - [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/Models/Ghrh/Ghrh_ResumeTemplate.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeTemplate.cs index 7aa46744..8936bc55 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeTemplate.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeTemplate.cs @@ -13,139 +13,134 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 简历模板 (Model) +/// +[SugarTable("Ghrh_ResumeTemplate", "Ghrh_ResumeTemplate"), Entity(TableCnName = "简历模板", TableName = "Ghrh_ResumeTemplate")] +public class Ghrh_ResumeTemplate : BasePoco { /// - /// 简历模板 (Model) - /// - [SugarTable("Ghrh_ResumeTemplate", "Ghrh_ResumeTemplate"), Entity(TableCnName = "简历模板", TableName = "Ghrh_ResumeTemplate")] - public class Ghrh_ResumeTemplate : BasePoco - { - - /// - /// 模板编号 - /// - [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/Models/Ghrh/Ghrh_ResumeTraining.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeTraining.cs index 77f97e49..a444ba6c 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeTraining.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeTraining.cs @@ -13,139 +13,133 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 简历培训记录 (Model) +/// +[SugarTable("Ghrh_ResumeTraining", "Ghrh_ResumeTraining"), Entity(TableCnName = "简历培训记录", TableName = "Ghrh_ResumeTraining")] +public class Ghrh_ResumeTraining : BasePoco { /// - /// 简历培训记录 (Model) - /// - [SugarTable("Ghrh_ResumeTraining", "Ghrh_ResumeTraining"), Entity(TableCnName = "简历培训记录", TableName = "Ghrh_ResumeTraining")] - public class Ghrh_ResumeTraining : BasePoco - { - - /// - /// 简历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/Models/Ghrh/Ghrh_ResumeWorkExp.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeWorkExp.cs index 2c711aaf..b8efb44f 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeWorkExp.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeWorkExp.cs @@ -13,146 +13,140 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 工作经历 (Model) +/// +[SugarTable("Ghrh_ResumeWorkExp", "Ghrh_ResumeWorkExp"), Entity(TableCnName = "工作经历", TableName = "Ghrh_ResumeWorkExp")] +public class Ghrh_ResumeWorkExp : BasePoco { /// - /// 工作经历 (Model) - /// - [SugarTable("Ghrh_ResumeWorkExp", "Ghrh_ResumeWorkExp"), Entity(TableCnName = "工作经历", TableName = "Ghrh_ResumeWorkExp")] - public class Ghrh_ResumeWorkExp : BasePoco - { - - /// - /// 简历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/Models/Ghrh/Ghrh_Statement.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_Statement.cs index 151165e3..b1d7bb95 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_Statement.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_Statement.cs @@ -13,127 +13,122 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 声明 (Model) +/// +[SugarTable("Ghrh_Statement", "Ghrh_Statement"), Entity(TableCnName = "声明", TableName = "Ghrh_Statement")] +public class Ghrh_Statement : BasePoco { /// - /// 声明 (Model) - /// - [SugarTable("Ghrh_Statement", "Ghrh_Statement"), Entity(TableCnName = "声明", TableName = "Ghrh_Statement")] - public class Ghrh_Statement : BasePoco - { - - /// - /// 简称 - /// - [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/Models/Ghrh/Ghrh_YearHumanSettings.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_YearHumanSettings.cs index 34f69dec..23fa8b33 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_YearHumanSettings.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_YearHumanSettings.cs @@ -13,156 +13,151 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 年度人力配置 (Model) +/// +[SugarTable("Ghrh_YearHumanSettings", "Ghrh_YearHumanSettings"), Entity(TableCnName = "年度人力配置", TableName = "Ghrh_YearHumanSettings")] +public class Ghrh_YearHumanSettings : BasePoco { /// - /// 年度人力配置 (Model) - /// - [SugarTable("Ghrh_YearHumanSettings", "Ghrh_YearHumanSettings"), Entity(TableCnName = "年度人力配置", TableName = "Ghrh_YearHumanSettings")] - public class Ghrh_YearHumanSettings : BasePoco - { - - /// - /// 年月 - /// - [Display(Name = "YearMonth"), Description("年月"), MaxLength(100, ErrorMessage = "年月 不能超过 100 个字符")] - public string YearMonth { get; set; } - - /// - /// 部门ID - /// - public int? DeptId { get; set; } - - /// - /// 职称ID - /// - public int? TitleId { get; set; } - - /// - /// 职等ID - /// - public int? GradeId { get; set; } - - /// - /// 岗位ID - /// - public int? JobId { get; set; } - - /// - /// 预算内编制数 - /// - public int? BudgetInStaffCount { get; set; } - - /// - /// 预算外编制数 - /// - public int? BudgetOutStaffCount { get; set; } - - /// - /// 预算内在编人数 - /// - public int? BudgetInDutyStaffCount { get; set; } - - /// - /// 预算外在编人数 - /// - public int? BudgetOutDutyStaffCount { get; set; } - - /// - /// 预算内缺编人数 - /// - public int? BudgetInLackStaffCount { get; set; } - - /// - /// 预算外缺编人数 - /// - public int? BudgetOutLackStaffCount { 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 = "YearMonth"), Description("年月"), MaxLength(100, ErrorMessage = "年月 不能超过 100 个字符")] + public string YearMonth { get; set; } + + /// + /// 部门ID + /// + public int? DeptId { get; set; } + + /// + /// 职称ID + /// + public int? TitleId { get; set; } + + /// + /// 职等ID + /// + public int? GradeId { get; set; } + + /// + /// 岗位ID + /// + public int? JobId { get; set; } + + /// + /// 预算内编制数 + /// + public int? BudgetInStaffCount { get; set; } + + /// + /// 预算外编制数 + /// + public int? BudgetOutStaffCount { get; set; } + + /// + /// 预算内在编人数 + /// + public int? BudgetInDutyStaffCount { get; set; } + + /// + /// 预算外在编人数 + /// + public int? BudgetOutDutyStaffCount { get; set; } + + /// + /// 预算内缺编人数 + /// + public int? BudgetInLackStaffCount { get; set; } + + /// + /// 预算外缺编人数 + /// + public int? BudgetOutLackStaffCount { 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/Ghro/Ghro_Dept.cs b/Tiobon.Core.Model/Models/Ghro/Ghro_Dept.cs index 35d3c03f..fb868d47 100644 --- a/Tiobon.Core.Model/Models/Ghro/Ghro_Dept.cs +++ b/Tiobon.Core.Model/Models/Ghro/Ghro_Dept.cs @@ -13,195 +13,190 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghro_Dept (Model) +/// +[SugarTable("Ghro_Dept", "Ghro_Dept"), Entity(TableCnName = "Ghro_Dept", TableName = "Ghro_Dept")] +public class Ghro_Dept : BasePoco1 { /// - /// Ghro_Dept (Model) - /// - [SugarTable("Ghro_Dept", "Ghro_Dept"), Entity(TableCnName = "Ghro_Dept", TableName = "Ghro_Dept")] - public class Ghro_Dept : BasePoco1 - { - - /// - /// 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/Models/Ghrs/Ghrs_Attachment.cs b/Tiobon.Core.Model/Models/Ghrs/Ghrs_Attachment.cs index 34b29e4a..328ecc76 100644 --- a/Tiobon.Core.Model/Models/Ghrs/Ghrs_Attachment.cs +++ b/Tiobon.Core.Model/Models/Ghrs/Ghrs_Attachment.cs @@ -13,175 +13,170 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghrs_Attachment (Model) +/// +[SugarTable("Ghrs_Attachment", "Ghrs_Attachment"), Entity(TableCnName = "Ghrs_Attachment", TableName = "Ghrs_Attachment")] +public class Ghrs_Attachment : BasePoco1 { /// - /// Ghrs_Attachment (Model) - /// - [SugarTable("Ghrs_Attachment", "Ghrs_Attachment"), Entity(TableCnName = "Ghrs_Attachment", TableName = "Ghrs_Attachment")] - public class Ghrs_Attachment : BasePoco1 - { - - /// - /// 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/Models/Ghrs/Ghrs_DataRoleDetail.cs b/Tiobon.Core.Model/Models/Ghrs/Ghrs_DataRoleDetail.cs index cb45d021..f8ef29d3 100644 --- a/Tiobon.Core.Model/Models/Ghrs/Ghrs_DataRoleDetail.cs +++ b/Tiobon.Core.Model/Models/Ghrs/Ghrs_DataRoleDetail.cs @@ -14,108 +14,103 @@ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ */ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghrs_DataRoleDetail (Model) +/// +[SugarTable("Ghrs_DataRoleDetail", "Ghrs_DataRoleDetail"), Entity(TableCnName = "Ghrs_DataRoleDetail", TableName = "Ghrs_DataRoleDetail")] +public class Ghrs_DataRoleDetail : BasePoco1 { /// - /// Ghrs_DataRoleDetail (Model) - /// - [SugarTable("Ghrs_DataRoleDetail", "Ghrs_DataRoleDetail"), Entity(TableCnName = "Ghrs_DataRoleDetail", TableName = "Ghrs_DataRoleDetail")] - public class Ghrs_DataRoleDetail : BasePoco1 - { - - /// - /// DataRoleDetailId - /// - [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false), Display(Name = "表主键")] - 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 + /// + [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false), Display(Name = "表主键")] + 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/Models/Ghrs/Ghrs_Menu.cs b/Tiobon.Core.Model/Models/Ghrs/Ghrs_Menu.cs index 1a06ad31..58115293 100644 --- a/Tiobon.Core.Model/Models/Ghrs/Ghrs_Menu.cs +++ b/Tiobon.Core.Model/Models/Ghrs/Ghrs_Menu.cs @@ -14,435 +14,430 @@ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ */ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghrs_Menu (Model) +/// +[SugarTable("Ghrs_Menu", "Ghrs_Menu"), Entity(TableCnName = "Ghrs_Menu", TableName = "Ghrs_Menu")] +public class Ghrs_Menu : BasePoco1 { /// - /// Ghrs_Menu (Model) - /// - [SugarTable("Ghrs_Menu", "Ghrs_Menu"), Entity(TableCnName = "Ghrs_Menu", TableName = "Ghrs_Menu")] - public class Ghrs_Menu : BasePoco1 - { - - /// - /// MenuId - /// - [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false), Display(Name = "表主键")] - 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 + /// + [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false), Display(Name = "表主键")] + 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/Models/Ghrs/Ghrs_ParaDetail.cs b/Tiobon.Core.Model/Models/Ghrs/Ghrs_ParaDetail.cs index fcd2d00d..1d44ed3a 100644 --- a/Tiobon.Core.Model/Models/Ghrs/Ghrs_ParaDetail.cs +++ b/Tiobon.Core.Model/Models/Ghrs/Ghrs_ParaDetail.cs @@ -13,151 +13,146 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// Ghrs_ParaDetail (Model) +/// +[SugarTable("Ghrs_ParaDetail", "Ghrs_ParaDetail"), Entity(TableCnName = "Ghrs_ParaDetail", TableName = "Ghrs_ParaDetail")] +public class Ghrs_ParaDetail : BasePoco1 { /// - /// Ghrs_ParaDetail (Model) - /// - [SugarTable("Ghrs_ParaDetail", "Ghrs_ParaDetail"), Entity(TableCnName = "Ghrs_ParaDetail", TableName = "Ghrs_ParaDetail")] - public class Ghrs_ParaDetail : BasePoco1 - { - - /// - /// 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/Models/Ghrs/Ghrs_User.cs b/Tiobon.Core.Model/Models/Ghrs/Ghrs_User.cs index fe994146..a433e178 100644 --- a/Tiobon.Core.Model/Models/Ghrs/Ghrs_User.cs +++ b/Tiobon.Core.Model/Models/Ghrs/Ghrs_User.cs @@ -13,215 +13,210 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using SqlSugar; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 系统用户 (Model) +/// +[SugarTable("Ghrs_User", "Ghrs_User"), Entity(TableCnName = "系统用户", TableName = "Ghrs_User")] +public class Ghrs_User : BasePoco1 { /// - /// 系统用户 (Model) - /// - [SugarTable("Ghrs_User", "Ghrs_User"), Entity(TableCnName = "系统用户", TableName = "Ghrs_User")] - public class Ghrs_User : BasePoco1 - { - - /// - /// UserId - /// - [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false), Display(Name = "表主键")] - 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 + /// + [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false), Display(Name = "表主键")] + 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/View/Ghre/Ghre_CourseClass.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_CourseClass.Dto.View.cs index 6b310e98..1d0bee3f 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_CourseClass.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_CourseClass.Dto.View.cs @@ -15,23 +15,22 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models +namespace Tiobon.Core.Model.Models; + + +/// +/// 课程分类(Dto.View) +/// +public class Ghre_CourseClassDto : Ghre_CourseClass { /// - /// 课程分类(Dto.View) + /// 创建信息 /// - public class Ghre_CourseClassDto : Ghre_CourseClass - { - - /// - /// 创建信息 - /// - 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_CourseScene.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_CourseScene.Dto.View.cs index a5235c57..577d651a 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_CourseScene.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_CourseScene.Dto.View.cs @@ -15,26 +15,25 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models +namespace Tiobon.Core.Model.Models; + + +/// +/// 课程场景(Dto.View) +/// +public class Ghre_CourseSceneDto : Ghre_CourseScene { + + public List CourseIds { get; set; } /// - /// 课程场景(Dto.View) + /// 创建信息 /// - public class Ghre_CourseSceneDto : Ghre_CourseScene - { - + public string CreateDataInfo { get; set; } - public List CourseIds { 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_ExamPaper.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaper.Dto.View.cs index 106a0f9d..ffca4698 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaper.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaper.Dto.View.cs @@ -15,37 +15,36 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models +namespace Tiobon.Core.Model.Models; + + +/// +/// 试卷(Dto.View) +/// +public class Ghre_ExamPaperDto : Ghre_ExamPaper { /// - /// 试卷(Dto.View) + /// 评分方式 + /// + public string ScoreMethodLabel { get; set; } + + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } + + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } + + + + /// + /// 评分方式 /// - public class Ghre_ExamPaperDto : Ghre_ExamPaper - { - - /// - /// 评分方式 - /// - public string ScoreMethodLabel { get; set; } - - /// - /// 创建信息 - /// - public string CreateDataInfo { get; set; } - - /// - /// 修改信息 - /// - public string UpdateDataInfo { get; set; } - - - - /// - /// 评分方式 - /// - public string TotalScore1 { get; set; } - public string SetMethodLabel { get; set; } - public string CourseName { get; set; } - } + public string TotalScore1 { get; set; } + public string SetMethodLabel { get; set; } + public string CourseName { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaperConfig.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaperConfig.Dto.View.cs index 36220fb8..9934709f 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaperConfig.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaperConfig.Dto.View.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 试卷配置(Dto.View) - /// - public class Ghre_ExamPaperConfigDto : Ghre_ExamPaperConfig - { - } +/// +/// 试卷配置(Dto.View) +/// +public class Ghre_ExamPaperConfigDto : Ghre_ExamPaperConfig +{ } diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaperQuestion.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaperQuestion.Dto.View.cs index 14cff084..50750e9a 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaperQuestion.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaperQuestion.Dto.View.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 试卷题目(Dto.View) - /// - public class Ghre_ExamPaperQuestionDto : Ghre_ExamPaperQuestion - { - } +/// +/// 试卷题目(Dto.View) +/// +public class Ghre_ExamPaperQuestionDto : Ghre_ExamPaperQuestion +{ } diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_Question.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_Question.Dto.View.cs index 9575b281..ee09cd01 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_Question.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_Question.Dto.View.cs @@ -15,49 +15,45 @@ *└──────────────────────────────────┘ */ -using System.ComponentModel.DataAnnotations; -using System.ComponentModel; +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 题目(Dto.View) +/// +public class Ghre_QuestionDto : Ghre_Question { + /// + /// 课程名称 + /// + [Display(Name = "CourseName"), Description("课程名称")] + public string CourseName { get; set; } + + //public long CourseTypeId { get; set; } + + public string CourseClassId { get; set; } + + + public string CourseType { get; set; } + + /// + /// 难易程度 + /// + public string DifficultyLevelLabel { get; set; } + + /// + /// 题目类型 + /// + public string QuestionTypeLabel { get; set; } + + + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } /// - /// 题目(Dto.View) + /// 修改信息 /// - public class Ghre_QuestionDto : Ghre_Question - { - /// - /// 课程名称 - /// - [Display(Name = "CourseName"), Description("课程名称")] - public string CourseName { get; set; } - - //public long CourseTypeId { get; set; } - - public string CourseClassId { get; set; } - - - public string CourseType { get; set; } - - /// - /// 难易程度 - /// - public string DifficultyLevelLabel { get; set; } - - /// - /// 题目类型 - /// - public string QuestionTypeLabel { 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_ResumeInfoGroup.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeInfoGroup.Dto.View.cs index aec347c9..fd3a39fc 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeInfoGroup.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeInfoGroup.Dto.View.cs @@ -15,8 +15,6 @@ *└──────────────────────────────────┘ */ -using Tiobon.Core.Model.ViewModels.Extend; - namespace Tiobon.Core.Model.Models; /// diff --git a/Tiobon.Core.Model/View/Ghrs/Ghrs_User.Dto.View.cs b/Tiobon.Core.Model/View/Ghrs/Ghrs_User.Dto.View.cs index 09cc397b..99c2f3f1 100644 --- a/Tiobon.Core.Model/View/Ghrs/Ghrs_User.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrs/Ghrs_User.Dto.View.cs @@ -15,13 +15,12 @@ *└──────────────────────────────────┘ */ -namespace Tiobon.Core.Model.Models -{ +namespace Tiobon.Core.Model.Models; + - /// - /// 系统用户(Dto.View) - /// - public class Ghrs_UserDto : Ghrs_User - { - } +/// +/// 系统用户(Dto.View) +/// +public class Ghrs_UserDto : Ghrs_User +{ } diff --git a/Tiobon.Core.Model/ViewModels/Extend/Attachment.cs b/Tiobon.Core.Model/ViewModels/Extend/Attachment.cs index 5d7352e1..1a057366 100644 --- a/Tiobon.Core.Model/ViewModels/Extend/Attachment.cs +++ b/Tiobon.Core.Model/ViewModels/Extend/Attachment.cs @@ -1,7 +1,4 @@ -using System.Dynamic; -using Newtonsoft.Json.Linq; - -namespace Tiobon.Core.Model; +namespace Tiobon.Core.Model; public class Attachment { diff --git a/Tiobon.Core.Repository/BASE/BaseRepository.cs b/Tiobon.Core.Repository/BASE/BaseRepository.cs index 35d3fdcc..a85a8f59 100644 --- a/Tiobon.Core.Repository/BASE/BaseRepository.cs +++ b/Tiobon.Core.Repository/BASE/BaseRepository.cs @@ -12,737 +12,736 @@ using Tiobon.Core.Model.Models; using Tiobon.Core.Model.Tenants; using Tiobon.Core.Repository.UnitOfWorks; -namespace Tiobon.Core.Repository.Base +namespace Tiobon.Core.Repository.Base; + +public class BaseRepository : IBaseRepository where TEntity : class, new() { - public class BaseRepository : IBaseRepository where TEntity : class, new() - { - private readonly IUnitOfWorkManage _unitOfWorkManage; - private readonly SqlSugarScope _dbBase; + private readonly IUnitOfWorkManage _unitOfWorkManage; + private readonly SqlSugarScope _dbBase; - private ISqlSugarClient _db + private ISqlSugarClient _db + { + get { - get - { - ISqlSugarClient db = _dbBase; + ISqlSugarClient db = _dbBase; - //修改使用 model备注字段作为切换数据库条件，使用sqlsugar TenantAttribute存放数据库ConnId - //参考 https://www.donet5.com/Home/Doc?typeId=2246 - var tenantAttr = typeof(TEntity).GetCustomAttribute(); - if (tenantAttr != null) - { - //统一处理 configId 小写 - db = _dbBase.GetConnectionScope(tenantAttr.configId.ToString().ToLower()); - return db; - } + //修改使用 model备注字段作为切换数据库条件，使用sqlsugar TenantAttribute存放数据库ConnId + //参考 https://www.donet5.com/Home/Doc?typeId=2246 + var tenantAttr = typeof(TEntity).GetCustomAttribute(); + if (tenantAttr != null) + { + //统一处理 configId 小写 + db = _dbBase.GetConnectionScope(tenantAttr.configId.ToString().ToLower()); + return db; + } - //多租户 - var mta = typeof(TEntity).GetCustomAttribute(); - if (mta is { TenantType: TenantTypeEnum.Db }) + //多租户 + var mta = typeof(TEntity).GetCustomAttribute(); + if (mta is { TenantType: TenantTypeEnum.Db }) + { + //获取租户信息 租户信息可以提前缓存下来 + if (App.User is { TenantId: > 0 }) { - //获取租户信息 租户信息可以提前缓存下来 - if (App.User is { TenantId: > 0 }) + var tenant = db.Queryable().WithCache().Where(s => s.Id == App.User.TenantId).First(); + if (tenant != null) { - var tenant = db.Queryable().WithCache().Where(s => s.Id == App.User.TenantId).First(); - if (tenant != null) + var iTenant = db.AsTenant(); + if (!iTenant.IsAnyConnection(tenant.ConfigId)) { - var iTenant = db.AsTenant(); - if (!iTenant.IsAnyConnection(tenant.ConfigId)) - { - iTenant.AddConnection(tenant.GetConnectionConfig()); - } - - return iTenant.GetConnectionScope(tenant.ConfigId); + iTenant.AddConnection(tenant.GetConnectionConfig()); } + + return iTenant.GetConnectionScope(tenant.ConfigId); } } - - return db; } - } - - public ISqlSugarClient Db => _db; - public BaseRepository(IUnitOfWorkManage unitOfWorkManage) - { - _unitOfWorkManage = unitOfWorkManage; - _dbBase = unitOfWorkManage.GetDbClient(); + return db; } + } + public ISqlSugarClient Db => _db; - public async Task QueryById(object objId) - { - //return await Task.Run(() => _db.Queryable().InSingle(objId)); - return await _db.Queryable().In(objId).SingleAsync(); - } - /// - /// 查询实体数据是否存在 - /// - /// - /// - public async Task AnyAsync(object objId) - { - return await _db.Queryable().In(objId).AnyAsync(); - } - - /// - /// 查询实体数据是否存在 - /// - /// - /// - public bool Any(object objId) - { - return _db.Queryable().In(objId).Any(); - } + public BaseRepository(IUnitOfWorkManage unitOfWorkManage) + { + _unitOfWorkManage = unitOfWorkManage; + _dbBase = unitOfWorkManage.GetDbClient(); + } - public async Task AnyAsync(Expression> whereExpression) - { - return await _db.Queryable().WhereIF(whereExpression != null, whereExpression).AnyAsync(); - } - /// - /// 根据ID查询一条数据 - /// - /// id（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件 - /// 是否使用缓存 - /// 数据实体 - public async Task QueryById(object objId, bool blnUseCache = false) - { - //return await Task.Run(() => _db.Queryable().WithCacheIF(blnUseCache).InSingle(objId)); - return await _db.Queryable().WithCacheIF(blnUseCache, 10).In(objId).SingleAsync(); - } + public async Task QueryById(object objId) + { + //return await Task.Run(() => _db.Queryable().InSingle(objId)); + return await _db.Queryable().In(objId).SingleAsync(); + } + /// + /// 查询实体数据是否存在 + /// + /// + /// + public async Task AnyAsync(object objId) + { + return await _db.Queryable().In(objId).AnyAsync(); + } - /// - /// 根据ID查询数据 - /// - /// id列表（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件 - /// 数据实体列表 - public async Task> QueryByIDs(object[] lstIds) - { - //return await Task.Run(() => _db.Queryable().In(lstIds).ToList()); - return await _db.Queryable().In(lstIds).ToListAsync(); - } + /// + /// 查询实体数据是否存在 + /// + /// + /// + public bool Any(object objId) + { + return _db.Queryable().In(objId).Any(); + } - /// - /// 写入实体数据 - /// - /// 博文实体类 - /// - public async Task Add(TEntity entity) - { - //var i = await Task.Run(() => _db.Insertable(entity).ExecuteReturnBigIdentity()); - ////返回的i是long类型,这里你可以根据你的业务需要进行处理 - //return (int)i; + public async Task AnyAsync(Expression> whereExpression) + { + return await _db.Queryable().WhereIF(whereExpression != null, whereExpression).AnyAsync(); + } - var insert = _db.Insertable(entity); + /// + /// 根据ID查询一条数据 + /// + /// id（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件 + /// 是否使用缓存 + /// 数据实体 + public async Task QueryById(object objId, bool blnUseCache = false) + { + //return await Task.Run(() => _db.Queryable().WithCacheIF(blnUseCache).InSingle(objId)); + return await _db.Queryable().WithCacheIF(blnUseCache, 10).In(objId).SingleAsync(); + } - //这里你可以返回TEntity，这样的话就可以获取id值，无论主键是什么类型 - //var return3 = await insert.ExecuteReturnEntityAsync(); + /// + /// 根据ID查询数据 + /// + /// id列表（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件 + /// 数据实体列表 + public async Task> QueryByIDs(object[] lstIds) + { + //return await Task.Run(() => _db.Queryable().In(lstIds).ToList()); + return await _db.Queryable().In(lstIds).ToListAsync(); + } - return await insert.ExecuteReturnSnowflakeIdAsync(); - } + /// + /// 写入实体数据 + /// + /// 博文实体类 + /// + public async Task Add(TEntity entity) + { + //var i = await Task.Run(() => _db.Insertable(entity).ExecuteReturnBigIdentity()); + ////返回的i是long类型,这里你可以根据你的业务需要进行处理 + //return (int)i; - /// - /// 写入实体数据 - /// - /// 实体类 - /// 指定只插入列 - /// 返回自增量列 - public async Task Add(TEntity entity, Expression> insertColumns = null) - { - var insert = _db.Insertable(entity); - if (insertColumns == null) - { - return await insert.ExecuteReturnSnowflakeIdAsync(); - } - else - { - return await insert.InsertColumns(insertColumns).ExecuteReturnSnowflakeIdAsync(); - } - } + var insert = _db.Insertable(entity); - /// - /// 批量插入实体(速度快) - /// - /// 实体集合 - /// 影响行数 - public async Task> Add(List listEntity) - { - return await _db.Insertable(listEntity.ToArray()).ExecuteReturnSnowflakeIdListAsync(); - } + //这里你可以返回TEntity，这样的话就可以获取id值，无论主键是什么类型 + //var return3 = await insert.ExecuteReturnEntityAsync(); - /// - /// 更新实体数据 - /// - /// 博文实体类 - /// - public async Task Update(TEntity entity) - { - ////这种方式会以主键为条件 - //var i = await Task.Run(() => _db.Updateable(entity).ExecuteCommand()); - //return i > 0; - //这种方式会以主键为条件 - return await _db.Updateable(entity).ExecuteCommandHasChangeAsync(); - } - /// - /// 更新实体数据 - /// - /// 博文实体类 - /// - public async Task Update(List entity) - { - return await _db.Updateable(entity).ExecuteCommandHasChangeAsync(); - } + return await insert.ExecuteReturnSnowflakeIdAsync(); + } - public async Task Update(TEntity entity, string where) + /// + /// 写入实体数据 + /// + /// 实体类 + /// 指定只插入列 + /// 返回自增量列 + public async Task Add(TEntity entity, Expression> insertColumns = null) + { + var insert = _db.Insertable(entity); + if (insertColumns == null) { - return await _db.Updateable(entity).Where(where).ExecuteCommandHasChangeAsync(); + return await insert.ExecuteReturnSnowflakeIdAsync(); } - - public async Task Update(string sql, SugarParameter[] parameters = null) + else { - return await _db.Ado.ExecuteCommandAsync(sql, parameters) > 0; + return await insert.InsertColumns(insertColumns).ExecuteReturnSnowflakeIdAsync(); } + } - public async Task Update(object operateAnonymousObjects) - { - return await _db.Updateable(operateAnonymousObjects).ExecuteCommandAsync() > 0; - } + /// + /// 批量插入实体(速度快) + /// + /// 实体集合 + /// 影响行数 + public async Task> Add(List listEntity) + { + return await _db.Insertable(listEntity.ToArray()).ExecuteReturnSnowflakeIdListAsync(); + } - public async Task Update(TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, string where = "") - { - IUpdateable up = _db.Updateable(entity); - if (lstIgnoreColumns != null && lstIgnoreColumns.Count > 0) - { - up = up.IgnoreColumns(lstIgnoreColumns.ToArray()); - } + /// + /// 更新实体数据 + /// + /// 博文实体类 + /// + public async Task Update(TEntity entity) + { + ////这种方式会以主键为条件 + //var i = await Task.Run(() => _db.Updateable(entity).ExecuteCommand()); + //return i > 0; + //这种方式会以主键为条件 + return await _db.Updateable(entity).ExecuteCommandHasChangeAsync(); + } + /// + /// 更新实体数据 + /// + /// 博文实体类 + /// + public async Task Update(List entity) + { + return await _db.Updateable(entity).ExecuteCommandHasChangeAsync(); + } - if (lstColumns != null && lstColumns.Count > 0) - { - up = up.UpdateColumns(lstColumns.ToArray()); - } + public async Task Update(TEntity entity, string where) + { + return await _db.Updateable(entity).Where(where).ExecuteCommandHasChangeAsync(); + } - if (!string.IsNullOrEmpty(where)) - { - up = up.Where(where); - } + public async Task Update(string sql, SugarParameter[] parameters = null) + { + return await _db.Ado.ExecuteCommandAsync(sql, parameters) > 0; + } - return await up.ExecuteCommandHasChangeAsync(); - } + public async Task Update(object operateAnonymousObjects) + { + return await _db.Updateable(operateAnonymousObjects).ExecuteCommandAsync() > 0; + } - /// - /// 根据实体删除一条数据 - /// - /// 博文实体类 - /// - public async Task Delete(TEntity entity) + public async Task Update(TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, string where = "") + { + IUpdateable up = _db.Updateable(entity); + if (lstIgnoreColumns != null && lstIgnoreColumns.Count > 0) { - return await _db.Deleteable(entity).ExecuteCommandHasChangeAsync(); + up = up.IgnoreColumns(lstIgnoreColumns.ToArray()); } - /// - /// 删除指定ID的数据 - /// - /// 主键ID - /// - public async Task DeleteById(object id) + if (lstColumns != null && lstColumns.Count > 0) { - return await _db.Deleteable().In(id).ExecuteCommandHasChangeAsync(); + up = up.UpdateColumns(lstColumns.ToArray()); } - /// - /// 删除指定ID集合的数据(批量删除) - /// - /// 主键ID集合 - /// - public async Task DeleteByIds(object[] ids) + if (!string.IsNullOrEmpty(where)) { - return await _db.Deleteable().In(ids).ExecuteCommandHasChangeAsync(); + up = up.Where(where); } - /// - /// 根据表达式，删除实体 - /// - /// 主键ID - /// - public async Task Delete(Expression> whereExpression) - { - return await _db.Deleteable().Where(whereExpression).ExecuteCommandHasChangeAsync(); - } + return await up.ExecuteCommandHasChangeAsync(); + } - /// - /// 查询所有数据 - /// - /// 数据列表 - public async Task> Query() - { - return await _db.Queryable().ToListAsync(); - } + /// + /// 根据实体删除一条数据 + /// + /// 博文实体类 + /// + public async Task Delete(TEntity entity) + { + return await _db.Deleteable(entity).ExecuteCommandHasChangeAsync(); + } - /// - /// 查询数据列表 - /// - /// 条件 - /// 数据列表 - public async Task> Query(string where) - { - return await _db.Queryable().WhereIF(!string.IsNullOrEmpty(where), where).ToListAsync(); - } + /// + /// 删除指定ID的数据 + /// + /// 主键ID + /// + public async Task DeleteById(object id) + { + return await _db.Deleteable().In(id).ExecuteCommandHasChangeAsync(); + } - /// - /// 查询数据列表 - /// - /// whereExpression - /// 数据列表 - public async Task> Query(Expression> whereExpression) - { - return await _db.Queryable().WhereIF(whereExpression != null, whereExpression).ToListAsync(); - } + /// + /// 删除指定ID集合的数据(批量删除) + /// + /// 主键ID集合 + /// + public async Task DeleteByIds(object[] ids) + { + return await _db.Deleteable().In(ids).ExecuteCommandHasChangeAsync(); + } - /// - /// 按照特定列查询数据列表 - /// - /// - /// - /// - public async Task> Query(Expression> expression) - { - return await _db.Queryable().Select(expression).ToListAsync(); - } + /// + /// 根据表达式，删除实体 + /// + /// 主键ID + /// + public async Task Delete(Expression> whereExpression) + { + return await _db.Deleteable().Where(whereExpression).ExecuteCommandHasChangeAsync(); + } - /// - /// 按照特定列查询数据列表带条件排序 - /// - /// - /// 过滤条件 - /// 查询实体条件 - /// 排序条件 - /// - public async Task> Query(Expression> expression, Expression> whereExpression, string orderByFields) - { - return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(whereExpression != null, whereExpression).Select(expression).ToListAsync(); - } + /// + /// 查询所有数据 + /// + /// 数据列表 + public async Task> Query() + { + return await _db.Queryable().ToListAsync(); + } - /// - /// 查询一个列表 - /// - /// 条件表达式 - /// 排序字段，如name asc,age desc - /// 数据列表 - public async Task> Query(Expression> whereExpression, string orderByFields) - { - return await _db.Queryable().WhereIF(whereExpression != null, whereExpression).OrderByIF(orderByFields != null, orderByFields).ToListAsync(); - } + /// + /// 查询数据列表 + /// + /// 条件 + /// 数据列表 + public async Task> Query(string where) + { + return await _db.Queryable().WhereIF(!string.IsNullOrEmpty(where), where).ToListAsync(); + } - /// - /// 查询一个列表 - /// - /// - /// - /// - /// - public async Task> Query(Expression> whereExpression, Expression> orderByExpression, bool isAsc = true) - { - //return await Task.Run(() => _db.Queryable().OrderByIF(orderByExpression != null, orderByExpression, isAsc ? OrderByType.Asc : OrderByType.Desc).WhereIF(whereExpression != null, whereExpression).ToList()); - return await _db.Queryable().OrderByIF(orderByExpression != null, orderByExpression, isAsc ? OrderByType.Asc : OrderByType.Desc).WhereIF(whereExpression != null, whereExpression).ToListAsync(); - } + /// + /// 查询数据列表 + /// + /// whereExpression + /// 数据列表 + public async Task> Query(Expression> whereExpression) + { + return await _db.Queryable().WhereIF(whereExpression != null, whereExpression).ToListAsync(); + } - /// - /// 查询一个列表 - /// - /// 条件 - /// 排序字段，如name asc,age desc - /// 数据列表 - public async Task> Query(string where, string orderByFields) - { - return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(!string.IsNullOrEmpty(where), where).ToListAsync(); - } + /// + /// 按照特定列查询数据列表 + /// + /// + /// + /// + public async Task> Query(Expression> expression) + { + return await _db.Queryable().Select(expression).ToListAsync(); + } + /// + /// 按照特定列查询数据列表带条件排序 + /// + /// + /// 过滤条件 + /// 查询实体条件 + /// 排序条件 + /// + public async Task> Query(Expression> expression, Expression> whereExpression, string orderByFields) + { + return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(whereExpression != null, whereExpression).Select(expression).ToListAsync(); + } - /// - /// 查询前N条数据 - /// - /// 条件表达式 - /// 前N条 - /// 排序字段，如name asc,age desc - /// 数据列表 - public async Task> Query( - Expression> whereExpression, - int top, - string orderByFields) - { - return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(whereExpression != null, whereExpression).Take(top).ToListAsync(); - } + /// + /// 查询一个列表 + /// + /// 条件表达式 + /// 排序字段，如name asc,age desc + /// 数据列表 + public async Task> Query(Expression> whereExpression, string orderByFields) + { + return await _db.Queryable().WhereIF(whereExpression != null, whereExpression).OrderByIF(orderByFields != null, orderByFields).ToListAsync(); + } - /// - /// 查询前N条数据 - /// - /// 条件 - /// 前N条 - /// 排序字段，如name asc,age desc - /// 数据列表 - public async Task> Query( - string where, - int top, - string orderByFields) - { - return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(!string.IsNullOrEmpty(where), where).Take(top).ToListAsync(); - } + /// + /// 查询一个列表 + /// + /// + /// + /// + /// + public async Task> Query(Expression> whereExpression, Expression> orderByExpression, bool isAsc = true) + { + //return await Task.Run(() => _db.Queryable().OrderByIF(orderByExpression != null, orderByExpression, isAsc ? OrderByType.Asc : OrderByType.Desc).WhereIF(whereExpression != null, whereExpression).ToList()); + return await _db.Queryable().OrderByIF(orderByExpression != null, orderByExpression, isAsc ? OrderByType.Asc : OrderByType.Desc).WhereIF(whereExpression != null, whereExpression).ToListAsync(); + } - /// - /// 根据sql语句查询 - /// - /// 完整的sql语句 - /// 参数 - /// 泛型集合 - public async Task> QuerySql(string sql, SugarParameter[] parameters = null) - { - return await _db.Ado.SqlQueryAsync(sql, parameters); - } + /// + /// 查询一个列表 + /// + /// 条件 + /// 排序字段，如name asc,age desc + /// 数据列表 + public async Task> Query(string where, string orderByFields) + { + return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(!string.IsNullOrEmpty(where), where).ToListAsync(); + } - /// - /// 根据sql语句查询 - /// - /// 完整的sql语句 - /// 参数 - /// DataTable - public async Task QueryTable(string sql, SugarParameter[] parameters = null) - { - return await _db.Ado.GetDataTableAsync(sql, parameters); - } - /// - /// - /// 条件表达式 - /// 页码（下标0） - /// 页大小 - /// 排序字段，如name asc,age desc - /// 数据列表 - public async Task> Query( - Expression> whereExpression, - int pageIndex, - int pageSize, - string orderByFields) - { - return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) - .WhereIF(whereExpression != null, whereExpression).ToPageListAsync(pageIndex, pageSize); - } + /// + /// 查询前N条数据 + /// + /// 条件表达式 + /// 前N条 + /// 排序字段，如name asc,age desc + /// 数据列表 + public async Task> Query( + Expression> whereExpression, + int top, + string orderByFields) + { + return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(whereExpression != null, whereExpression).Take(top).ToListAsync(); + } - /// - /// 分页查询 - /// - /// 条件 - /// 页码（下标0） - /// 页大小 - /// 排序字段，如name asc,age desc - /// 数据列表 - public async Task> Query( - string where, - int pageIndex, - int pageSize, - string orderByFields) - { - return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) - .WhereIF(!string.IsNullOrEmpty(where), where).ToPageListAsync(pageIndex, pageSize); - } + /// + /// 查询前N条数据 + /// + /// 条件 + /// 前N条 + /// 排序字段，如name asc,age desc + /// 数据列表 + public async Task> Query( + string where, + int top, + string orderByFields) + { + return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(!string.IsNullOrEmpty(where), where).Take(top).ToListAsync(); + } + /// + /// 根据sql语句查询 + /// + /// 完整的sql语句 + /// 参数 + /// 泛型集合 + public async Task> QuerySql(string sql, SugarParameter[] parameters = null) + { + return await _db.Ado.SqlQueryAsync(sql, parameters); + } - /// - /// 分页查询[使用版本，其他分页未测试] - /// - /// 条件表达式 - /// 页码（下标0） - /// 页大小 - /// 排序字段，如name asc,age desc - /// - public async Task> QueryPage(Expression> whereExpression, int pageIndex = 1, int pageSize = 20, string orderByFields = null) - { - RefAsync totalCount = 0; - var list = await _db.Queryable() - .OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) - .WhereIF(whereExpression != null, whereExpression) - .ToPageListAsync(pageIndex, pageSize, totalCount); + /// + /// 根据sql语句查询 + /// + /// 完整的sql语句 + /// 参数 + /// DataTable + public async Task QueryTable(string sql, SugarParameter[] parameters = null) + { + return await _db.Ado.GetDataTableAsync(sql, parameters); + } - return new PageModel(pageIndex, totalCount, pageSize, list); - } - /// - /// 分页查询[使用版本，其他分页未测试] - /// - /// 条件表达式 - /// 页码（下标0） - /// 页大小 - /// 排序字段，如name asc,age desc - /// - public async Task> QueryFilterPage(QueryBody filter) - { - RefAsync totalCount = 0; - var query = _db.Queryable(); + /// + /// + /// 条件表达式 + /// 页码（下标0） + /// 页大小 + /// 排序字段，如name asc,age desc + /// 数据列表 + public async Task> Query( + Expression> whereExpression, + int pageIndex, + int pageSize, + string orderByFields) + { + return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) + .WhereIF(whereExpression != null, whereExpression).ToPageListAsync(pageIndex, pageSize); + } + + /// + /// 分页查询 + /// + /// 条件 + /// 页码（下标0） + /// 页大小 + /// 排序字段，如name asc,age desc + /// 数据列表 + public async Task> Query( + string where, + int pageIndex, + int pageSize, + string orderByFields) + { + return await _db.Queryable().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) + .WhereIF(!string.IsNullOrEmpty(where), where).ToPageListAsync(pageIndex, pageSize); + } + + + /// + /// 分页查询[使用版本，其他分页未测试] + /// + /// 条件表达式 + /// 页码（下标0） + /// 页大小 + /// 排序字段，如name asc,age desc + /// + public async Task> QueryPage(Expression> whereExpression, int pageIndex = 1, int pageSize = 20, string orderByFields = null) + { + RefAsync totalCount = 0; + var list = await _db.Queryable() + .OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) + .WhereIF(whereExpression != null, whereExpression) + .ToPageListAsync(pageIndex, pageSize, totalCount); + + return new PageModel(pageIndex, totalCount, pageSize, list); + } + /// + /// 分页查询[使用版本，其他分页未测试] + /// + /// 条件表达式 + /// 页码（下标0） + /// 页大小 + /// 排序字段，如name asc,age desc + /// + public async Task> QueryFilterPage(QueryBody filter) + { + RefAsync totalCount = 0; + var query = _db.Queryable(); - string conditions = "1=1"; - if (filter.jsonParam != null) - foreach (JProperty jProperty in filter.jsonParam.Properties()) + string conditions = "1=1"; + if (filter.jsonParam != null) + foreach (JProperty jProperty in filter.jsonParam.Properties()) + { + var name = jProperty.Name; + var value = jProperty.Value.ToString(); + if (name == "page" || name == "pageSize") + continue; + if (!string.IsNullOrWhiteSpace(value)) { - var name = jProperty.Name; - var value = jProperty.Value.ToString(); - if (name == "page" || name == "pageSize") - continue; - if (!string.IsNullOrWhiteSpace(value)) - { - var jsonParam = JsonConvert.DeserializeObject(value); + var jsonParam = JsonConvert.DeserializeObject(value); - switch (jsonParam.operationKey) - { - case "Include": - conditions += $" AND {name} LIKE '%{jsonParam.columnValue}%'"; - break; - case "NotInclude": - conditions += $" AND {name} NOT LIKE '%{jsonParam.columnValue}%'"; - break; - case "IsNull": - conditions += $" AND {name} IS NULL"; - break; - case "NotNull": - conditions += $" AND {name} IS NOT NULL"; - break; - case "Equal": - conditions += $" AND {name} ='{jsonParam.columnValue}'"; - break; - case "NotEqual": - conditions += $" AND {name} !='{jsonParam.columnValue}'"; - break; - default: - break; - } + switch (jsonParam.operationKey) + { + case "Include": + conditions += $" AND {name} LIKE '%{jsonParam.columnValue}%'"; + break; + case "NotInclude": + conditions += $" AND {name} NOT LIKE '%{jsonParam.columnValue}%'"; + break; + case "IsNull": + conditions += $" AND {name} IS NULL"; + break; + case "NotNull": + conditions += $" AND {name} IS NOT NULL"; + break; + case "Equal": + conditions += $" AND {name} ='{jsonParam.columnValue}'"; + break; + case "NotEqual": + conditions += $" AND {name} !='{jsonParam.columnValue}'"; + break; + default: + break; } } - if (filter.pageSize == 0) - filter.pageSize = 10000; - query = query.Where(conditions); - var list = await query - .OrderByIF(!string.IsNullOrEmpty(filter.orderBy), filter.orderBy) - .ToPageListAsync(filter.pageNum, filter.pageSize, totalCount); - - return new ServicePageResult(filter.pageNum, totalCount, filter.pageSize, list); - } + } + if (filter.pageSize == 0) + filter.pageSize = 10000; + query = query.Where(conditions); + var list = await query + .OrderByIF(!string.IsNullOrEmpty(filter.orderBy), filter.orderBy) + .ToPageListAsync(filter.pageNum, filter.pageSize, totalCount); + + return new ServicePageResult(filter.pageNum, totalCount, filter.pageSize, list); + } - /// - ///查询-多表查询 - /// - /// 实体1 - /// 实体2 - /// 实体3 - /// 返回对象 - /// 关联表达式 (join1,join2) => new object[] {JoinType.Left,join1.UserNo==join2.UserNo} - /// 返回表达式 (s1, s2) => new { Id =s1.UserNo, Id1 = s2.UserNo} - /// 查询表达式 (w1, w2) =>w1.UserNo == "") - /// 值 - public async Task> QueryMuch( - Expression> joinExpression, - Expression> selectExpression, - Expression> whereLambda = null) where T : class, new() + /// + ///查询-多表查询 + /// + /// 实体1 + /// 实体2 + /// 实体3 + /// 返回对象 + /// 关联表达式 (join1,join2) => new object[] {JoinType.Left,join1.UserNo==join2.UserNo} + /// 返回表达式 (s1, s2) => new { Id =s1.UserNo, Id1 = s2.UserNo} + /// 查询表达式 (w1, w2) =>w1.UserNo == "") + /// 值 + public async Task> QueryMuch( + Expression> joinExpression, + Expression> selectExpression, + Expression> whereLambda = null) where T : class, new() + { + if (whereLambda == null) { - if (whereLambda == null) - { - return await _db.Queryable(joinExpression).Select(selectExpression).ToListAsync(); - } - - return await _db.Queryable(joinExpression).Where(whereLambda).Select(selectExpression).ToListAsync(); + return await _db.Queryable(joinExpression).Select(selectExpression).ToListAsync(); } + return await _db.Queryable(joinExpression).Where(whereLambda).Select(selectExpression).ToListAsync(); + } - /// - /// 两表联合查询-分页 - /// - /// 实体1 - /// 实体1 - /// 返回对象 - /// 关联表达式 - /// 返回表达式 - /// 查询表达式 - /// 页码 - /// 页大小 - /// 排序字段 - /// - public async Task> QueryTabsPage( - Expression> joinExpression, - Expression> selectExpression, - Expression> whereExpression, - int pageIndex = 1, - int pageSize = 20, - string orderByFields = null) - { - RefAsync totalCount = 0; - var list = await _db.Queryable(joinExpression) - .Select(selectExpression) - .OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) - .WhereIF(whereExpression != null, whereExpression) - .ToPageListAsync(pageIndex, pageSize, totalCount); - return new PageModel(pageIndex, totalCount, pageSize, list); - } - /// - /// 两表联合查询-分页-分组 - /// - /// 实体1 - /// 实体1 - /// 返回对象 - /// 关联表达式 - /// 返回表达式 - /// 查询表达式 - /// group表达式 - /// 页码 - /// 页大小 - /// 排序字段 - /// - public async Task> QueryTabsPage( - Expression> joinExpression, - Expression> selectExpression, - Expression> whereExpression, - Expression> groupExpression, - int pageIndex = 1, - int pageSize = 20, - string orderByFields = null) - { - RefAsync totalCount = 0; - var list = await _db.Queryable(joinExpression).GroupBy(groupExpression) - .Select(selectExpression) - .OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) - .WhereIF(whereExpression != null, whereExpression) - .ToPageListAsync(pageIndex, pageSize, totalCount); - return new PageModel(pageIndex, totalCount, pageSize, list); - } + /// + /// 两表联合查询-分页 + /// + /// 实体1 + /// 实体1 + /// 返回对象 + /// 关联表达式 + /// 返回表达式 + /// 查询表达式 + /// 页码 + /// 页大小 + /// 排序字段 + /// + public async Task> QueryTabsPage( + Expression> joinExpression, + Expression> selectExpression, + Expression> whereExpression, + int pageIndex = 1, + int pageSize = 20, + string orderByFields = null) + { + RefAsync totalCount = 0; + var list = await _db.Queryable(joinExpression) + .Select(selectExpression) + .OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) + .WhereIF(whereExpression != null, whereExpression) + .ToPageListAsync(pageIndex, pageSize, totalCount); + return new PageModel(pageIndex, totalCount, pageSize, list); + } - //var exp = Expressionable.Create() - // .And(s => s.tdIsDelete != true) - // .And(p => p.IsDeleted != true) - // .And(p => p.pmId != null) - // .AndIF(!string.IsNullOrEmpty(model.paramCode1), (s) => s.uID == model.paramCode1.ObjToInt()) - // .AndIF(!string.IsNullOrEmpty(model.searchText), (s) => (s.groupName != null && s.groupName.Contains(model.searchText)) - // || (s.jobName != null && s.jobName.Contains(model.searchText)) - // || (s.uRealName != null && s.uRealName.Contains(model.searchText))) - // .ToExpression();//拼接表达式 - //var data = await _projectMemberServices.QueryTabsPage( - // (s, p) => new object[] { JoinType.Left, s.uID == p.uId }, - // (s, p) => new ProjectToUser - // { - // uID = s.uID, - // uRealName = s.uRealName, - // groupName = s.groupName, - // jobName = s.jobName - // }, exp, s => new { s.uID, s.uRealName, s.groupName, s.jobName }, model.currentPage, model.pageSize, model.orderField + " " + model.orderType); - - #region Split分表基础接口 （基础CRUD） - - /// - /// 分页查询[使用版本，其他分页未测试] - /// - /// 条件表达式 - /// 页码（下标0） - /// 页大小 - /// 排序字段，如name asc,age desc - /// - public async Task> QueryPageSplit(Expression> whereExpression, DateTime beginTime, DateTime endTime, int pageIndex = 1, int pageSize = 20, string orderByFields = null) - { - RefAsync totalCount = 0; - var list = await _db.Queryable().SplitTable(beginTime, endTime) - .OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) - .WhereIF(whereExpression != null, whereExpression) - .ToPageListAsync(pageIndex, pageSize, totalCount); - var data = new PageModel(pageIndex, totalCount, pageSize, list); - return data; - } + /// + /// 两表联合查询-分页-分组 + /// + /// 实体1 + /// 实体1 + /// 返回对象 + /// 关联表达式 + /// 返回表达式 + /// 查询表达式 + /// group表达式 + /// 页码 + /// 页大小 + /// 排序字段 + /// + public async Task> QueryTabsPage( + Expression> joinExpression, + Expression> selectExpression, + Expression> whereExpression, + Expression> groupExpression, + int pageIndex = 1, + int pageSize = 20, + string orderByFields = null) + { + RefAsync totalCount = 0; + var list = await _db.Queryable(joinExpression).GroupBy(groupExpression) + .Select(selectExpression) + .OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) + .WhereIF(whereExpression != null, whereExpression) + .ToPageListAsync(pageIndex, pageSize, totalCount); + return new PageModel(pageIndex, totalCount, pageSize, list); + } - /// - /// 写入实体数据 - /// - /// 数据实体 - /// - public async Task> AddSplit(TEntity entity) - { - var insert = _db.Insertable(entity).SplitTable(); - //插入并返回雪花ID并且自动赋值ID　 - return await insert.ExecuteReturnSnowflakeIdListAsync(); - } + //var exp = Expressionable.Create() + // .And(s => s.tdIsDelete != true) + // .And(p => p.IsDeleted != true) + // .And(p => p.pmId != null) + // .AndIF(!string.IsNullOrEmpty(model.paramCode1), (s) => s.uID == model.paramCode1.ObjToInt()) + // .AndIF(!string.IsNullOrEmpty(model.searchText), (s) => (s.groupName != null && s.groupName.Contains(model.searchText)) + // || (s.jobName != null && s.jobName.Contains(model.searchText)) + // || (s.uRealName != null && s.uRealName.Contains(model.searchText))) + // .ToExpression();//拼接表达式 + //var data = await _projectMemberServices.QueryTabsPage( + // (s, p) => new object[] { JoinType.Left, s.uID == p.uId }, + // (s, p) => new ProjectToUser + // { + // uID = s.uID, + // uRealName = s.uRealName, + // groupName = s.groupName, + // jobName = s.jobName + // }, exp, s => new { s.uID, s.uRealName, s.groupName, s.jobName }, model.currentPage, model.pageSize, model.orderField + " " + model.orderType); + + #region Split分表基础接口 （基础CRUD） + + /// + /// 分页查询[使用版本，其他分页未测试] + /// + /// 条件表达式 + /// 页码（下标0） + /// 页大小 + /// 排序字段，如name asc,age desc + /// + public async Task> QueryPageSplit(Expression> whereExpression, DateTime beginTime, DateTime endTime, int pageIndex = 1, int pageSize = 20, string orderByFields = null) + { + RefAsync totalCount = 0; + var list = await _db.Queryable().SplitTable(beginTime, endTime) + .OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields) + .WhereIF(whereExpression != null, whereExpression) + .ToPageListAsync(pageIndex, pageSize, totalCount); + var data = new PageModel(pageIndex, totalCount, pageSize, list); + return data; + } - /// - /// 更新实体数据 - /// - /// 数据实体 - /// - public async Task UpdateSplit(TEntity entity, DateTime dateTime) - { - //直接根据实体集合更新 （全自动 找表更新） - //return await _db.Updateable(entity).SplitTable().ExecuteCommandAsync();//,SplitTable不能少 + /// + /// 写入实体数据 + /// + /// 数据实体 + /// + public async Task> AddSplit(TEntity entity) + { + var insert = _db.Insertable(entity).SplitTable(); + //插入并返回雪花ID并且自动赋值ID　 + return await insert.ExecuteReturnSnowflakeIdListAsync(); + } - //精准找单个表 - var tableName = _db.SplitHelper().GetTableName(dateTime); //根据时间获取表名 - return await _db.Updateable(entity).AS(tableName).ExecuteCommandHasChangeAsync(); - } + /// + /// 更新实体数据 + /// + /// 数据实体 + /// + public async Task UpdateSplit(TEntity entity, DateTime dateTime) + { + //直接根据实体集合更新 （全自动 找表更新） + //return await _db.Updateable(entity).SplitTable().ExecuteCommandAsync();//,SplitTable不能少 - /// - /// 删除数据 - /// - /// - /// - /// - public async Task DeleteSplit(TEntity entity, DateTime dateTime) - { - ////直接根据实体集合删除 （全自动 找表插入）,返回受影响数 - //return await _db.Deleteable(entity).SplitTable().ExecuteCommandAsync();//,SplitTable不能少 + //精准找单个表 + var tableName = _db.SplitHelper().GetTableName(dateTime); //根据时间获取表名 + return await _db.Updateable(entity).AS(tableName).ExecuteCommandHasChangeAsync(); + } - //精准找单个表 - var tableName = _db.SplitHelper().GetTableName(dateTime); //根据时间获取表名 - return await _db.Deleteable().AS(tableName).Where(entity).ExecuteCommandHasChangeAsync(); - } + /// + /// 删除数据 + /// + /// + /// + /// + public async Task DeleteSplit(TEntity entity, DateTime dateTime) + { + ////直接根据实体集合删除 （全自动 找表插入）,返回受影响数 + //return await _db.Deleteable(entity).SplitTable().ExecuteCommandAsync();//,SplitTable不能少 - /// - /// 根据ID查找数据 - /// - /// - /// - public async Task QueryByIdSplit(object objId) - { - return await _db.Queryable().In(objId).SplitTable(tabs => tabs).SingleAsync(); - } + //精准找单个表 + var tableName = _db.SplitHelper().GetTableName(dateTime); //根据时间获取表名 + return await _db.Deleteable().AS(tableName).Where(entity).ExecuteCommandHasChangeAsync(); + } - /// - /// 数据过滤用的查询表达式构建 - /// - /// - /// - protected Expression> CreateFilterExpression() - where TEntity : class - { - Expression> expression = null; + /// + /// 根据ID查找数据 + /// + /// + /// + public async Task QueryByIdSplit(object objId) + { + return await _db.Queryable().In(objId).SplitTable(tabs => tabs).SingleAsync(); + } - //if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity))) - //{ - // Expression> softDeleteFilter = e => !((ISoftDelete)e).IsDeleted; - // expression = expression == null ? softDeleteFilter : CombineExpressions(expression, softDeleteFilter); - //} + /// + /// 数据过滤用的查询表达式构建 + /// + /// + /// + protected Expression> CreateFilterExpression() + where TEntity : class + { + Expression> expression = null; - if (typeof(IMayHaveTenant).IsAssignableFrom(typeof(TEntity)))// && IsMayHaveTenantFilterEnabled) - { - Expression> mayHaveTenantFilter = - e => ((IMayHaveTenant)e).IsEnable == 1; - expression = expression == null - ? mayHaveTenantFilter - : CombineExpressions(expression, mayHaveTenantFilter); - } + //if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity))) + //{ + // Expression> softDeleteFilter = e => !((ISoftDelete)e).IsDeleted; + // expression = expression == null ? softDeleteFilter : CombineExpressions(expression, softDeleteFilter); + //} - return expression; - } - protected Expression> CombineExpressions( - Expression> expression1, Expression> expression2) + if (typeof(IMayHaveTenant).IsAssignableFrom(typeof(TEntity)))// && IsMayHaveTenantFilterEnabled) { - return Common.Helper.ExpressionCombiner.Combine(expression1, expression2); + Expression> mayHaveTenantFilter = + e => ((IMayHaveTenant)e).IsEnable == 1; + expression = expression == null + ? mayHaveTenantFilter + : CombineExpressions(expression, mayHaveTenantFilter); } - #endregion + return expression; } - - public interface IMayHaveTenant + protected Expression> CombineExpressions( + Expression> expression1, Expression> expression2) { - int IsEnable { get; set; } + return Common.Helper.ExpressionCombiner.Combine(expression1, expression2); } + + #endregion +} + +public interface IMayHaveTenant +{ + int IsEnable { get; set; } } \ No newline at end of file diff --git a/Tiobon.Core.Repository/BASE/IBaseRepository.cs b/Tiobon.Core.Repository/BASE/IBaseRepository.cs index d3e814bf..ae71a388 100644 --- a/Tiobon.Core.Repository/BASE/IBaseRepository.cs +++ b/Tiobon.Core.Repository/BASE/IBaseRepository.cs @@ -4,287 +4,286 @@ using System.Data; using System.Linq.Expressions; using Tiobon.Core.Common; -namespace Tiobon.Core.IRepository.Base +namespace Tiobon.Core.IRepository.Base; + +public interface IBaseRepository where TEntity : class { - public interface IBaseRepository where TEntity : class - { - /// - /// SqlsugarClient实体 - /// - ISqlSugarClient Db { get; } + /// + /// SqlsugarClient实体 + /// + ISqlSugarClient Db { get; } - /// - /// 查询实体数据是否存在 - /// - /// - /// - Task AnyAsync(object objId); + /// + /// 查询实体数据是否存在 + /// + /// + /// + Task AnyAsync(object objId); - /// - /// 查询实体数据是否存在 - /// - /// - /// - bool Any(object objId); + /// + /// 查询实体数据是否存在 + /// + /// + /// + bool Any(object objId); - Task AnyAsync(Expression> whereExpression); + Task AnyAsync(Expression> whereExpression); - /// - /// 根据Id查询实体 - /// - /// - /// - Task QueryById(object objId); - Task QueryById(object objId, bool blnUseCache = false); - /// - /// 根据id数组查询实体list - /// - /// - /// - Task> QueryByIDs(object[] lstIds); + /// + /// 根据Id查询实体 + /// + /// + /// + Task QueryById(object objId); + Task QueryById(object objId, bool blnUseCache = false); + /// + /// 根据id数组查询实体list + /// + /// + /// + Task> QueryByIDs(object[] lstIds); - /// - /// 添加 - /// - /// - /// - Task Add(TEntity model); + /// + /// 添加 + /// + /// + /// + Task Add(TEntity model); - /// - /// 批量添加 - /// - /// - /// - Task> Add(List listEntity); + /// + /// 批量添加 + /// + /// + /// + Task> Add(List listEntity); - /// - /// 根据id 删除某一实体 - /// - /// - /// - Task DeleteById(object id); + /// + /// 根据id 删除某一实体 + /// + /// + /// + Task DeleteById(object id); - /// - /// 根据对象，删除某一实体 - /// - /// - /// - Task Delete(TEntity model); + /// + /// 根据对象，删除某一实体 + /// + /// + /// + Task Delete(TEntity model); - /// - /// 根据id数组，删除实体list - /// - /// - /// - Task DeleteByIds(object[] ids); + /// + /// 根据id数组，删除实体list + /// + /// + /// + Task DeleteByIds(object[] ids); - /// - /// 根据表达式，删除实体 - /// - /// - /// - Task Delete(Expression> whereExpression); + /// + /// 根据表达式，删除实体 + /// + /// + /// + Task Delete(Expression> whereExpression); - /// - /// 更新model - /// - /// - /// - Task Update(TEntity model); - /// - /// 更新model - /// - /// - /// - Task Update(List model); + /// + /// 更新model + /// + /// + /// + Task Update(TEntity model); + /// + /// 更新model + /// + /// + /// + Task Update(List model); - /// - /// 根据model，更新，带where条件 - /// - /// - /// - /// - Task Update(TEntity entity, string where); - Task Update(object operateAnonymousObjects); + /// + /// 根据model，更新，带where条件 + /// + /// + /// + /// + Task Update(TEntity entity, string where); + Task Update(object operateAnonymousObjects); - /// - /// 根据model，更新，指定列 - /// - /// - /// - /// - /// - /// - Task Update(TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, string where = ""); + /// + /// 根据model，更新，指定列 + /// + /// + /// + /// + /// + /// + Task Update(TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, string where = ""); - /// - /// 查询 - /// - /// - Task> Query(); + /// + /// 查询 + /// + /// + Task> Query(); - /// - /// 带sql where查询 - /// - /// - /// - Task> Query(string where); + /// + /// 带sql where查询 + /// + /// + /// + Task> Query(string where); - /// - /// 根据表达式查询 - /// - /// - /// - Task> Query(Expression> whereExpression); + /// + /// 根据表达式查询 + /// + /// + /// + Task> Query(Expression> whereExpression); - /// - /// 根据表达式，指定返回对象模型，查询 - /// - /// - /// - /// - Task> Query(Expression> expression); + /// + /// 根据表达式，指定返回对象模型，查询 + /// + /// + /// + /// + Task> Query(Expression> expression); - /// - /// 根据表达式，指定返回对象模型，排序，查询 - /// - /// - /// - /// - /// - /// - Task> Query(Expression> expression, Expression> whereExpression, string orderByFields); - Task> Query(Expression> whereExpression, string orderByFields); - Task> Query(Expression> whereExpression, Expression> orderByExpression, bool isAsc = true); - Task> Query(string where, string orderByFields); + /// + /// 根据表达式，指定返回对象模型，排序，查询 + /// + /// + /// + /// + /// + /// + Task> Query(Expression> expression, Expression> whereExpression, string orderByFields); + Task> Query(Expression> whereExpression, string orderByFields); + Task> Query(Expression> whereExpression, Expression> orderByExpression, bool isAsc = true); + Task> Query(string where, string orderByFields); - Task> Query(Expression> whereExpression, int intTop, string orderByFields); - Task> Query(string where, int intTop, string orderByFields); - Task> QuerySql(string sql, SugarParameter[] parameters = null); - Task QueryTable(string sql, SugarParameter[] parameters = null); + Task> Query(Expression> whereExpression, int intTop, string orderByFields); + Task> Query(string where, int intTop, 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 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> QueryPage(Expression> whereExpression, int pageIndex = 1, int pageSize = 20, string orderByFields = null); - /// - /// 根据表达式，排序字段，分页查询 - /// - /// - /// - /// - /// - /// - Task> QueryFilterPage(QueryBody filter); + /// + /// 根据表达式，排序字段，分页查询 + /// + /// + /// + /// + /// + /// + Task> QueryFilterPage(QueryBody filter); - /// - /// 三表联查 - /// - /// - /// - /// - /// - /// - /// - /// - /// - Task> QueryMuch( - Expression> joinExpression, - Expression> selectExpression, - Expression> whereLambda = null) where T : class, new(); + /// + /// 三表联查 + /// + /// + /// + /// + /// + /// + /// + /// + /// + Task> QueryMuch( + Expression> joinExpression, + Expression> selectExpression, + Expression> whereLambda = null) where T : class, new(); - /// - /// 两表联查-分页 - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - Task> QueryTabsPage( - Expression> joinExpression, - Expression> selectExpression, - Expression> whereExpression, - int pageIndex = 1, - int pageSize = 20, - string orderByFields = null); + /// + /// 两表联查-分页 + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + Task> QueryTabsPage( + Expression> joinExpression, + Expression> selectExpression, + Expression> whereExpression, + int pageIndex = 1, + int pageSize = 20, + string orderByFields = null); - /// - /// 两表联合查询-分页-分组 - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - Task> QueryTabsPage( - Expression> joinExpression, - Expression> selectExpression, - Expression> whereExpression, - Expression> groupExpression, - int pageIndex = 1, - int pageSize = 20, - string orderByFields = null); + /// + /// 两表联合查询-分页-分组 + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + Task> QueryTabsPage( + Expression> joinExpression, + Expression> selectExpression, + Expression> whereExpression, + Expression> groupExpression, + int pageIndex = 1, + int pageSize = 20, + string orderByFields = null); - #region 分表 - /// - /// 通过ID查询 - /// - /// - /// - 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 - } + #region 分表 + /// + /// 通过ID查询 + /// + /// + /// + 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.Repository/IRoleModulePermissionRepository.cs b/Tiobon.Core.Repository/IRoleModulePermissionRepository.cs index 1371586e..9a925177 100644 --- a/Tiobon.Core.Repository/IRoleModulePermissionRepository.cs +++ b/Tiobon.Core.Repository/IRoleModulePermissionRepository.cs @@ -1,24 +1,21 @@ using Tiobon.Core.IRepository.Base; using Tiobon.Core.Model.Models; -using System.Collections.Generic; -using System.Threading.Tasks; -namespace Tiobon.Core.IRepository +namespace Tiobon.Core.IRepository; + +/// +/// IRoleModulePermissionRepository +/// +public interface IRoleModulePermissionRepository : IBaseRepository//类名 { + Task> QueryMuchTable(); + Task> RoleModuleMaps(); + Task> GetRMPMaps(); /// - /// IRoleModulePermissionRepository - /// - public interface IRoleModulePermissionRepository : IBaseRepository//类名 - { - Task> QueryMuchTable(); - Task> RoleModuleMaps(); - Task> GetRMPMaps(); - /// - /// 批量更新菜单与接口的关系 - /// - /// 菜单主键 - /// 接口主键 - /// - Task UpdateModuleId(long permissionId, long moduleId); - } + /// 批量更新菜单与接口的关系 + /// + /// 菜单主键 + /// 接口主键 + /// + Task UpdateModuleId(long permissionId, long moduleId); } diff --git a/Tiobon.Core.Repository/RoleModulePermissionRepository.cs b/Tiobon.Core.Repository/RoleModulePermissionRepository.cs index 6f9bba35..7e3898c8 100644 --- a/Tiobon.Core.Repository/RoleModulePermissionRepository.cs +++ b/Tiobon.Core.Repository/RoleModulePermissionRepository.cs @@ -1,109 +1,105 @@ +using SqlSugar; using Tiobon.Core.IRepository; using Tiobon.Core.Model.Models; using Tiobon.Core.Repository.Base; -using SqlSugar; -using System.Collections.Generic; -using System.Threading.Tasks; using Tiobon.Core.Repository.UnitOfWorks; -namespace Tiobon.Core.Repository +namespace Tiobon.Core.Repository; + +/// +/// RoleModulePermissionRepository +/// +public class RoleModulePermissionRepository : BaseRepository, IRoleModulePermissionRepository { - /// - /// RoleModulePermissionRepository - /// - public class RoleModulePermissionRepository : BaseRepository, IRoleModulePermissionRepository + public RoleModulePermissionRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage) { - public RoleModulePermissionRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage) - { - } - - public async Task> QueryMuchTable() - { - return await QueryMuch( - (rmp, m, p) => new object[] { - JoinType.Left, rmp.ModuleId == m.Id, - JoinType.Left, rmp.PermissionId == p.Id - }, + } - (rmp, m, p) => new TestMuchTableResult() - { - moduleName = m.Name, - permName = p.Name, - rid = rmp.RoleId, - mid = rmp.ModuleId, - pid = rmp.PermissionId - }, + public async Task> QueryMuchTable() + { + return await QueryMuch( + (rmp, m, p) => new object[] { + JoinType.Left, rmp.ModuleId == m.Id, + JoinType.Left, rmp.PermissionId == p.Id + }, - (rmp, m, p) => rmp.IsDeleted == false - ); - } + (rmp, m, p) => new TestMuchTableResult() + { + moduleName = m.Name, + permName = p.Name, + rid = rmp.RoleId, + mid = rmp.ModuleId, + pid = rmp.PermissionId + }, - /// - /// 角色权限Map - /// RoleModulePermission, Module, Role 三表联合 - /// 第四个类型 RoleModulePermission 是返回值 - /// - /// - public async Task> RoleModuleMaps() - { - return await QueryMuch( - (rmp, m, r) => new object[] { - JoinType.Left, rmp.ModuleId == m.Id, - JoinType.Left, rmp.RoleId == r.Id - }, + (rmp, m, p) => rmp.IsDeleted == false + ); + } - (rmp, m, r) => new RoleModulePermission() - { - Role = r, - Module = m, - IsDeleted = rmp.IsDeleted - }, + /// + /// 角色权限Map + /// RoleModulePermission, Module, Role 三表联合 + /// 第四个类型 RoleModulePermission 是返回值 + /// + /// + public async Task> RoleModuleMaps() + { + return await QueryMuch( + (rmp, m, r) => new object[] { + JoinType.Left, rmp.ModuleId == m.Id, + JoinType.Left, rmp.RoleId == r.Id + }, - (rmp, m, r) => rmp.IsDeleted == false && m.IsDeleted == false && r.IsDeleted == false - ); - } + (rmp, m, r) => new RoleModulePermission() + { + Role = r, + Module = m, + IsDeleted = rmp.IsDeleted + }, + (rmp, m, r) => rmp.IsDeleted == false && m.IsDeleted == false && r.IsDeleted == false + ); + } - /// - /// 查询出角色-菜单-接口关系表全部Map属性数据 - /// - /// - public async Task> GetRMPMaps() - { - return await Db.Queryable() - .Mapper(rmp => rmp.Module, rmp => rmp.ModuleId) - .Mapper(rmp => rmp.Permission, rmp => rmp.PermissionId) - .Mapper(rmp => rmp.Role, rmp => rmp.RoleId) - .Where(d => d.IsDeleted == false) - .ToListAsync(); - } + /// + /// 查询出角色-菜单-接口关系表全部Map属性数据 + /// + /// + public async Task> GetRMPMaps() + { + return await Db.Queryable() + .Mapper(rmp => rmp.Module, rmp => rmp.ModuleId) + .Mapper(rmp => rmp.Permission, rmp => rmp.PermissionId) + .Mapper(rmp => rmp.Role, rmp => rmp.RoleId) + .Where(d => d.IsDeleted == false) + .ToListAsync(); + } - /// - /// 查询出角色-菜单-接口关系表全部Map属性数据 - /// - /// - public async Task> GetRMPMapsPage() - { - return await Db.Queryable() - .Mapper(rmp => rmp.Module, rmp => rmp.ModuleId) - .Mapper(rmp => rmp.Permission, rmp => rmp.PermissionId) - .Mapper(rmp => rmp.Role, rmp => rmp.RoleId) - .ToPageListAsync(1, 5, 10); - } - /// - /// 批量更新菜单与接口的关系 - /// - /// 菜单主键 - /// 接口主键 - /// - public async Task UpdateModuleId(long permissionId, long moduleId) - { - await Db.Updateable(it => it.ModuleId == moduleId).Where( - it => it.PermissionId == permissionId).ExecuteCommandAsync(); - } + /// + /// 查询出角色-菜单-接口关系表全部Map属性数据 + /// + /// + public async Task> GetRMPMapsPage() + { + return await Db.Queryable() + .Mapper(rmp => rmp.Module, rmp => rmp.ModuleId) + .Mapper(rmp => rmp.Permission, rmp => rmp.PermissionId) + .Mapper(rmp => rmp.Role, rmp => rmp.RoleId) + .ToPageListAsync(1, 5, 10); } + /// + /// 批量更新菜单与接口的关系 + /// + /// 菜单主键 + /// 接口主键 + /// + public async Task UpdateModuleId(long permissionId, long moduleId) + { + await Db.Updateable(it => it.ModuleId == moduleId).Where( + it => it.PermissionId == permissionId).ExecuteCommandAsync(); + } } \ No newline at end of file diff --git a/Tiobon.Core.Services/BASE/BaseServices.cs b/Tiobon.Core.Services/BASE/BaseServices.cs index 749b3c9c..c8856d3c 100644 --- a/Tiobon.Core.Services/BASE/BaseServices.cs +++ b/Tiobon.Core.Services/BASE/BaseServices.cs @@ -1,28 +1,4 @@ -using System.Data; -using System.Dynamic; -using System.Linq.Expressions; -using AgileObjects.AgileMapper; -using Microsoft.AspNetCore.Http; -using Newtonsoft.Json.Linq; -using SqlSugar; -using Tiobon.Core.Common; -using Tiobon.Core.Common.Caches; -using Tiobon.Core.Common.DB.Dapper; -using Tiobon.Core.Common.DB.Dapper.Extensions; -using Tiobon.Core.Common.Enums; -using Tiobon.Core.Common.Extensions; -using Tiobon.Core.Common.Helper; -using Tiobon.Core.Common.UserManager; -using Tiobon.Core.DataAccess; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices.BASE; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using System.Reflection; -using System.Collections; -using Tiobon.Core.Model.ViewModels.Extend; - -namespace Tiobon.Core.Services.BASE; +namespace Tiobon.Core.Services.BASE; /// /// 增删改查基础服务 diff --git a/Tiobon.Core.Services/BASE/BaseServices1.cs b/Tiobon.Core.Services/BASE/BaseServices1.cs index f8bab0dc..ff9e112a 100644 --- a/Tiobon.Core.Services/BASE/BaseServices1.cs +++ b/Tiobon.Core.Services/BASE/BaseServices1.cs @@ -1,12 +1,4 @@ -using System.Data; -using System.Linq.Expressions; -using SqlSugar; -using Tiobon.Core.Common.Helper; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices.BASE; -using Tiobon.Core.Model; - -namespace Tiobon.Core.Services.BASE; +namespace Tiobon.Core.Services.BASE; public class BaseServices : IBaseServices where TEntity : class, new() { diff --git a/Tiobon.Core.Services/BlogArticleServices.cs b/Tiobon.Core.Services/BlogArticleServices.cs index e90b6625..e28b802d 100644 --- a/Tiobon.Core.Services/BlogArticleServices.cs +++ b/Tiobon.Core.Services/BlogArticleServices.cs @@ -1,20 +1,9 @@ -using AutoMapper; -using Tiobon.Core.Common; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Model.ViewModels; -using Tiobon.Core.Services.BASE; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Tiobon.Core.Services +namespace Tiobon.Core.Services { public class TiobonArticleServices : BaseServices, ITiobonArticleServices { - IMapper _mapper; - public TiobonArticleServices(IMapper mapper) + AutoMapper.IMapper _mapper; + public TiobonArticleServices(AutoMapper.IMapper mapper) { this._mapper = mapper; } diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs index b1f3af72..394073c0 100644 --- a/Tiobon.Core.Services/CommonServices.cs +++ b/Tiobon.Core.Services/CommonServices.cs @@ -2,17 +2,12 @@ using System.Text.RegularExpressions; using AgileObjects.AgileMapper; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.HttpResults; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using NPOI.OpenXmlFormats.Spreadsheet; -using SqlSugar; -using SqlSugar.Extensions; using Tiobon.Core.Common; using Tiobon.Core.Common.DB.Dapper; -using Tiobon.Core.Common.DB.Dapper.Extensions; using Tiobon.Core.Common.Helper; using Tiobon.Core.DataAccess; using Tiobon.Core.IServices; diff --git a/Tiobon.Core.Services/Extensions/AppServiceExtensions.cs b/Tiobon.Core.Services/Extensions/AppServiceExtensions.cs index f594a86c..3b840257 100644 --- a/Tiobon.Core.Services/Extensions/AppServiceExtensions.cs +++ b/Tiobon.Core.Services/Extensions/AppServiceExtensions.cs @@ -1,8 +1,5 @@ -using Tiobon.Core.Repository.Base; -using Microsoft.Extensions.DependencyInjection; -using System.Reflection; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Services.BASE; +using Microsoft.Extensions.DependencyInjection; +using Tiobon.Core.Repository.Base; namespace Tiobon.Core.Services.Extensions; diff --git a/Tiobon.Core.Services/Ghra/Ghra_JobServices.cs b/Tiobon.Core.Services/Ghra/Ghra_JobServices.cs index 3ec4bc35..8981c36f 100644 --- a/Tiobon.Core.Services/Ghra/Ghra_JobServices.cs +++ b/Tiobon.Core.Services/Ghra/Ghra_JobServices.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_Job (服务) +/// +public class Ghra_JobServices : BaseServices, IGhra_JobServices { - /// - /// Ghra_Job (服务) - /// - public class Ghra_JobServices : BaseServices, IGhra_JobServices + private readonly IBaseRepository _dal; + public Ghra_JobServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghra_JobServices(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_StaffLicenceServices.cs b/Tiobon.Core.Services/Ghra/Ghra_StaffLicenceServices.cs index 0b8648d0..86bec525 100644 --- a/Tiobon.Core.Services/Ghra/Ghra_StaffLicenceServices.cs +++ b/Tiobon.Core.Services/Ghra/Ghra_StaffLicenceServices.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_StaffLicence (服务) +/// +public class Ghra_StaffLicenceServices : BaseServices, IGhra_StaffLicenceServices { - /// - /// Ghra_StaffLicence (服务) - /// - public class Ghra_StaffLicenceServices : BaseServices, IGhra_StaffLicenceServices + private readonly IBaseRepository _dal; + public Ghra_StaffLicenceServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghra_StaffLicenceServices(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_StaffServices.cs b/Tiobon.Core.Services/Ghra/Ghra_StaffServices.cs index 5c565eed..eb63b68f 100644 --- a/Tiobon.Core.Services/Ghra/Ghra_StaffServices.cs +++ b/Tiobon.Core.Services/Ghra/Ghra_StaffServices.cs @@ -1,14 +1,4 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using Tiobon.Core.Common; -using Tiobon.Core.Model; -using Tiobon.Core.Common.Helper; - -namespace Tiobon.Core.Services; +namespace Tiobon.Core.Services; /// /// Ghra_Staff (服务) diff --git a/Tiobon.Core.Services/Ghra/Ghra_StaffTrainingServices.cs b/Tiobon.Core.Services/Ghra/Ghra_StaffTrainingServices.cs index 60a29ed7..4f3f91ae 100644 --- a/Tiobon.Core.Services/Ghra/Ghra_StaffTrainingServices.cs +++ b/Tiobon.Core.Services/Ghra/Ghra_StaffTrainingServices.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_StaffTraining (服务) +/// +public class Ghra_StaffTrainingServices : BaseServices, IGhra_StaffTrainingServices { - /// - /// Ghra_StaffTraining (服务) - /// - public class Ghra_StaffTrainingServices : BaseServices, IGhra_StaffTrainingServices + private readonly IBaseRepository _dal; + public Ghra_StaffTrainingServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghra_StaffTrainingServices(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_TitleServices.cs b/Tiobon.Core.Services/Ghra/Ghra_TitleServices.cs index 9b366c2f..1de8946b 100644 --- a/Tiobon.Core.Services/Ghra/Ghra_TitleServices.cs +++ b/Tiobon.Core.Services/Ghra/Ghra_TitleServices.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_Title (服务) +/// +public class Ghra_TitleServices : BaseServices, IGhra_TitleServices { - /// - /// Ghra_Title (服务) - /// - public class Ghra_TitleServices : BaseServices, IGhra_TitleServices + private readonly IBaseRepository _dal; + public Ghra_TitleServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghra_TitleServices(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_ZoneServices.cs b/Tiobon.Core.Services/Ghra/Ghra_ZoneServices.cs index 146d9f30..b6c637d9 100644 --- a/Tiobon.Core.Services/Ghra/Ghra_ZoneServices.cs +++ b/Tiobon.Core.Services/Ghra/Ghra_ZoneServices.cs @@ -1,23 +1,15 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 厂区 (服务) +/// +public class Ghra_ZoneServices : BaseServices, IGhra_ZoneServices { - /// - /// 厂区 (服务) - /// - public class Ghra_ZoneServices : BaseServices, IGhra_ZoneServices + private readonly IBaseRepository _dal; + public Ghra_ZoneServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghra_ZoneServices(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 befdafba..b9b2df9d 100644 --- a/Tiobon.Core.Services/Ghra_GradeServices.cs +++ b/Tiobon.Core.Services/Ghra_GradeServices.cs @@ -1,14 +1,8 @@ - -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 { - /// - /// 年级 (服务) - /// + /// + /// 年级 (服务) + /// public class Ghra_GradeServices : BaseServices, IGhra_GradeServices { private readonly IBaseRepository _dal; diff --git a/Tiobon.Core.Services/Ghre/Ghre_AttachmentServices.cs b/Tiobon.Core.Services/Ghre/Ghre_AttachmentServices.cs index 19b85f18..b7521e4a 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_AttachmentServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_AttachmentServices.cs @@ -1,124 +1,109 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using System.Dynamic; -using SqlSugar; -using Tiobon.Core.Model; -using Tiobon.Core.DataAccess; -using NPOI.HPSF; -using SharpCompress.Common; -using Tiobon.Core.Common; -using Tiobon.Core.Model.ViewModels; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 附件 (服务) +/// +public class Ghre_AttachmentServices : BaseServices, IGhre_AttachmentServices { - /// - /// 附件 (服务) - /// - public class Ghre_AttachmentServices : BaseServices, IGhre_AttachmentServices + private readonly IBaseRepository _dal; + public Ghre_AttachmentServices(IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghre_AttachmentServices(IBaseRepository dal) + this._dal = dal; + base.BaseDal = dal; + } + + public async Task> UploadVideoAsync(ChunkUpload upload) + { + var file = upload.file; + var path = $"{$"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}wwwroot{Path.DirectorySeparatorChar}files{Path.DirectorySeparatorChar}upload{Path.DirectorySeparatorChar}{upload.id}{Path.DirectorySeparatorChar}"}"; + if (!Directory.Exists(path)) + Directory.CreateDirectory(path); + using (var stream = File.Create(path + $"{upload.chunkIndex}")) { - this._dal = dal; - base.BaseDal = dal; + await file.CopyToAsync(stream); } - public async Task> UploadVideoAsync(ChunkUpload upload) + if (upload.chunkIndex == upload.totalChunks - 1) { - var file = upload.file; - var path = $"{$"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}wwwroot{Path.DirectorySeparatorChar}files{Path.DirectorySeparatorChar}upload{Path.DirectorySeparatorChar}{upload.id}{Path.DirectorySeparatorChar}"}"; - if (!Directory.Exists(path)) - Directory.CreateDirectory(path); - using (var stream = File.Create(path + $"{upload.chunkIndex}")) + var ext = string.Empty; + if (string.IsNullOrEmpty(file.FileName) == false) { - await file.CopyToAsync(stream); + var dotPos = upload.fileName.LastIndexOf('.'); + ext = upload.fileName.Substring(dotPos + 1); } + var id = SnowFlakeSingle.Instance.NextId(); + await FileMerge(upload.id, "."+ ext, id); + using var _context = ContextFactory.CreateContext(); - if (upload.chunkIndex == upload.totalChunks - 1) + + var filePath = $"/files/upload/{id}.{ext}"; + var fileAttachment = new Ghre_Attachment(); + fileAttachment.Id = SnowFlakeSingle.Instance.NextId(); + fileAttachment.AttachmentNo = upload.file.FileName; + fileAttachment.AttachFileName = upload.file.FileName; + fileAttachment.CreateBy = App.User.ID; + fileAttachment.CreateTime = DateTime.Now; + fileAttachment.AttachmentName = upload.fileName; + fileAttachment.AttachFileExtension = ext; + fileAttachment.AttachFileSize = upload.file.Length; + fileAttachment.PhysicsPath = filePath; + fileAttachment.RelativePath = filePath; + fileAttachment.FileURL = filePath; + fileAttachment.ThumbnailPath = filePath; + fileAttachment.AttachmentType = upload.file.ContentType; + //url = fileName + "." + ext; + _context.Add(fileAttachment); + _context.SaveChanges(); + return ServiceResult.OprateSuccess("", new FileUploadResult() { - var ext = string.Empty; - if (string.IsNullOrEmpty(file.FileName) == false) - { - var dotPos = upload.fileName.LastIndexOf('.'); - ext = upload.fileName.Substring(dotPos + 1); - } - var id = SnowFlakeSingle.Instance.NextId(); - await FileMerge(upload.id, "."+ ext, id); - using var _context = ContextFactory.CreateContext(); - - - var filePath = $"/files/upload/{id}.{ext}"; - var fileAttachment = new Ghre_Attachment(); - fileAttachment.Id = SnowFlakeSingle.Instance.NextId(); - fileAttachment.AttachmentNo = upload.file.FileName; - fileAttachment.AttachFileName = upload.file.FileName; - fileAttachment.CreateBy = App.User.ID; - fileAttachment.CreateTime = DateTime.Now; - fileAttachment.AttachmentName = upload.fileName; - fileAttachment.AttachFileExtension = ext; - fileAttachment.AttachFileSize = upload.file.Length; - fileAttachment.PhysicsPath = filePath; - fileAttachment.RelativePath = filePath; - fileAttachment.FileURL = filePath; - fileAttachment.ThumbnailPath = filePath; - fileAttachment.AttachmentType = upload.file.ContentType; - //url = fileName + "." + ext; - _context.Add(fileAttachment); - _context.SaveChanges(); - return ServiceResult.OprateSuccess("", new FileUploadResult() - { - Id = fileAttachment.Id, - AttachFileExtension = fileAttachment.AttachFileExtension, - AttachFileName = fileAttachment.AttachFileName, - AttachmentName = fileAttachment.AttachmentName, - AttachmentNo = fileAttachment.AttachmentNo, - FileURL = "/Advanced" + fileAttachment.FileURL, - PhysicsPath = "/Advanced" + fileAttachment.PhysicsPath, - RelativePath = "/Advanced" + fileAttachment.RelativePath, - ThumbnailPath = "/Advanced" + fileAttachment.ThumbnailPath, - AttachFileSize = fileAttachment.AttachFileSize, - }); - } - return ServiceResult.OprateSuccess("", null); + Id = fileAttachment.Id, + AttachFileExtension = fileAttachment.AttachFileExtension, + AttachFileName = fileAttachment.AttachFileName, + AttachmentName = fileAttachment.AttachmentName, + AttachmentNo = fileAttachment.AttachmentNo, + FileURL = "/Advanced" + fileAttachment.FileURL, + PhysicsPath = "/Advanced" + fileAttachment.PhysicsPath, + RelativePath = "/Advanced" + fileAttachment.RelativePath, + ThumbnailPath = "/Advanced" + fileAttachment.ThumbnailPath, + AttachFileSize = fileAttachment.AttachFileSize, + }); } + return ServiceResult.OprateSuccess("", null); + } - public static async Task FileMerge(string lastModified, string fileExts, long NewfileName) + public static async Task FileMerge(string lastModified, string fileExts, long NewfileName) + { + string erro = ""; + bool ok = false; + try { - string erro = ""; - bool ok = false; - try - { - string wwwroot = $"{Directory.GetCurrentDirectory()}/wwwroot/files/upload/"; - var temporary = Path.Combine(wwwroot, lastModified);//临时文件夹 - //fileName = Request.Form["fileName"];//文件名 - string fileExt = fileExts;//获取文件后缀 - var files = Directory.GetFiles(temporary);//获得下面的所有文件 - DirectoryInfo di = new DirectoryInfo(wwwroot + NewfileName + "/"); - if (!di.Exists) - di.Create(); - - var finalPath = Path.Combine(wwwroot, NewfileName + fileExt);//最终的文件名（demo中保存的是它上传时候的文件名，实际操作肯定不能这样） - var fs = new FileStream(finalPath, FileMode.Create); - foreach (var part in files.OrderBy(x => x.Length).ThenBy(x => x))//排一下序，保证从0-N Write - { - var bytes = File.ReadAllBytes(part); - await fs.WriteAsync(bytes, 0, bytes.Length); - bytes = null; - //System.IO.File.Delete(part);//删除分块 - } - fs.Close(); + string wwwroot = $"{Directory.GetCurrentDirectory()}/wwwroot/files/upload/"; + var temporary = Path.Combine(wwwroot, lastModified);//临时文件夹 + //fileName = Request.Form["fileName"];//文件名 + string fileExt = fileExts;//获取文件后缀 + var files = Directory.GetFiles(temporary);//获得下面的所有文件 + DirectoryInfo di = new DirectoryInfo(wwwroot + NewfileName + "/"); + if (!di.Exists) + di.Create(); - //Directory.Delete(temporary);//删除文件夹 - ok = true; - } - catch (Exception ex) + var finalPath = Path.Combine(wwwroot, NewfileName + fileExt);//最终的文件名（demo中保存的是它上传时候的文件名，实际操作肯定不能这样） + var fs = new FileStream(finalPath, FileMode.Create); + foreach (var part in files.OrderBy(x => x.Length).ThenBy(x => x))//排一下序，保证从0-N Write { - erro = ex.Message; + var bytes = File.ReadAllBytes(part); + await fs.WriteAsync(bytes, 0, bytes.Length); + bytes = null; + //System.IO.File.Delete(part);//删除分块 } - return ok; + fs.Close(); + + //Directory.Delete(temporary);//删除文件夹 + ok = true; + } + catch (Exception ex) + { + erro = ex.Message; } + return ok; } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghre/Ghre_CertificateRuleServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CertificateRuleServices.cs index 7015edbe..2cc0d221 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CertificateRuleServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CertificateRuleServices.cs @@ -1,15 +1,4 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using Tiobon.Core.Common; -using Tiobon.Core.Model; -using Newtonsoft.Json.Linq; -using Newtonsoft.Json; - -namespace Tiobon.Core.Services; +namespace Tiobon.Core.Services; /// /// 培训证书规则 (服务) diff --git a/Tiobon.Core.Services/Ghre/Ghre_CertificateServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CertificateServices.cs index b5df214e..65ff94d1 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CertificateServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CertificateServices.cs @@ -1,20 +1,8 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using Newtonsoft.Json.Linq; -using Tiobon.Core.Common; -using Tiobon.Core.Model; -using Newtonsoft.Json; -using Tiobon.Core.Common.Helper; - -namespace Tiobon.Core.Services; - - /// - /// 培训记录 (服务) - /// +namespace Tiobon.Core.Services; + +/// +/// 培训记录 (服务) +/// public class Ghre_CertificateServices : BaseServices, IGhre_CertificateServices { private readonly IBaseRepository _dal; diff --git a/Tiobon.Core.Services/Ghre/Ghre_ConfigServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ConfigServices.cs index 94a19480..15a60a88 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ConfigServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ConfigServices.cs @@ -1,38 +1,29 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using Tiobon.Core.Model; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 参数配置 (服务) +/// +public class Ghre_ConfigServices : BaseServices, IGhre_ConfigServices { - /// - /// 参数配置 (服务) - /// - public class Ghre_ConfigServices : BaseServices, IGhre_ConfigServices + private readonly IBaseRepository _dal; + public Ghre_ConfigServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghre_ConfigServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } - public async Task BulkUpdateValue(List entitys) + public async Task BulkUpdateValue(List entitys) + { + for (int i = 0; i < entitys.Count; i++) { - for (int i = 0; i < entitys.Count; i++) - { - await Db.Updateable() - .SetColumns(it => new Ghre_Config() - { - ConfigValue = entitys[i].ConfigValue - }) - .Where(x => x.Id == entitys[i].Id).ExecuteCommandAsync(); - } - return ServiceResult.OprateSuccess(); + await Db.Updateable() + .SetColumns(it => new Ghre_Config() + { + ConfigValue = entitys[i].ConfigValue + }) + .Where(x => x.Id == entitys[i].Id).ExecuteCommandAsync(); } + return ServiceResult.OprateSuccess(); } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseClassServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseClassServices.cs index 7a842eaf..a18d6c7c 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CourseClassServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CourseClassServices.cs @@ -1,24 +1,16 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 课程分类 (服务) +/// +public class Ghre_CourseClassServices : BaseServices, IGhre_CourseClassServices { - /// - /// 课程分类 (服务) - /// - public class Ghre_CourseClassServices : BaseServices, IGhre_CourseClassServices - { - private readonly IBaseRepository _dal; + private readonly IBaseRepository _dal; - public Ghre_CourseClassServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } + public Ghre_CourseClassServices(ICaching caching, IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseSceneServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseSceneServices.cs index d19acdc8..5d93a27d 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CourseSceneServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CourseSceneServices.cs @@ -1,16 +1,4 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using Tiobon.Core.Common; -using Tiobon.Core.Model; -using Tiobon.Core.Common.Helper; -using MathNet.Numerics.Distributions; -using NPOI.Util.Collections; - -namespace Tiobon.Core.Services; +namespace Tiobon.Core.Services; /// /// 课程场景 (服务) diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseSnapServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseSnapServices.cs index 416deaaa..a1a8e544 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CourseSnapServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CourseSnapServices.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 +/// +/// Ghre_CourseSnap (服务) +/// +public class Ghre_CourseSnapServices : BaseServices, IGhre_CourseSnapServices { - /// - /// Ghre_CourseSnap (服务) - /// - public class Ghre_CourseSnapServices : BaseServices, IGhre_CourseSnapServices + private readonly IBaseRepository _dal; + public Ghre_CourseSnapServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghre_CourseSnapServices(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/Ghre/Ghre_CourseWareAttachmentServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseWareAttachmentServices.cs index 75328e3c..d868a184 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CourseWareAttachmentServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CourseWareAttachmentServices.cs @@ -1,23 +1,15 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 课件附件 (服务) +/// +public class Ghre_CourseWareAttachmentServices : BaseServices, IGhre_CourseWareAttachmentServices { - /// - /// 课件附件 (服务) - /// - public class Ghre_CourseWareAttachmentServices : BaseServices, IGhre_CourseWareAttachmentServices + private readonly IBaseRepository _dal; + public Ghre_CourseWareAttachmentServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghre_CourseWareAttachmentServices(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/Ghre/Ghre_CourseWareServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseWareServices.cs index cd14d64e..85271348 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CourseWareServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CourseWareServices.cs @@ -1,18 +1,5 @@ - -using System.Data; +using Microsoft.AspNetCore.Hosting; using System.IO.Compression; -using Microsoft.AspNetCore.Hosting; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using SqlSugar; -using Tiobon.Core.Common; -using Tiobon.Core.Common.Caches; -using Tiobon.Core.Common.Helper; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; namespace Tiobon.Core.Services; diff --git a/Tiobon.Core.Services/Ghre/Ghre_CreditPointServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CreditPointServices.cs index d2ebee72..1a03b315 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CreditPointServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CreditPointServices.cs @@ -1,16 +1,4 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using Newtonsoft.Json.Linq; -using SqlSugar; -using Tiobon.Core.Common; -using Tiobon.Core.Model; -using Newtonsoft.Json; - -namespace Tiobon.Core.Services; +namespace Tiobon.Core.Services; /// /// 学分记录 (服务) diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamMessageLogServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamMessageLogServices.cs index 518c9fb7..4678e2f2 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamMessageLogServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamMessageLogServices.cs @@ -1,23 +1,15 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 考试通知记录 (服务) +/// +public class Ghre_ExamMessageLogServices : BaseServices, IGhre_ExamMessageLogServices { - /// - /// 考试通知记录 (服务) - /// - public class Ghre_ExamMessageLogServices : BaseServices, IGhre_ExamMessageLogServices + private readonly IBaseRepository _dal; + public Ghre_ExamMessageLogServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghre_ExamMessageLogServices(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/Ghre/Ghre_ExamPaperConfigServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamPaperConfigServices.cs index 24985f2e..02ec6889 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamPaperConfigServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamPaperConfigServices.cs @@ -1,21 +1,14 @@ - -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 +/// +/// 试卷配置 (服务) +/// +public class Ghre_ExamPaperConfigServices : BaseServices, IGhre_ExamPaperConfigServices { - /// - /// 试卷配置 (服务) - /// - public class Ghre_ExamPaperConfigServices : BaseServices, IGhre_ExamPaperConfigServices + private readonly IBaseRepository _dal; + public Ghre_ExamPaperConfigServices(IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghre_ExamPaperConfigServices(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_ExamPaperQuestionServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamPaperQuestionServices.cs index 3bf2288d..c4315ef2 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamPaperQuestionServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamPaperQuestionServices.cs @@ -1,21 +1,14 @@ - -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 +/// +/// 试卷题目 (服务) +/// +public class Ghre_ExamPaperQuestionServices : BaseServices, IGhre_ExamPaperQuestionServices { - /// - /// 试卷题目 (服务) - /// - public class Ghre_ExamPaperQuestionServices : BaseServices, IGhre_ExamPaperQuestionServices + private readonly IBaseRepository _dal; + public Ghre_ExamPaperQuestionServices(IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghre_ExamPaperQuestionServices(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_ExamPaperServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs index 015a5216..6bec660a 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs @@ -1,21 +1,6 @@ - -using System.Data; +using MongoDB.Driver.Linq; using System.Net; using System.Text.RegularExpressions; -using AgileObjects.AgileMapper; -using Microsoft.AspNetCore.Http; -using MongoDB.Driver.Linq; -using Newtonsoft.Json.Linq; -using SqlSugar; -using Tiobon.Core.Common; -using Tiobon.Core.Common.Caches; -using Tiobon.Core.Common.Helper; -using Tiobon.Core.Common.UserManager; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; namespace Tiobon.Core.Services; diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordAnswerServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordAnswerServices.cs index 3bde86f3..997e49fb 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordAnswerServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordAnswerServices.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 +/// +/// Ghre_ExamRecordAnswer (服务) +/// +public class Ghre_ExamRecordAnswerServices : BaseServices, IGhre_ExamRecordAnswerServices { - /// - /// Ghre_ExamRecordAnswer (服务) - /// - public class Ghre_ExamRecordAnswerServices : BaseServices, IGhre_ExamRecordAnswerServices + private readonly IBaseRepository _dal; + public Ghre_ExamRecordAnswerServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghre_ExamRecordAnswerServices(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/Ghre/Ghre_ExamRecordDetailServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordDetailServices.cs index b514f278..15dda054 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordDetailServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordDetailServices.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 +/// +/// Ghre_ExamRecordDetail (服务) +/// +public class Ghre_ExamRecordDetailServices : BaseServices, IGhre_ExamRecordDetailServices { - /// - /// Ghre_ExamRecordDetail (服务) - /// - public class Ghre_ExamRecordDetailServices : BaseServices, IGhre_ExamRecordDetailServices + private readonly IBaseRepository _dal; + public Ghre_ExamRecordDetailServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghre_ExamRecordDetailServices(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/Ghre/Ghre_ExamRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs index 86216c4e..a2a513a4 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs @@ -1,21 +1,8 @@ -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using Newtonsoft.Json.Linq; -using Tiobon.Core.Common; -using Tiobon.Core.Model; -using Newtonsoft.Json; -using System.Text.RegularExpressions; +using AgileObjects.AgileMapper.Extensions; +using MongoDB.Driver.Linq; using System.Net; -using Tiobon.Core.Common.Helper; -using AgileObjects.AgileMapper.Extensions; -using SqlSugar; -using Tiobon.Core.DataAccess; -using System.Data; +using System.Text.RegularExpressions; using static Tiobon.Core.Model.Consts; -using MongoDB.Driver.Linq; namespace Tiobon.Core.Services; diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs index 95d1c093..423f3dba 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs @@ -1,22 +1,4 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using System.Dynamic; -using Tiobon.Core.Model; -using Tiobon.Core.Common; -using AgileObjects.AgileMapper; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using SqlSugar; -using Microsoft.AspNetCore.Http; -using Tiobon.Core.Common.UserManager; -using MongoDB.Driver.Linq; -using Tiobon.Core.Common.DB.Dapper; -using Tiobon.Core.Common.Helper; -using System.Data; +using MongoDB.Driver.Linq; using static Tiobon.Core.Model.Consts; namespace Tiobon.Core.Services; diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamStaffServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamStaffServices.cs index d9427e13..64e78b0d 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamStaffServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamStaffServices.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 +/// +/// Ghre_ExamStaff (服务) +/// +public class Ghre_ExamStaffServices : BaseServices, IGhre_ExamStaffServices { - /// - /// Ghre_ExamStaff (服务) - /// - public class Ghre_ExamStaffServices : BaseServices, IGhre_ExamStaffServices + private readonly IBaseRepository _dal; + public Ghre_ExamStaffServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghre_ExamStaffServices(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/Ghre/Ghre_QuestionAnswerServices.cs b/Tiobon.Core.Services/Ghre/Ghre_QuestionAnswerServices.cs index a511f81d..02153433 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_QuestionAnswerServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_QuestionAnswerServices.cs @@ -1,21 +1,14 @@ - -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 +/// +/// 题目答案 (服务) +/// +public class Ghre_QuestionAnswerServices : BaseServices, IGhre_QuestionAnswerServices { - /// - /// 题目答案 (服务) - /// - public class Ghre_QuestionAnswerServices : BaseServices, IGhre_QuestionAnswerServices + private readonly IBaseRepository _dal; + public Ghre_QuestionAnswerServices(IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghre_QuestionAnswerServices(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_QuestionServices.cs b/Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs index 502d46dd..f9493f24 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs @@ -1,24 +1,8 @@ -using System.Data; -using System.Net; -using AgileObjects.AgileMapper; -using AgileObjects.AgileMapper.Extensions; -using Microsoft.AspNetCore.Http; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using NPOI.HSSF.UserModel; +using NPOI.HSSF.UserModel; using NPOI.SS.UserModel; using NPOI.SS.Util; using NPOI.XSSF.UserModel; -using SqlSugar; -using Tiobon.Core.Common; -using Tiobon.Core.Common.Caches; -using Tiobon.Core.Common.DB.Dapper.Extensions; -using Tiobon.Core.Common.Helper; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; +using System.Net; using static Tiobon.Core.DataAccess.ReportHelper; namespace Tiobon.Core.Services; diff --git a/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs b/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs index 55bf5420..4b3f8392 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs @@ -1,16 +1,4 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using Microsoft.AspNetCore.Http; -using Tiobon.Core.Common.UserManager; -using Tiobon.Core.Model; -using Tiobon.Core.Common.Helper; -using Tiobon.Core.Common; -using static Tiobon.Core.Model.Consts; -using Newtonsoft.Json.Linq; +using static Tiobon.Core.Model.Consts; namespace Tiobon.Core.Services; diff --git a/Tiobon.Core.Services/Ghre/Ghre_RequiredCourseServices.cs b/Tiobon.Core.Services/Ghre/Ghre_RequiredCourseServices.cs index ce8c2945..60eb3838 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_RequiredCourseServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_RequiredCourseServices.cs @@ -1,16 +1,4 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using Newtonsoft.Json.Linq; -using Tiobon.Core.Common; -using Tiobon.Core.Model; -using Newtonsoft.Json; -using Tiobon.Core.Common.Helper; - -namespace Tiobon.Core.Services; +namespace Tiobon.Core.Services; /// /// 必选修查询 (服务) diff --git a/Tiobon.Core.Services/Ghre/Ghre_SchoolAttachmentServices.cs b/Tiobon.Core.Services/Ghre/Ghre_SchoolAttachmentServices.cs index bd95dcdb..bb948f2d 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_SchoolAttachmentServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_SchoolAttachmentServices.cs @@ -1,23 +1,15 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 培训机构附件 (服务) +/// +public class Ghre_SchoolAttachmentServices : BaseServices, IGhre_SchoolAttachmentServices { - /// - /// 培训机构附件 (服务) - /// - public class Ghre_SchoolAttachmentServices : BaseServices, IGhre_SchoolAttachmentServices + private readonly IBaseRepository _dal; + public Ghre_SchoolAttachmentServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghre_SchoolAttachmentServices(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/Ghre/Ghre_SchoolServices.cs b/Tiobon.Core.Services/Ghre/Ghre_SchoolServices.cs index 7064c82c..be9d37c3 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_SchoolServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_SchoolServices.cs @@ -1,16 +1,4 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using Tiobon.Core.Common; -using Tiobon.Core.Model; -using Newtonsoft.Json.Linq; -using Newtonsoft.Json; -using AgileObjects.AgileMapper; - -namespace Tiobon.Core.Services; +namespace Tiobon.Core.Services; /// /// 培训机构 (服务) diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs index 4697c734..729f583d 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs @@ -1,26 +1,10 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using Newtonsoft.Json.Linq; -using Tiobon.Core.Common; -using Tiobon.Core.Model; -using Newtonsoft.Json; -using Tiobon.Core.Common.Helper; -using SqlSugar; -using static Tiobon.Core.Model.Consts; -using NPOI.SS.UserModel; -using static Tiobon.Core.DataAccess.ReportHelper; -using Tiobon.Core.Common.DB.Dapper.Extensions; +using MongoDB.Driver.Linq; using NPOI.HSSF.UserModel; +using NPOI.SS.UserModel; using NPOI.SS.Util; using NPOI.XSSF.UserModel; -using Microsoft.AspNetCore.Http; -using System.Data; -using Tiobon.Core.Model.ViewModels.Extend; -using MongoDB.Driver.Linq; +using static Tiobon.Core.DataAccess.ReportHelper; +using static Tiobon.Core.Model.Consts; namespace Tiobon.Core.Services; diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRuleResultServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRuleResultServices.cs index d7a5071d..06e5183a 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_StudyRuleResultServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRuleResultServices.cs @@ -1,23 +1,15 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 必选修规则结果 (服务) +/// +public class Ghre_StudyRuleResultServices : BaseServices, IGhre_StudyRuleResultServices { - /// - /// 必选修规则结果 (服务) - /// - public class Ghre_StudyRuleResultServices : BaseServices, IGhre_StudyRuleResultServices + private readonly IBaseRepository _dal; + public Ghre_StudyRuleResultServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghre_StudyRuleResultServices(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/Ghre/Ghre_StudyRuleServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs index 8e8866ee..2771c9e1 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs @@ -1,17 +1,4 @@ - -using System.Collections.Generic; -using System.Data; -using MongoDB.Driver.Linq; -using Newtonsoft.Json.Linq; -using SqlSugar; -using Tiobon.Core.Common; -using Tiobon.Core.Common.Caches; -using Tiobon.Core.Common.Helper; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; +using MongoDB.Driver.Linq; namespace Tiobon.Core.Services; diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRuleStaffServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRuleStaffServices.cs index 56a32ff6..165af7ad 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_StudyRuleStaffServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRuleStaffServices.cs @@ -1,23 +1,15 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 必选修规则人员 (服务) +/// +public class Ghre_StudyRuleStaffServices : BaseServices, IGhre_StudyRuleStaffServices { - /// - /// 必选修规则人员 (服务) - /// - public class Ghre_StudyRuleStaffServices : BaseServices, IGhre_StudyRuleStaffServices + private readonly IBaseRepository _dal; + public Ghre_StudyRuleStaffServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghre_StudyRuleStaffServices(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/Ghre/Ghre_TeacherAttachmentServices.cs b/Tiobon.Core.Services/Ghre/Ghre_TeacherAttachmentServices.cs index 9b86fb49..f8be9806 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_TeacherAttachmentServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_TeacherAttachmentServices.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 +/// +/// Ghre_TeacherAttachment (服务) +/// +public class Ghre_TeacherAttachmentServices : BaseServices, IGhre_TeacherAttachmentServices { - /// - /// Ghre_TeacherAttachment (服务) - /// - public class Ghre_TeacherAttachmentServices : BaseServices, IGhre_TeacherAttachmentServices + private readonly IBaseRepository _dal; + public Ghre_TeacherAttachmentServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghre_TeacherAttachmentServices(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/Ghre/Ghre_TeacherChangeAttachmentServices.cs b/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeAttachmentServices.cs index 28252977..38e971a1 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeAttachmentServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeAttachmentServices.cs @@ -1,23 +1,15 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 培训讲师异动附件 (服务) +/// +public class Ghre_TeacherChangeAttachmentServices : BaseServices, IGhre_TeacherChangeAttachmentServices { - /// - /// 培训讲师异动附件 (服务) - /// - public class Ghre_TeacherChangeAttachmentServices : BaseServices, IGhre_TeacherChangeAttachmentServices + private readonly IBaseRepository _dal; + public Ghre_TeacherChangeAttachmentServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghre_TeacherChangeAttachmentServices(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/Ghre/Ghre_TeacherChangeServices.cs b/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs index cc4ddb23..abbc2549 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs @@ -1,19 +1,4 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using Microsoft.AspNetCore.Http; -using static Tiobon.Core.Model.Consts; -using Tiobon.Core.Common.UserManager; -using Tiobon.Core.Common; -using Tiobon.Core.Model; -using AgileObjects.AgileMapper; -using Tiobon.Core.Common.Helper; -using Newtonsoft.Json.Linq; -using MathNet.Numerics.Distributions; -using Microsoft.EntityFrameworkCore.Metadata.Internal; +using static Tiobon.Core.Model.Consts; namespace Tiobon.Core.Services; diff --git a/Tiobon.Core.Services/Ghre/Ghre_TeacherServices.cs b/Tiobon.Core.Services/Ghre/Ghre_TeacherServices.cs index 1d44aff7..46bf7ed3 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_TeacherServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_TeacherServices.cs @@ -1,17 +1,4 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using Tiobon.Core.Common; -using Tiobon.Core.Model; -using AgileObjects.AgileMapper; -using Newtonsoft.Json.Linq; -using Newtonsoft.Json; -using Microsoft.AspNetCore.Http; -using static Tiobon.Core.Model.Consts; -using Tiobon.Core.Common.UserManager; +using static Tiobon.Core.Model.Consts; namespace Tiobon.Core.Services; diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs index 7e63a658..30edf513 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs @@ -1,79 +1,69 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using Tiobon.Core.Common; -using Tiobon.Core.Model; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 人力需求维护 (服务) +/// +public class Ghrh_HumanRequestServices : BaseServices, IGhrh_HumanRequestServices { - /// - /// 人力需求维护 (服务) - /// - public class Ghrh_HumanRequestServices : BaseServices, IGhrh_HumanRequestServices + private readonly IBaseRepository _dal; + public Ghrh_HumanRequestServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrh_HumanRequestServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } - public override async Task> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } + public override async Task> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) + { + var result = await base.QueryFilterPage(filter, condition, IsEnable); + var entitys = result.result.DT_TableDataT1; + + var deptIds = entitys.Where(x => x.ApplyDeptId != null).Select(x => x.ApplyDeptId).ToList(); + //var titleIds = entitys.Where(x => x.TitleId != null).Select(x => x.TitleId).ToList(); + var gradeIds = entitys.Where(x => x.GradeId != null).Select(x => x.GradeId).ToList(); + var jobIds = entitys.Where(x => x.JobId != null).Select(x => x.JobId).ToList(); + deptIds.AddRange(entitys.Where(x => x.BelongDeptId != null).Select(x => x.BelongDeptId).ToList()); + if (deptIds.Any()) { - var result = await base.QueryFilterPage(filter, condition, IsEnable); - var entitys = result.result.DT_TableDataT1; + var depts = await Db.Queryable().Where(x => deptIds.Contains(x.DeptID)).ToListAsync(); - var deptIds = entitys.Where(x => x.ApplyDeptId != null).Select(x => x.ApplyDeptId).ToList(); - //var titleIds = entitys.Where(x => x.TitleId != null).Select(x => x.TitleId).ToList(); - var gradeIds = entitys.Where(x => x.GradeId != null).Select(x => x.GradeId).ToList(); - var jobIds = entitys.Where(x => x.JobId != null).Select(x => x.JobId).ToList(); - deptIds.AddRange(entitys.Where(x => x.BelongDeptId != null).Select(x => x.BelongDeptId).ToList()); - if (deptIds.Any()) + entitys.ForEach(rule => { - var depts = await Db.Queryable().Where(x => deptIds.Contains(x.DeptID)).ToListAsync(); - - entitys.ForEach(rule => - { - rule.ApplyDeptName = depts.FirstOrDefault(o => rule.ApplyDeptId == o.DeptID)?.DeptName; - rule.BelongDeptName = depts.FirstOrDefault(o => rule.BelongDeptId == o.DeptID)?.DeptName; - }); - } + rule.ApplyDeptName = depts.FirstOrDefault(o => rule.ApplyDeptId == o.DeptID)?.DeptName; + rule.BelongDeptName = depts.FirstOrDefault(o => rule.BelongDeptId == o.DeptID)?.DeptName; + }); + } - //if (titleIds.Any()) - //{ - // var titles = await Db.Queryable().Where(x => titleIds.Contains(x.TitleID)).ToListAsync(); + //if (titleIds.Any()) + //{ + // var titles = await Db.Queryable().Where(x => titleIds.Contains(x.TitleID)).ToListAsync(); - // entitys.ForEach(rule => - // { - // rule.TitleName = titles.FirstOrDefault(o => rule.TitleId == o.TitleID)?.TitleName; - // }); - //} + // entitys.ForEach(rule => + // { + // rule.TitleName = titles.FirstOrDefault(o => rule.TitleId == o.TitleID)?.TitleName; + // }); + //} - //if (gradeIds.Any()) - //{ - // var grades = await Db.Queryable().Where(x => gradeIds.Contains(x.GradeID)).ToListAsync(); + //if (gradeIds.Any()) + //{ + // var grades = await Db.Queryable().Where(x => gradeIds.Contains(x.GradeID)).ToListAsync(); - // entitys.ForEach(rule => - // { - // rule.GradeName = grades.FirstOrDefault(o => rule.GradeId == o.GradeID)?.GradeName; - // }); - //} + // entitys.ForEach(rule => + // { + // rule.GradeName = grades.FirstOrDefault(o => rule.GradeId == o.GradeID)?.GradeName; + // }); + //} - //if (jobIds.Any()) - //{ - // var jobs = await Db.Queryable().Where(x => jobIds.Contains(x.JobID)).ToListAsync(); + //if (jobIds.Any()) + //{ + // var jobs = await Db.Queryable().Where(x => jobIds.Contains(x.JobID)).ToListAsync(); - // entitys.ForEach(rule => - // { - // rule.JobName = jobs.FirstOrDefault(o => rule.JobId == o.JobID)?.JobName; - // }); - //} + // entitys.ForEach(rule => + // { + // rule.JobName = jobs.FirstOrDefault(o => rule.JobId == o.JobID)?.JobName; + // }); + //} - result.result.DT_TableDataT1 = entitys; - return result; - } + result.result.DT_TableDataT1 = entitys; + return result; } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeEduBGServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeEduBGServices.cs index 185d89ba..2ba58683 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeEduBGServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeEduBGServices.cs @@ -1,67 +1,57 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using System.Linq.Expressions; -using Tiobon.Core.Model.ViewModels.Extend; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 教育背景 (服务) +/// +public class Ghrh_ResumeEduBGServices : BaseServices, IGhrh_ResumeEduBGServices { - /// - /// 教育背景 (服务) - /// - public class Ghrh_ResumeEduBGServices : BaseServices, IGhrh_ResumeEduBGServices + private readonly IBaseRepository _dal; + public Ghrh_ResumeEduBGServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrh_ResumeEduBGServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } - public override async Task> QueryDto(Expression> whereExpression) - { - var data = await base.QueryDto(whereExpression); - var ids = data.Select(x => x.Id.ToString()).ToList(); - var attachments = await Db.Queryable().Where(x => ids.Contains(x.TableName)).ToListAsync(); + public override async Task> QueryDto(Expression> whereExpression) + { + var data = await base.QueryDto(whereExpression); + var ids = data.Select(x => x.Id.ToString()).ToList(); + var attachments = await Db.Queryable().Where(x => ids.Contains(x.TableName)).ToListAsync(); - data.ForEach(x => + data.ForEach(x => + { + x.AttachmentIDs = attachments + .Where(o => o.TableName == x.Id.ToString()) + .Select(o => new ResumeAttachment() { - x.AttachmentIDs = attachments - .Where(o => o.TableName == x.Id.ToString()) - .Select(o => new ResumeAttachment() - { - AttachmentID = o.Id, - AttachFileExtension = o.AttachFileExtension, - AttachFileSize = o.AttachFileSize, - RelativePath = "/Advanced" + o.RelativePath, - AttachmentName = o.AttachmentName, - RemarkSz = o.RemarkSz - }).ToList(); - }); + AttachmentID = o.Id, + AttachFileExtension = o.AttachFileExtension, + AttachFileSize = o.AttachFileSize, + RelativePath = "/Advanced" + o.RelativePath, + AttachmentName = o.AttachmentName, + RemarkSz = o.RemarkSz + }).ToList(); + }); - return data; - } - public override async Task> Add(List listEntity) + return data; + } + public override async Task> Add(List listEntity) + { + var result = new List(); + for (int i = 0; i < listEntity.Count; i++) { - var result = new List(); - for (int i = 0; i < listEntity.Count; i++) + var id = await base.Add(listEntity[i]); + if (listEntity[i].AttachmentIDs != null && listEntity[i].AttachmentIDs.Any()) { - var id = await base.Add(listEntity[i]); - if (listEntity[i].AttachmentIDs != null && listEntity[i].AttachmentIDs.Any()) - { - var ids = listEntity[i].AttachmentIDs.Where(x => x.AttachmentID != null).Select(x => x.AttachmentID.Value).ToList(); - await Db.Updateable() - .SetColumns(x => new Ghre_Attachment() { TableName = id.ToString(), UpdateTime = DateTime.Now }) - .Where(it => ids.Contains(it.Id)) - .ExecuteCommandAsync(); - } - result.Add(id); + var ids = listEntity[i].AttachmentIDs.Where(x => x.AttachmentID != null).Select(x => x.AttachmentID.Value).ToList(); + await Db.Updateable() + .SetColumns(x => new Ghre_Attachment() { TableName = id.ToString(), UpdateTime = DateTime.Now }) + .Where(it => ids.Contains(it.Id)) + .ExecuteCommandAsync(); } - return result; + result.Add(id); } + return result; } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeHomeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeHomeServices.cs index 35993bfe..7651101e 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeHomeServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeHomeServices.cs @@ -1,68 +1,57 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using MathNet.Numerics.Distributions; -using System.Linq.Expressions; -using Tiobon.Core.Model.ViewModels.Extend; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 家庭关系 (服务) +/// +public class Ghrh_ResumeHomeServices : BaseServices, IGhrh_ResumeHomeServices { - /// - /// 家庭关系 (服务) - /// - public class Ghrh_ResumeHomeServices : BaseServices, IGhrh_ResumeHomeServices + private readonly IBaseRepository _dal; + public Ghrh_ResumeHomeServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrh_ResumeHomeServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } - public override async Task> QueryDto(Expression> whereExpression) - { - var data = await base.QueryDto(whereExpression); - var ids = data.Select(x => x.Id.ToString()).ToList(); - var attachments = await Db.Queryable().Where(x => ids.Contains(x.TableName)).ToListAsync(); + public override async Task> QueryDto(Expression> whereExpression) + { + var data = await base.QueryDto(whereExpression); + var ids = data.Select(x => x.Id.ToString()).ToList(); + var attachments = await Db.Queryable().Where(x => ids.Contains(x.TableName)).ToListAsync(); - data.ForEach(x => + data.ForEach(x => + { + x.AttachmentIDs = attachments + .Where(o => o.TableName == x.Id.ToString()) + .Select(o => new ResumeAttachment() { - x.AttachmentIDs = attachments - .Where(o => o.TableName == x.Id.ToString()) - .Select(o => new ResumeAttachment() - { - AttachmentID = o.Id, - AttachFileExtension = o.AttachFileExtension, - AttachFileSize = o.AttachFileSize, - RelativePath = "/Advanced" + o.RelativePath, - AttachmentName = o.AttachmentName, - RemarkSz = o.RemarkSz - }).ToList(); - }); + AttachmentID = o.Id, + AttachFileExtension = o.AttachFileExtension, + AttachFileSize = o.AttachFileSize, + RelativePath = "/Advanced" + o.RelativePath, + AttachmentName = o.AttachmentName, + RemarkSz = o.RemarkSz + }).ToList(); + }); - return data; - } - public override async Task> Add(List listEntity) + return data; + } + public override async Task> Add(List listEntity) + { + var result = new List(); + for (int i = 0; i < listEntity.Count; i++) { - var result = new List(); - for (int i = 0; i < listEntity.Count; i++) + var id = await base.Add(listEntity[i]); + if (listEntity[i].AttachmentIDs != null && listEntity[i].AttachmentIDs.Any()) { - var id = await base.Add(listEntity[i]); - if (listEntity[i].AttachmentIDs != null && listEntity[i].AttachmentIDs.Any()) - { - var ids = listEntity[i].AttachmentIDs.Where(x => x.AttachmentID != null).Select(x => x.AttachmentID.Value).ToList(); - await Db.Updateable() - .SetColumns(x => new Ghre_Attachment() { TableName = id.ToString(), UpdateTime = DateTime.Now }) - .Where(it => ids.Contains(it.Id)) - .ExecuteCommandAsync(); - } - result.Add(id); + var ids = listEntity[i].AttachmentIDs.Where(x => x.AttachmentID != null).Select(x => x.AttachmentID.Value).ToList(); + await Db.Updateable() + .SetColumns(x => new Ghre_Attachment() { TableName = id.ToString(), UpdateTime = DateTime.Now }) + .Where(it => ids.Contains(it.Id)) + .ExecuteCommandAsync(); } - return result; + result.Add(id); } + return result; } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeInfoColumnServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeInfoColumnServices.cs index a222c696..2d593c90 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeInfoColumnServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeInfoColumnServices.cs @@ -1,23 +1,15 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 简历信息栏位 (服务) +/// +public class Ghrh_ResumeInfoColumnServices : BaseServices, IGhrh_ResumeInfoColumnServices { - /// - /// 简历信息栏位 (服务) - /// - public class Ghrh_ResumeInfoColumnServices : BaseServices, IGhrh_ResumeInfoColumnServices + private readonly IBaseRepository _dal; + public Ghrh_ResumeInfoColumnServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrh_ResumeInfoColumnServices(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/Ghrh/Ghrh_ResumeInfoGroupServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeInfoGroupServices.cs index 42b57707..9895a2c0 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeInfoGroupServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeInfoGroupServices.cs @@ -1,33 +1,25 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 简历组别 (服务) +/// +public class Ghrh_ResumeInfoGroupServices : BaseServices, IGhrh_ResumeInfoGroupServices { - /// - /// 简历组别 (服务) - /// - public class Ghrh_ResumeInfoGroupServices : BaseServices, IGhrh_ResumeInfoGroupServices + private readonly IBaseRepository _dal; + public Ghrh_ResumeInfoGroupServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrh_ResumeInfoGroupServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } - public override async Task Add(InsertGhrh_ResumeInfoGroupInput entity) - { - entity.GroupType = entity.GroupType ?? "Other"; - var SortNo = await Db.Queryable().MaxAsync(it => it.SortNo); - entity.SortNo = SortNo + 1; + public override async Task Add(InsertGhrh_ResumeInfoGroupInput entity) + { + entity.GroupType = entity.GroupType ?? "Other"; + var SortNo = await Db.Queryable().MaxAsync(it => it.SortNo); + entity.SortNo = SortNo + 1; - return await base.Add(entity); - } + return await base.Add(entity); } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeLicenceServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeLicenceServices.cs index 3731ee6c..da6de783 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeLicenceServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeLicenceServices.cs @@ -1,67 +1,57 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using System.Linq.Expressions; -using Tiobon.Core.Model.ViewModels.Extend; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 证件 (服务) +/// +public class Ghrh_ResumeLicenceServices : BaseServices, IGhrh_ResumeLicenceServices { - /// - /// 证件 (服务) - /// - public class Ghrh_ResumeLicenceServices : BaseServices, IGhrh_ResumeLicenceServices + private readonly IBaseRepository _dal; + public Ghrh_ResumeLicenceServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrh_ResumeLicenceServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } - public override async Task> QueryDto(Expression> whereExpression) - { - var data = await base.QueryDto(whereExpression); - var ids = data.Select(x => x.Id.ToString()).ToList(); - var attachments = await Db.Queryable().Where(x => ids.Contains(x.TableName)).ToListAsync(); + public override async Task> QueryDto(Expression> whereExpression) + { + var data = await base.QueryDto(whereExpression); + var ids = data.Select(x => x.Id.ToString()).ToList(); + var attachments = await Db.Queryable().Where(x => ids.Contains(x.TableName)).ToListAsync(); - data.ForEach(x => + data.ForEach(x => + { + x.AttachmentIDs = attachments + .Where(o => o.TableName == x.Id.ToString()) + .Select(o => new ResumeAttachment() { - x.AttachmentIDs = attachments - .Where(o => o.TableName == x.Id.ToString()) - .Select(o => new ResumeAttachment() - { - AttachmentID = o.Id, - AttachFileExtension = o.AttachFileExtension, - AttachFileSize = o.AttachFileSize, - RelativePath = "/Advanced" + o.RelativePath, - AttachmentName = o.AttachmentName, - RemarkSz = o.RemarkSz - }).ToList(); - }); + AttachmentID = o.Id, + AttachFileExtension = o.AttachFileExtension, + AttachFileSize = o.AttachFileSize, + RelativePath = "/Advanced" + o.RelativePath, + AttachmentName = o.AttachmentName, + RemarkSz = o.RemarkSz + }).ToList(); + }); - return data; - } - public override async Task> Add(List listEntity) + return data; + } + public override async Task> Add(List listEntity) + { + var result = new List(); + for (int i = 0; i < listEntity.Count; i++) { - var result = new List(); - for (int i = 0; i < listEntity.Count; i++) + var id = await base.Add(listEntity[i]); + if (listEntity[i].AttachmentIDs != null && listEntity[i].AttachmentIDs.Any()) { - var id = await base.Add(listEntity[i]); - if (listEntity[i].AttachmentIDs != null && listEntity[i].AttachmentIDs.Any()) - { - var ids = listEntity[i].AttachmentIDs.Where(x => x.AttachmentID != null).Select(x => x.AttachmentID.Value).ToList(); - await Db.Updateable() - .SetColumns(x => new Ghre_Attachment() { TableName = id.ToString(), UpdateTime = DateTime.Now }) - .Where(it => ids.Contains(it.Id)) - .ExecuteCommandAsync(); - } - result.Add(id); + var ids = listEntity[i].AttachmentIDs.Where(x => x.AttachmentID != null).Select(x => x.AttachmentID.Value).ToList(); + await Db.Updateable() + .SetColumns(x => new Ghre_Attachment() { TableName = id.ToString(), UpdateTime = DateTime.Now }) + .Where(it => ids.Contains(it.Id)) + .ExecuteCommandAsync(); } - return result; + result.Add(id); } + return result; } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs index b27f4d75..f4bb4130 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs @@ -1,26 +1,4 @@ - -using AgileObjects.AgileMapper; -using AgileObjects.AgileMapper.Extensions; -using DnsClient; -using MathNet.Numerics.Distributions; -using Microsoft.IdentityModel.Tokens; -using Newtonsoft.Json.Linq; -using Org.BouncyCastle.Utilities; -using SqlSugar; -using System.Dynamic; -using Tiobon.Core.Common; -using Tiobon.Core.Common.Caches; -using Tiobon.Core.Common.DB.Dapper.Extensions; -using Tiobon.Core.Common.Helper; -using Tiobon.Core.DataAccess; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Model.ViewModels.Extend; -using Tiobon.Core.Services.BASE; - -namespace Tiobon.Core.Services; +namespace Tiobon.Core.Services; /// /// 个人简历 (服务) diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeStatementServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeStatementServices.cs index 6ddeaa9a..14858975 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeStatementServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeStatementServices.cs @@ -1,23 +1,15 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 简历声明 (服务) +/// +public class Ghrh_ResumeStatementServices : BaseServices, IGhrh_ResumeStatementServices { - /// - /// 简历声明 (服务) - /// - public class Ghrh_ResumeStatementServices : BaseServices, IGhrh_ResumeStatementServices + private readonly IBaseRepository _dal; + public Ghrh_ResumeStatementServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrh_ResumeStatementServices(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/Ghrh/Ghrh_ResumeTagServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTagServices.cs index ce1973d1..5537d437 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTagServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTagServices.cs @@ -1,23 +1,15 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 简历标签 (服务) +/// +public class Ghrh_ResumeTagServices : BaseServices, IGhrh_ResumeTagServices { - /// - /// 简历标签 (服务) - /// - public class Ghrh_ResumeTagServices : BaseServices, IGhrh_ResumeTagServices + private readonly IBaseRepository _dal; + public Ghrh_ResumeTagServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrh_ResumeTagServices(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/Ghrh/Ghrh_ResumeTemplateServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs index d261c6c0..9659819f 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs @@ -1,16 +1,4 @@ - -using SqlSugar; -using Tiobon.Core.Common; -using Tiobon.Core.Common.Caches; -using Tiobon.Core.Common.Helper; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Model.ViewModels.Extend; -using Tiobon.Core.Services.BASE; - -namespace Tiobon.Core.Services; +namespace Tiobon.Core.Services; /// /// 简历模板 (服务) diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTrainingServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTrainingServices.cs index 8fc957d2..6f062783 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTrainingServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTrainingServices.cs @@ -1,67 +1,57 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using System.Linq.Expressions; -using Tiobon.Core.Model.ViewModels.Extend; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 简历培训记录 (服务) +/// +public class Ghrh_ResumeTrainingServices : BaseServices, IGhrh_ResumeTrainingServices { - /// - /// 简历培训记录 (服务) - /// - public class Ghrh_ResumeTrainingServices : BaseServices, IGhrh_ResumeTrainingServices + private readonly IBaseRepository _dal; + public Ghrh_ResumeTrainingServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrh_ResumeTrainingServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } - public override async Task> QueryDto(Expression> whereExpression) - { - var data = await base.QueryDto(whereExpression); - var ids = data.Select(x => x.Id.ToString()).ToList(); - var attachments = await Db.Queryable().Where(x => ids.Contains(x.TableName)).ToListAsync(); + public override async Task> QueryDto(Expression> whereExpression) + { + var data = await base.QueryDto(whereExpression); + var ids = data.Select(x => x.Id.ToString()).ToList(); + var attachments = await Db.Queryable().Where(x => ids.Contains(x.TableName)).ToListAsync(); - data.ForEach(x => + data.ForEach(x => + { + x.AttachmentIDs = attachments + .Where(o => o.TableName == x.Id.ToString()) + .Select(o => new ResumeAttachment() { - x.AttachmentIDs = attachments - .Where(o => o.TableName == x.Id.ToString()) - .Select(o => new ResumeAttachment() - { - AttachmentID = o.Id, - AttachFileExtension = o.AttachFileExtension, - AttachFileSize = o.AttachFileSize, - RelativePath = "/Advanced" + o.RelativePath, - AttachmentName = o.AttachmentName, - RemarkSz = o.RemarkSz - }).ToList(); - }); + AttachmentID = o.Id, + AttachFileExtension = o.AttachFileExtension, + AttachFileSize = o.AttachFileSize, + RelativePath = "/Advanced" + o.RelativePath, + AttachmentName = o.AttachmentName, + RemarkSz = o.RemarkSz + }).ToList(); + }); - return data; - } - public override async Task> Add(List listEntity) + return data; + } + public override async Task> Add(List listEntity) + { + var result = new List(); + for (int i = 0; i < listEntity.Count; i++) { - var result = new List(); - for (int i = 0; i < listEntity.Count; i++) + var id = await base.Add(listEntity[i]); + if (listEntity[i].AttachmentIDs != null && listEntity[i].AttachmentIDs.Any()) { - var id = await base.Add(listEntity[i]); - if (listEntity[i].AttachmentIDs != null && listEntity[i].AttachmentIDs.Any()) - { - var ids = listEntity[i].AttachmentIDs.Where(x => x.AttachmentID != null).Select(x => x.AttachmentID.Value).ToList(); - await Db.Updateable() - .SetColumns(x => new Ghre_Attachment() { TableName = id.ToString(), UpdateTime = DateTime.Now }) - .Where(it => ids.Contains(it.Id)) - .ExecuteCommandAsync(); - } - result.Add(id); + var ids = listEntity[i].AttachmentIDs.Where(x => x.AttachmentID != null).Select(x => x.AttachmentID.Value).ToList(); + await Db.Updateable() + .SetColumns(x => new Ghre_Attachment() { TableName = id.ToString(), UpdateTime = DateTime.Now }) + .Where(it => ids.Contains(it.Id)) + .ExecuteCommandAsync(); } - return result; + result.Add(id); } + return result; } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeWorkExpServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeWorkExpServices.cs index 105d6839..da6c02b4 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeWorkExpServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeWorkExpServices.cs @@ -1,67 +1,57 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using System.Linq.Expressions; -using Tiobon.Core.Model.ViewModels.Extend; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 工作经历 (服务) +/// +public class Ghrh_ResumeWorkExpServices : BaseServices, IGhrh_ResumeWorkExpServices { - /// - /// 工作经历 (服务) - /// - public class Ghrh_ResumeWorkExpServices : BaseServices, IGhrh_ResumeWorkExpServices + private readonly IBaseRepository _dal; + public Ghrh_ResumeWorkExpServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrh_ResumeWorkExpServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } - public override async Task> QueryDto(Expression> whereExpression) - { - var data = await base.QueryDto(whereExpression); - var ids = data.Select(x => x.Id.ToString()).ToList(); - var attachments = await Db.Queryable().Where(x => ids.Contains(x.TableName)).ToListAsync(); + public override async Task> QueryDto(Expression> whereExpression) + { + var data = await base.QueryDto(whereExpression); + var ids = data.Select(x => x.Id.ToString()).ToList(); + var attachments = await Db.Queryable().Where(x => ids.Contains(x.TableName)).ToListAsync(); - data.ForEach(x => + data.ForEach(x => + { + x.AttachmentIDs = attachments + .Where(o => o.TableName == x.Id.ToString()) + .Select(o => new ResumeAttachment() { - x.AttachmentIDs = attachments - .Where(o => o.TableName == x.Id.ToString()) - .Select(o => new ResumeAttachment() - { - AttachmentID = o.Id, - AttachFileExtension = o.AttachFileExtension, - AttachFileSize = o.AttachFileSize, - RelativePath = "/Advanced" + o.RelativePath, - AttachmentName = o.AttachmentName, - RemarkSz = o.RemarkSz - }).ToList(); - }); + AttachmentID = o.Id, + AttachFileExtension = o.AttachFileExtension, + AttachFileSize = o.AttachFileSize, + RelativePath = "/Advanced" + o.RelativePath, + AttachmentName = o.AttachmentName, + RemarkSz = o.RemarkSz + }).ToList(); + }); - return data; - } - public override async Task> Add(List listEntity) + return data; + } + public override async Task> Add(List listEntity) + { + var result = new List(); + for (int i = 0; i < listEntity.Count; i++) { - var result = new List(); - for (int i = 0; i < listEntity.Count; i++) + var id = await base.Add(listEntity[i]); + if (listEntity[i].AttachmentIDs != null && listEntity[i].AttachmentIDs.Any()) { - var id = await base.Add(listEntity[i]); - if (listEntity[i].AttachmentIDs != null && listEntity[i].AttachmentIDs.Any()) - { - var ids = listEntity[i].AttachmentIDs.Where(x => x.AttachmentID != null).Select(x => x.AttachmentID.Value).ToList(); - await Db.Updateable() - .SetColumns(x => new Ghre_Attachment() { TableName = id.ToString(), UpdateTime = DateTime.Now }) - .Where(it => ids.Contains(it.Id)) - .ExecuteCommandAsync(); - } - result.Add(id); + var ids = listEntity[i].AttachmentIDs.Where(x => x.AttachmentID != null).Select(x => x.AttachmentID.Value).ToList(); + await Db.Updateable() + .SetColumns(x => new Ghre_Attachment() { TableName = id.ToString(), UpdateTime = DateTime.Now }) + .Where(it => ids.Contains(it.Id)) + .ExecuteCommandAsync(); } - return result; + result.Add(id); } + return result; } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_StatementServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_StatementServices.cs index b084deb7..95b91071 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_StatementServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_StatementServices.cs @@ -1,23 +1,15 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 声明 (服务) +/// +public class Ghrh_StatementServices : BaseServices, IGhrh_StatementServices { - /// - /// 声明 (服务) - /// - public class Ghrh_StatementServices : BaseServices, IGhrh_StatementServices + private readonly IBaseRepository _dal; + public Ghrh_StatementServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrh_StatementServices(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/Ghrh/Ghrh_YearHumanSettingsServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs index 94985f41..66ff98e1 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs @@ -1,79 +1,69 @@ - -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.Common.Caches; -using Tiobon.Core.Common; -using Tiobon.Core.Model; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// 年度人力配置 (服务) +/// +public class Ghrh_YearHumanSettingsServices : BaseServices, IGhrh_YearHumanSettingsServices { - /// - /// 年度人力配置 (服务) - /// - public class Ghrh_YearHumanSettingsServices : BaseServices, IGhrh_YearHumanSettingsServices + private readonly IBaseRepository _dal; + public Ghrh_YearHumanSettingsServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrh_YearHumanSettingsServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } - - public override async Task> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) - { - var result = await base.QueryFilterPage(filter, condition, IsEnable); - var entitys = result.result.DT_TableDataT1; + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } - var deptIds = entitys.Where(x => x.DeptId != null).Select(x => x.DeptId).ToList(); - var titleIds = entitys.Where(x => x.TitleId != null).Select(x => x.TitleId).ToList(); - var gradeIds = entitys.Where(x => x.GradeId != null).Select(x => x.GradeId).ToList(); - var jobIds = entitys.Where(x => x.JobId != null).Select(x => x.JobId).ToList(); + public override async Task> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) + { + var result = await base.QueryFilterPage(filter, condition, IsEnable); + var entitys = result.result.DT_TableDataT1; - if (deptIds.Any()) - { - var depts = await Db.Queryable().Where(x => deptIds.Contains(x.DeptID)).ToListAsync(); + var deptIds = entitys.Where(x => x.DeptId != null).Select(x => x.DeptId).ToList(); + var titleIds = entitys.Where(x => x.TitleId != null).Select(x => x.TitleId).ToList(); + var gradeIds = entitys.Where(x => x.GradeId != null).Select(x => x.GradeId).ToList(); + var jobIds = entitys.Where(x => x.JobId != null).Select(x => x.JobId).ToList(); - entitys.ForEach(rule => - { - rule.DeptName = depts.FirstOrDefault(o => rule.DeptId == o.DeptID)?.DeptName; - }); - } + if (deptIds.Any()) + { + var depts = await Db.Queryable().Where(x => deptIds.Contains(x.DeptID)).ToListAsync(); - if (titleIds.Any()) + entitys.ForEach(rule => { - var titles = await Db.Queryable().Where(x => titleIds.Contains(x.TitleID)).ToListAsync(); + rule.DeptName = depts.FirstOrDefault(o => rule.DeptId == o.DeptID)?.DeptName; + }); + } - entitys.ForEach(rule => - { - rule.TitleName = titles.FirstOrDefault(o => rule.TitleId == o.TitleID)?.TitleName; - }); - } + if (titleIds.Any()) + { + var titles = await Db.Queryable().Where(x => titleIds.Contains(x.TitleID)).ToListAsync(); - if (gradeIds.Any()) + entitys.ForEach(rule => { - var grades = await Db.Queryable().Where(x => gradeIds.Contains(x.GradeID)).ToListAsync(); + rule.TitleName = titles.FirstOrDefault(o => rule.TitleId == o.TitleID)?.TitleName; + }); + } - entitys.ForEach(rule => - { - rule.GradeName = grades.FirstOrDefault(o => rule.GradeId == o.GradeID)?.GradeName; - }); - } + if (gradeIds.Any()) + { + var grades = await Db.Queryable().Where(x => gradeIds.Contains(x.GradeID)).ToListAsync(); - if (jobIds.Any()) + entitys.ForEach(rule => { - var jobs = await Db.Queryable().Where(x => jobIds.Contains(x.JobID)).ToListAsync(); + rule.GradeName = grades.FirstOrDefault(o => rule.GradeId == o.GradeID)?.GradeName; + }); + } - entitys.ForEach(rule => - { - rule.JobName = jobs.FirstOrDefault(o => rule.JobId == o.JobID)?.JobName; - }); - } + if (jobIds.Any()) + { + var jobs = await Db.Queryable().Where(x => jobIds.Contains(x.JobID)).ToListAsync(); - result.result.DT_TableDataT1 = entitys; - return result; + entitys.ForEach(rule => + { + rule.JobName = jobs.FirstOrDefault(o => rule.JobId == o.JobID)?.JobName; + }); } + + result.result.DT_TableDataT1 = entitys; + return result; } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghro/Ghro_DeptServices.cs b/Tiobon.Core.Services/Ghro/Ghro_DeptServices.cs index a8d802da..68836118 100644 --- a/Tiobon.Core.Services/Ghro/Ghro_DeptServices.cs +++ b/Tiobon.Core.Services/Ghro/Ghro_DeptServices.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 +/// +/// Ghro_Dept (服务) +/// +public class Ghro_DeptServices : BaseServices, IGhro_DeptServices { - /// - /// Ghro_Dept (服务) - /// - public class Ghro_DeptServices : BaseServices, IGhro_DeptServices + private readonly IBaseRepository _dal; + public Ghro_DeptServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghro_DeptServices(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/Ghrs/Ghrs_AttachmentServices.cs b/Tiobon.Core.Services/Ghrs/Ghrs_AttachmentServices.cs index 077123ff..1cebd750 100644 --- a/Tiobon.Core.Services/Ghrs/Ghrs_AttachmentServices.cs +++ b/Tiobon.Core.Services/Ghrs/Ghrs_AttachmentServices.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 +/// +/// Ghrs_Attachment (服务) +/// +public class Ghrs_AttachmentServices : BaseServices, IGhrs_AttachmentServices { - /// - /// Ghrs_Attachment (服务) - /// - public class Ghrs_AttachmentServices : BaseServices, IGhrs_AttachmentServices + private readonly IBaseRepository _dal; + public Ghrs_AttachmentServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrs_AttachmentServices(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/Ghrs/Ghrs_DataRoleDetailServices.cs b/Tiobon.Core.Services/Ghrs/Ghrs_DataRoleDetailServices.cs index e1b434e4..3632e389 100644 --- a/Tiobon.Core.Services/Ghrs/Ghrs_DataRoleDetailServices.cs +++ b/Tiobon.Core.Services/Ghrs/Ghrs_DataRoleDetailServices.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 +/// +/// Ghrs_DataRoleDetail (服务) +/// +public class Ghrs_DataRoleDetailServices : BaseServices, IGhrs_DataRoleDetailServices { - /// - /// Ghrs_DataRoleDetail (服务) - /// - public class Ghrs_DataRoleDetailServices : BaseServices, IGhrs_DataRoleDetailServices + private readonly IBaseRepository _dal; + public Ghrs_DataRoleDetailServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrs_DataRoleDetailServices(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/Ghrs/Ghrs_MenuServices.cs b/Tiobon.Core.Services/Ghrs/Ghrs_MenuServices.cs index 56fadd66..b3d58ca3 100644 --- a/Tiobon.Core.Services/Ghrs/Ghrs_MenuServices.cs +++ b/Tiobon.Core.Services/Ghrs/Ghrs_MenuServices.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 +/// +/// Ghrs_Menu (服务) +/// +public class Ghrs_MenuServices : BaseServices, IGhrs_MenuServices { - /// - /// Ghrs_Menu (服务) - /// - public class Ghrs_MenuServices : BaseServices, IGhrs_MenuServices + private readonly IBaseRepository _dal; + public Ghrs_MenuServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrs_MenuServices(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/Ghrs/Ghrs_ParaDetailServices.cs b/Tiobon.Core.Services/Ghrs/Ghrs_ParaDetailServices.cs index 5c357b0d..c9b322af 100644 --- a/Tiobon.Core.Services/Ghrs/Ghrs_ParaDetailServices.cs +++ b/Tiobon.Core.Services/Ghrs/Ghrs_ParaDetailServices.cs @@ -1,21 +1,14 @@ - -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 +/// +/// Ghrs_ParaDetail (服务) +/// +public class Ghrs_ParaDetailServices : BaseServices, IGhrs_ParaDetailServices { - /// - /// Ghrs_ParaDetail (服务) - /// - public class Ghrs_ParaDetailServices : BaseServices, IGhrs_ParaDetailServices + private readonly IBaseRepository _dal; + public Ghrs_ParaDetailServices(IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrs_ParaDetailServices(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/Ghrs/Ghrs_UserServices.cs b/Tiobon.Core.Services/Ghrs/Ghrs_UserServices.cs index 6d8e67b1..a0716e94 100644 --- a/Tiobon.Core.Services/Ghrs/Ghrs_UserServices.cs +++ b/Tiobon.Core.Services/Ghrs/Ghrs_UserServices.cs @@ -1,21 +1,14 @@ - -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 +/// +/// 系统用户 (服务) +/// +public class Ghrs_UserServices : BaseServices, IGhrs_UserServices { - /// - /// 系统用户 (服务) - /// - public class Ghrs_UserServices : BaseServices, IGhrs_UserServices + private readonly IBaseRepository _dal; + public Ghrs_UserServices(IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrs_UserServices(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/GlobalUsings.cs b/Tiobon.Core.Services/GlobalUsings.cs new file mode 100644 index 00000000..5a6748bd --- /dev/null +++ b/Tiobon.Core.Services/GlobalUsings.cs @@ -0,0 +1,27 @@ +global using AgileObjects.AgileMapper; +global using Microsoft.AspNetCore.Http; +global using Newtonsoft.Json.Linq; +global using SqlSugar; +global using System.Collections; +global using System.Data; +global using System.Dynamic; +global using System.Linq.Expressions; +global using System.Reflection; +global using Tiobon.Core.Common; +global using Tiobon.Core.Common.Caches; +global using Tiobon.Core.Common.DB.Dapper; +global using Tiobon.Core.Common.DB.Dapper.Extensions; +global using Tiobon.Core.Common.Enums; +global using Tiobon.Core.Common.Extensions; +global using Tiobon.Core.Common.Helper; +global using Tiobon.Core.Common.UserManager; +global using Tiobon.Core.DataAccess; +global using Tiobon.Core.IRepository.Base; +global using Tiobon.Core.IServices; +global using Tiobon.Core.IServices.BASE; +global using Tiobon.Core.Model; +global using Tiobon.Core.Model.Models; +global using Tiobon.Core.Model.ViewModels.Extend; +global using Tiobon.Core.Services.BASE; +global using Tiobon.Core.Model.ViewModels; +global using Newtonsoft.Json; diff --git a/Tiobon.Core.Services/GuestbookServices.cs b/Tiobon.Core.Services/GuestbookServices.cs index 91c690cf..a376094d 100644 --- a/Tiobon.Core.Services/GuestbookServices.cs +++ b/Tiobon.Core.Services/GuestbookServices.cs @@ -1,12 +1,4 @@ -using Tiobon.Core.Common; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using System; -using System.Threading.Tasks; -using Tiobon.Core.Common.DB; +using Tiobon.Core.Common.DB; using Tiobon.Core.Repository.UnitOfWorks; namespace Tiobon.Core.Services diff --git a/Tiobon.Core.Services/ModuleServices.cs b/Tiobon.Core.Services/ModuleServices.cs index 2cece3c9..36920b8e 100644 --- a/Tiobon.Core.Services/ModuleServices.cs +++ b/Tiobon.Core.Services/ModuleServices.cs @@ -1,15 +1,9 @@ -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// ModuleServices +/// +public class ModuleServices : BaseServices, IModuleServices { - /// - /// ModuleServices - /// - public class ModuleServices : BaseServices, IModuleServices - { - } } diff --git a/Tiobon.Core.Services/OperateLogServices.cs b/Tiobon.Core.Services/OperateLogServices.cs index 1f511d5c..cb5e976d 100644 --- a/Tiobon.Core.Services/OperateLogServices.cs +++ b/Tiobon.Core.Services/OperateLogServices.cs @@ -1,12 +1,6 @@ -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +public partial class OperateLogServices : BaseServices, IOperateLogServices { - public partial class OperateLogServices : BaseServices, IOperateLogServices - { - } } diff --git a/Tiobon.Core.Services/PasswordLibServices.cs b/Tiobon.Core.Services/PasswordLibServices.cs index a18f8076..9715903e 100644 --- a/Tiobon.Core.Services/PasswordLibServices.cs +++ b/Tiobon.Core.Services/PasswordLibServices.cs @@ -1,61 +1,53 @@ -using System; -using System.Threading.Tasks; -using Tiobon.Core.Common; -using Tiobon.Core.Common.DB; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; - -namespace Tiobon.Core.Services +using Tiobon.Core.Common.DB; + +namespace Tiobon.Core.Services; + +public partial class PasswordLibServices : BaseServices, IPasswordLibServices { - public partial class PasswordLibServices : BaseServices, IPasswordLibServices + IBaseRepository _dal; + + public PasswordLibServices(IBaseRepository dal) { - IBaseRepository _dal; + this._dal = dal; + base.BaseDal = dal; + } - public PasswordLibServices(IBaseRepository dal) + [UseTran(Propagation = Propagation.Required)] + public async Task TestTranPropagation2() + { + await _dal.Add(new PasswordLib() { - this._dal = dal; - base.BaseDal = dal; - } + IsDeleted = false, + plAccountName = "aaa", + plCreateTime = DateTime.Now + }); - [UseTran(Propagation = Propagation.Required)] - public async Task TestTranPropagation2() - { - await _dal.Add(new PasswordLib() - { - IsDeleted = false, - plAccountName = "aaa", - plCreateTime = DateTime.Now - }); - - return true; - } - - [UseTran(Propagation = Propagation.Mandatory)] - public async Task TestTranPropagationNoTranError() + return true; + } + + [UseTran(Propagation = Propagation.Mandatory)] + public async Task TestTranPropagationNoTranError() + { + await _dal.Add(new PasswordLib() { - await _dal.Add(new PasswordLib() - { - IsDeleted = false, - plAccountName = "aaa", - plCreateTime = DateTime.Now - }); - - return true; - } - - [UseTran(Propagation = Propagation.Nested)] - public async Task TestTranPropagationTran2() + IsDeleted = false, + plAccountName = "aaa", + plCreateTime = DateTime.Now + }); + + return true; + } + + [UseTran(Propagation = Propagation.Nested)] + public async Task TestTranPropagationTran2() + { + await _dal.Add(new PasswordLib() { - await _dal.Add(new PasswordLib() - { - IsDeleted = false, - plAccountName = "aaa", - plCreateTime = DateTime.Now - }); - - return true; - } + IsDeleted = false, + plAccountName = "aaa", + plCreateTime = DateTime.Now + }); + + return true; } } \ No newline at end of file diff --git a/Tiobon.Core.Services/PayServices.cs b/Tiobon.Core.Services/PayServices.cs index 5f0df040..f8423e5b 100644 --- a/Tiobon.Core.Services/PayServices.cs +++ b/Tiobon.Core.Services/PayServices.cs @@ -1,415 +1,400 @@ -using Tiobon.Core.Common; -using Tiobon.Core.Common.Helper; -using Tiobon.Core.Common.Static; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.ViewModels; -using Tiobon.Core.Services.BASE; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Logging; -using System; -using System.Collections.Generic; -using System.IO; -using System.Net.Http; +using Microsoft.Extensions.Logging; using System.Text; -using System.Threading; -using System.Threading.Tasks; +using Tiobon.Core.Common.Static; -namespace Tiobon.Core.Services +namespace Tiobon.Core.Services; + +public partial class PayServices : BaseServices>, IPayServices { - public partial class PayServices : BaseServices>, IPayServices + IHttpContextAccessor _httpContextAccessor; + ILogger _logger; + public PayServices(ILogger logger, IHttpContextAccessor httpContextAccessor) { - IHttpContextAccessor _httpContextAccessor; - ILogger _logger; - public PayServices(ILogger logger, IHttpContextAccessor httpContextAccessor) - { - _logger = logger; - _httpContextAccessor = httpContextAccessor; - } + _logger = logger; + _httpContextAccessor = httpContextAccessor; + } - public async Task> Pay(PayNeedModel payModel) + public async Task> Pay(PayNeedModel payModel) + { + _logger.LogInformation("支付开始"); + ServiceResult messageModel = new ServiceResult(); + messageModel.Data = new PayReturnResultModel(); + string url = string.Empty; + string param = string.Empty; + string returnData = string.Empty; + try { - _logger.LogInformation("支付开始"); - ServiceResult messageModel = new ServiceResult(); - messageModel.Data = new PayReturnResultModel(); - string url = string.Empty; - string param = string.Empty; - string returnData = string.Empty; + + _logger.LogInformation($"原始GET参数->{_httpContextAccessor.HttpContext.Request.QueryString}"); + //被扫支付 + string host = "https://ibsbjstar.ccb.com.cn/CCBIS/B2CMainPlat_00_BEPAY?"; + ////商户信息 + //string merInfo = "MERCHANTID=105910100190000&POSID=000000000&BRANCHID=610000000"; + ////获取柜台完整公钥 + //string pubKey = "30819d300d06092a864886f70d010101050003818b0030818702818100a32fb2d51dda418f65ca456431bd2f4173e41a82bb75c2338a6f649f8e9216204838d42e2a028c79cee19144a72b5b46fe6a498367bf4143f959e4f73c9c4f499f68831f8663d6b946ae9fa31c74c9332bebf3cba1a98481533a37ffad944823bd46c305ec560648f1b6bcc64d54d32e213926b26cd10d342f2c61ff5ac2d78b020111"; + ////加密原串 + //string param = merInfo + "&MERFLAG=1&TERMNO1=&TERMNO2=&ORDERID=937857156" + + // "&QRCODE=134737690209713400&AMOUNT=0.01&TXCODE=PAY100&PROINFO=&REMARK1=&REMARK2=&SMERID=&SMERNAME=&SMERTYPEID=" + + // "&SMERTYPE=&TRADECODE=&TRADENAME=&SMEPROTYPE=&PRONAME="; + + Dictionary dic = new Dictionary(); + + //支付信息 + dic.Add("MERCHANTID", StaticPayInfo.MERCHANTID);// => self::MERCHANTID, // 商户号 + dic.Add("POSID", StaticPayInfo.POSID);// => self::POSID, // 柜台号 + dic.Add("BRANCHID", StaticPayInfo.BRANCHID);// => self::BRANCHID, // 分行号 + dic.Add("TXCODE", "PAY100");// => 'PAY100', // 交易码 + dic.Add("MERFLAG", "1");// => '', // 商户类型 1线上 2线下 + dic.Add("ORDERID", payModel.ORDERID);//payModel.ORDERID);// => '', // 订单号 + dic.Add("QRCODE", payModel.QRCODE);// => '', // 码信息（一维码、二维码） + dic.Add("AMOUNT", payModel.AMOUNT);// => '0.01', // 订单金额，单位：元 + dic.Add("PROINFO", payModel.PROINFO);// => '', // 商品名称 + dic.Add("REMARK1", payModel.REMARK1);// => '', // 备注 1 + dic.Add("REMARK2", payModel.REMARK2);// => '', // 备注 2 + + //dic.Add("TERMNO1", "");// => '', // 终端编号 1 + //dic.Add("TERMNO2", "");// => '', // 终端编号 2 + //dic.Add("GROUPMCH", "");// => '', // 集团商户信息 + //dic.Add("FZINFO1", "");// => '', // 分账信息一 + //dic.Add("FZINFO2", "");// => '', // 分账信息二 + //dic.Add("SUB_APPID", "");// => '', // 子商户公众账号 ID + //dic.Add("RETURN_FIELD", "");// => '', // 返回信息位图 + //dic.Add("USERPARAM", "");// => '', // 实名支付 + //dic.Add("detail", "");// => '', // 商品详情 + //dic.Add("goods_tag", "");// => '', // 订单优惠标记 + + //商户信息 + Dictionary dicInfo = new Dictionary(); + dicInfo.Add("MERCHANTID", StaticPayInfo.MERCHANTID);// => self::MERCHANTID, // 商户号 + dicInfo.Add("POSID", StaticPayInfo.POSID);// => self::POSID, // 柜台号 + dicInfo.Add("BRANCHID", StaticPayInfo.BRANCHID);// => self::BRANCHID, // 分行号 + var Info = StringHelper.GetPars(dicInfo); + + + //获取拼接请求串 + param = StringHelper.GetPars(dic); + + //加密 + var paramEncryption = new CCBPayUtil().makeCCBParam(param, StaticPayInfo.pubKey); + //拼接请求串 + url = host + Info + "&ccbParam=" + paramEncryption; + //请求 + _logger.LogInformation($"请求地址->{url}"); + _logger.LogInformation($"请求参数->{param}"); + PayResultModel payResult; try { - - _logger.LogInformation($"原始GET参数->{_httpContextAccessor.HttpContext.Request.QueryString}"); - //被扫支付 - string host = "https://ibsbjstar.ccb.com.cn/CCBIS/B2CMainPlat_00_BEPAY?"; - ////商户信息 - //string merInfo = "MERCHANTID=105910100190000&POSID=000000000&BRANCHID=610000000"; - ////获取柜台完整公钥 - //string pubKey = "30819d300d06092a864886f70d010101050003818b0030818702818100a32fb2d51dda418f65ca456431bd2f4173e41a82bb75c2338a6f649f8e9216204838d42e2a028c79cee19144a72b5b46fe6a498367bf4143f959e4f73c9c4f499f68831f8663d6b946ae9fa31c74c9332bebf3cba1a98481533a37ffad944823bd46c305ec560648f1b6bcc64d54d32e213926b26cd10d342f2c61ff5ac2d78b020111"; - ////加密原串 - //string param = merInfo + "&MERFLAG=1&TERMNO1=&TERMNO2=&ORDERID=937857156" + - // "&QRCODE=134737690209713400&AMOUNT=0.01&TXCODE=PAY100&PROINFO=&REMARK1=&REMARK2=&SMERID=&SMERNAME=&SMERTYPEID=" + - // "&SMERTYPE=&TRADECODE=&TRADENAME=&SMEPROTYPE=&PRONAME="; - - Dictionary dic = new Dictionary(); - - //支付信息 - dic.Add("MERCHANTID", StaticPayInfo.MERCHANTID);// => self::MERCHANTID, // 商户号 - dic.Add("POSID", StaticPayInfo.POSID);// => self::POSID, // 柜台号 - dic.Add("BRANCHID", StaticPayInfo.BRANCHID);// => self::BRANCHID, // 分行号 - dic.Add("TXCODE", "PAY100");// => 'PAY100', // 交易码 - dic.Add("MERFLAG", "1");// => '', // 商户类型 1线上 2线下 - dic.Add("ORDERID", payModel.ORDERID);//payModel.ORDERID);// => '', // 订单号 - dic.Add("QRCODE", payModel.QRCODE);// => '', // 码信息（一维码、二维码） - dic.Add("AMOUNT", payModel.AMOUNT);// => '0.01', // 订单金额，单位：元 - dic.Add("PROINFO", payModel.PROINFO);// => '', // 商品名称 - dic.Add("REMARK1", payModel.REMARK1);// => '', // 备注 1 - dic.Add("REMARK2", payModel.REMARK2);// => '', // 备注 2 - - //dic.Add("TERMNO1", "");// => '', // 终端编号 1 - //dic.Add("TERMNO2", "");// => '', // 终端编号 2 - //dic.Add("GROUPMCH", "");// => '', // 集团商户信息 - //dic.Add("FZINFO1", "");// => '', // 分账信息一 - //dic.Add("FZINFO2", "");// => '', // 分账信息二 - //dic.Add("SUB_APPID", "");// => '', // 子商户公众账号 ID - //dic.Add("RETURN_FIELD", "");// => '', // 返回信息位图 - //dic.Add("USERPARAM", "");// => '', // 实名支付 - //dic.Add("detail", "");// => '', // 商品详情 - //dic.Add("goods_tag", "");// => '', // 订单优惠标记 - - //商户信息 - Dictionary dicInfo = new Dictionary(); - dicInfo.Add("MERCHANTID", StaticPayInfo.MERCHANTID);// => self::MERCHANTID, // 商户号 - dicInfo.Add("POSID", StaticPayInfo.POSID);// => self::POSID, // 柜台号 - dicInfo.Add("BRANCHID", StaticPayInfo.BRANCHID);// => self::BRANCHID, // 分行号 - var Info = StringHelper.GetPars(dicInfo); - - - //获取拼接请求串 - param = StringHelper.GetPars(dic); - - //加密 - var paramEncryption = new CCBPayUtil().makeCCBParam(param, StaticPayInfo.pubKey); - //拼接请求串 - url = host + Info + "&ccbParam=" + paramEncryption; - //请求 - _logger.LogInformation($"请求地址->{url}"); - _logger.LogInformation($"请求参数->{param}"); - PayResultModel payResult; + returnData = await HttpHelper.PostAsync(url); + //转换数据 try { - returnData = await HttpHelper.PostAsync(url); - //转换数据 - try - { - payResult = JsonHelper.ParseFormByJson(returnData); - } - catch - { - payResult = new PayResultModel { RESULT = "N", ERRMSG = "参数错误", ORDERID = payModel.ORDERID, AMOUNT = payModel.AMOUNT }; - returnData = StringHelper.GetCusLine(returnData, 15); - } - _logger.LogInformation($"响应数据->{returnData}"); - } - catch (Exception ex) - { - _logger.LogInformation($"异常信息:{ex.Message}"); - _logger.LogInformation($"异常堆栈:{ex.StackTrace}"); - messageModel = await PayCheck(payModel, 1); - return messageModel; + payResult = JsonHelper.ParseFormByJson(returnData); } - switch (payResult.RESULT) + catch { - case "Y": - Dictionary dicCheckPars = new Dictionary(); - dicCheckPars.Add("RESULT", payResult.RESULT); - dicCheckPars.Add("ORDERID", payResult.ORDERID); - dicCheckPars.Add("AMOUNT", payResult.AMOUNT); - dicCheckPars.Add("WAITTIME", payResult.WAITTIME); - dicCheckPars.Add("TRACEID", payResult.TRACEID); - string strCheckPars = StringHelper.GetPars(dicCheckPars); - if (NotifyCheck(strCheckPars, payResult.SIGN, StaticPayInfo.pubKey)) - { - messageModel.Success = true; - messageModel.Message = "支付成功"; - } - else - { - messageModel.Success = false; - messageModel.Message = "签名失败"; - } - break; - case "N": - messageModel.Success = false; - messageModel.Message = "支付失败"; - break; - case "U": - case "Q": - int waittime = payResult.WAITTIME.ObjToInt(); - if (waittime <= 0) waittime = 5;//如果需要等待默认等待5秒后再次查询 - Thread.Sleep(waittime * 1000); - //轮询查询 - messageModel = await PayCheck(payModel, 1); - break; - default: - messageModel.Success = false; - messageModel.Message = "支付失败"; - break; + payResult = new PayResultModel { RESULT = "N", ERRMSG = "参数错误", ORDERID = payModel.ORDERID, AMOUNT = payModel.AMOUNT }; + returnData = StringHelper.GetCusLine(returnData, 15); } - messageModel.Data.ORDERID = payResult.ORDERID; - messageModel.Data.ERRCODE = payResult.ERRCODE; - messageModel.Data.ERRMSG = payResult.ERRMSG; - messageModel.Data.TRACEID = payResult.TRACEID; - messageModel.Data.AMOUNT = payResult.AMOUNT; - messageModel.Data.QRCODETYPE = payResult.QRCODETYPE; + _logger.LogInformation($"响应数据->{returnData}"); } catch (Exception ex) { - messageModel.Success = false; - messageModel.Message = "服务错误"; - messageModel.Data.ERRMSG = ex.Message; _logger.LogInformation($"异常信息:{ex.Message}"); _logger.LogInformation($"异常堆栈:{ex.StackTrace}"); + messageModel = await PayCheck(payModel, 1); + return messageModel; } - finally + switch (payResult.RESULT) { - _logger.LogInformation($"返回数据->{JsonHelper.GetJSON>(messageModel)}"); - _logger.LogInformation("支付结束"); + case "Y": + Dictionary dicCheckPars = new Dictionary(); + dicCheckPars.Add("RESULT", payResult.RESULT); + dicCheckPars.Add("ORDERID", payResult.ORDERID); + dicCheckPars.Add("AMOUNT", payResult.AMOUNT); + dicCheckPars.Add("WAITTIME", payResult.WAITTIME); + dicCheckPars.Add("TRACEID", payResult.TRACEID); + string strCheckPars = StringHelper.GetPars(dicCheckPars); + if (NotifyCheck(strCheckPars, payResult.SIGN, StaticPayInfo.pubKey)) + { + messageModel.Success = true; + messageModel.Message = "支付成功"; + } + else + { + messageModel.Success = false; + messageModel.Message = "签名失败"; + } + break; + case "N": + messageModel.Success = false; + messageModel.Message = "支付失败"; + break; + case "U": + case "Q": + int waittime = payResult.WAITTIME.ObjToInt(); + if (waittime <= 0) waittime = 5;//如果需要等待默认等待5秒后再次查询 + Thread.Sleep(waittime * 1000); + //轮询查询 + messageModel = await PayCheck(payModel, 1); + break; + default: + messageModel.Success = false; + messageModel.Message = "支付失败"; + break; } - return messageModel; + messageModel.Data.ORDERID = payResult.ORDERID; + messageModel.Data.ERRCODE = payResult.ERRCODE; + messageModel.Data.ERRMSG = payResult.ERRMSG; + messageModel.Data.TRACEID = payResult.TRACEID; + messageModel.Data.AMOUNT = payResult.AMOUNT; + messageModel.Data.QRCODETYPE = payResult.QRCODETYPE; } - public async Task> PayRefund(PayRefundNeedModel payModel) + catch (Exception ex) { - _logger.LogInformation("退款开始"); - ServiceResult messageModel = new ServiceResult(); - messageModel.Data = new PayRefundReturnResultModel(); - try + messageModel.Success = false; + messageModel.Message = "服务错误"; + messageModel.Data.ERRMSG = ex.Message; + _logger.LogInformation($"异常信息:{ex.Message}"); + _logger.LogInformation($"异常堆栈:{ex.StackTrace}"); + } + finally + { + _logger.LogInformation($"返回数据->{JsonHelper.GetJSON>(messageModel)}"); + _logger.LogInformation("支付结束"); + } + return messageModel; + } + public async Task> PayRefund(PayRefundNeedModel payModel) + { + _logger.LogInformation("退款开始"); + ServiceResult messageModel = new ServiceResult(); + messageModel.Data = new PayRefundReturnResultModel(); + try + { + _logger.LogInformation($"原始GET参数->{_httpContextAccessor.HttpContext.Request.QueryString}"); + + string REQUEST_SN = StringHelper.GetGuidToLongID().ToString().Substring(0, 16);//请求序列码 + string CUST_ID = StaticPayInfo.MERCHANTID;//商户号 + string USER_ID = StaticPayInfo.USER_ID;//操作员号 + string PASSWORD = StaticPayInfo.PASSWORD;//密码 + string TX_CODE = "5W1004";//交易码 + string LANGUAGE = "CN";//语言 + //string SIGN_INFO = "";//签名信息 + //string SIGNCERT = "";//签名CA信息 + //外联平台客户端服务部署的地址+设置的监听端口 + string sUrl = StaticPayInfo.OutAddress; + + //XML请求报文 + //string sRequestMsg = $" requestXml={REQUEST_SN}{CUST_ID}{USER_ID}{PASSWORD}{TX_CODE}{LANGUAGE}{payModel.MONEY}{payModel.ORDER}{payModel.REFUND_CODE} "; + string sRequestMsg = $"{REQUEST_SN}{CUST_ID}{USER_ID}{PASSWORD}{TX_CODE}{LANGUAGE}{payModel.MONEY}{payModel.ORDER}{payModel.REFUND_CODE} "; + + //string sRequestMsg = readRequestFile("E:/02-外联平台/06-测试/测试报文/商户网银/客户端连接-5W1001-W06.txt"); + + + //注意：请求报文必须放在requestXml参数送 + sRequestMsg = "requestXml=" + sRequestMsg; + + _logger.LogInformation("请求地址：" + sUrl); + _logger.LogInformation("请求报文：" + sRequestMsg); + + HttpClient request = new HttpClient(); + byte[] byteRquest = Encoding.GetEncoding("GB18030").GetBytes(sRequestMsg); + ByteArrayContent bytemsg = new ByteArrayContent(byteRquest); + HttpResponseMessage resulthd = await request.PostAsync(sUrl, bytemsg); + Stream result = await resulthd.Content.ReadAsStreamAsync(); + + StreamReader readerResult = new StreamReader(result, System.Text.Encoding.GetEncoding("GB18030")); + string sResult = await readerResult.ReadToEndAsync(); + _logger.LogInformation("响应报文:" + sResult); + var Xmlresult = XmlHelper.ParseFormByXml(sResult, "TX"); + if (Xmlresult.RETURN_CODE.Equals("000000")) { - _logger.LogInformation($"原始GET参数->{_httpContextAccessor.HttpContext.Request.QueryString}"); - - string REQUEST_SN = StringHelper.GetGuidToLongID().ToString().Substring(0, 16);//请求序列码 - string CUST_ID = StaticPayInfo.MERCHANTID;//商户号 - string USER_ID = StaticPayInfo.USER_ID;//操作员号 - string PASSWORD = StaticPayInfo.PASSWORD;//密码 - string TX_CODE = "5W1004";//交易码 - string LANGUAGE = "CN";//语言 - //string SIGN_INFO = "";//签名信息 - //string SIGNCERT = "";//签名CA信息 - //外联平台客户端服务部署的地址+设置的监听端口 - string sUrl = StaticPayInfo.OutAddress; - - //XML请求报文 - //string sRequestMsg = $" requestXml={REQUEST_SN}{CUST_ID}{USER_ID}{PASSWORD}{TX_CODE}{LANGUAGE}{payModel.MONEY}{payModel.ORDER}{payModel.REFUND_CODE} "; - string sRequestMsg = $"{REQUEST_SN}{CUST_ID}{USER_ID}{PASSWORD}{TX_CODE}{LANGUAGE}{payModel.MONEY}{payModel.ORDER}{payModel.REFUND_CODE} "; - - //string sRequestMsg = readRequestFile("E:/02-外联平台/06-测试/测试报文/商户网银/客户端连接-5W1001-W06.txt"); - - - //注意：请求报文必须放在requestXml参数送 - sRequestMsg = "requestXml=" + sRequestMsg; - - _logger.LogInformation("请求地址：" + sUrl); - _logger.LogInformation("请求报文：" + sRequestMsg); - - HttpClient request = new HttpClient(); - byte[] byteRquest = Encoding.GetEncoding("GB18030").GetBytes(sRequestMsg); - ByteArrayContent bytemsg = new ByteArrayContent(byteRquest); - HttpResponseMessage resulthd = await request.PostAsync(sUrl, bytemsg); - Stream result = await resulthd.Content.ReadAsStreamAsync(); - - StreamReader readerResult = new StreamReader(result, System.Text.Encoding.GetEncoding("GB18030")); - string sResult = await readerResult.ReadToEndAsync(); - _logger.LogInformation("响应报文:" + sResult); - var Xmlresult = XmlHelper.ParseFormByXml(sResult, "TX"); - if (Xmlresult.RETURN_CODE.Equals("000000")) - { - messageModel.Success = true; - messageModel.Message = "退款成功"; - } - else - { - messageModel.Success = false; - messageModel.Message = "退款失败"; - } - messageModel.Data.RETURN_MSG = Xmlresult.RETURN_MSG; - messageModel.Data.TX_CODE = Xmlresult.TX_CODE; - messageModel.Data.REQUEST_SN = Xmlresult.REQUEST_SN; - messageModel.Data.RETURN_CODE = Xmlresult.RETURN_CODE; - messageModel.Data.CUST_ID = Xmlresult.CUST_ID; - messageModel.Data.LANGUAGE = Xmlresult.LANGUAGE; - - messageModel.Data.AMOUNT = Xmlresult.TX_INFO?.AMOUNT; - messageModel.Data.PAY_AMOUNT = Xmlresult.TX_INFO?.PAY_AMOUNT; - messageModel.Data.ORDER_NUM = Xmlresult.TX_INFO?.ORDER_NUM; - request.Dispose(); + messageModel.Success = true; + messageModel.Message = "退款成功"; } - catch (Exception ex) + else { messageModel.Success = false; - messageModel.Message = "服务错误"; - messageModel.Data.RETURN_MSG = ex.Message; - _logger.LogInformation($"异常信息:{ex.Message}"); - _logger.LogInformation($"异常堆栈:{ex.StackTrace}"); - } - finally - { - _logger.LogInformation($"返回数据->{JsonHelper.GetJSON>(messageModel)}"); - _logger.LogInformation("退款结束"); - + messageModel.Message = "退款失败"; } - return messageModel; - + messageModel.Data.RETURN_MSG = Xmlresult.RETURN_MSG; + messageModel.Data.TX_CODE = Xmlresult.TX_CODE; + messageModel.Data.REQUEST_SN = Xmlresult.REQUEST_SN; + messageModel.Data.RETURN_CODE = Xmlresult.RETURN_CODE; + messageModel.Data.CUST_ID = Xmlresult.CUST_ID; + messageModel.Data.LANGUAGE = Xmlresult.LANGUAGE; + + messageModel.Data.AMOUNT = Xmlresult.TX_INFO?.AMOUNT; + messageModel.Data.PAY_AMOUNT = Xmlresult.TX_INFO?.PAY_AMOUNT; + messageModel.Data.ORDER_NUM = Xmlresult.TX_INFO?.ORDER_NUM; + request.Dispose(); + } + catch (Exception ex) + { + messageModel.Success = false; + messageModel.Message = "服务错误"; + messageModel.Data.RETURN_MSG = ex.Message; + _logger.LogInformation($"异常信息:{ex.Message}"); + _logger.LogInformation($"异常堆栈:{ex.StackTrace}"); } - public async Task> PayCheck(PayNeedModel payModel, int times) + finally { - _logger.LogInformation("轮询开始"); + _logger.LogInformation($"返回数据->{JsonHelper.GetJSON>(messageModel)}"); + _logger.LogInformation("退款结束"); + + } + return messageModel; - ServiceResult messageModel = new ServiceResult(); - messageModel.Data = new PayReturnResultModel(); - string url = string.Empty; - string param = string.Empty; - string returnData = string.Empty; + } + public async Task> PayCheck(PayNeedModel payModel, int times) + { + _logger.LogInformation("轮询开始"); + + ServiceResult messageModel = new ServiceResult(); + messageModel.Data = new PayReturnResultModel(); + string url = string.Empty; + string param = string.Empty; + string returnData = string.Empty; + try + { + //设置最大轮询次数,跟建行保持一致 + int theLastTime = 6; + if (times > theLastTime) throw new Exception($"轮询次数超过最大次数{theLastTime}"); + + string host = "https://ibsbjstar.ccb.com.cn/CCBIS/B2CMainPlat_00_BEPAY?"; + + Dictionary dic = new Dictionary(); + + dic.Add("MERCHANTID", StaticPayInfo.MERCHANTID);// => self::MERCHANTID, // 商户号 + dic.Add("POSID", StaticPayInfo.POSID);// => self::POSID, // 柜台号 + dic.Add("BRANCHID", StaticPayInfo.BRANCHID);// => self::BRANCHID, // 分行号 + dic.Add("TXCODE", "PAY101");// => 'PAY100', // 交易码 + dic.Add("QRYTIME", times.ToString());// => '', // 查询此时(每次加1) + dic.Add("MERFLAG", "1");// => '', // 商户类型 + dic.Add("ORDERID", payModel.ORDERID);// => '', // 订单号 + dic.Add("QRCODE", payModel.QRCODE);// => '', // 码信息（一维码、二维码） + + + //dic.Add("GROUPMCH", "");// => '', // 集团商户信息 + //dic.Add("QRCODETYPE", "");// => '', // 支付类型1：龙支付 2：微信 3：支付宝 4：银联 + //dic.Add("TERMNO1", "");// => '', // 终端编号 1 + //dic.Add("TERMNO2", "");// => '', // 终端编号 2 + //dic.Add("AMOUNT", "");// => '0.01', // 订单金额，单位：元 + //dic.Add("PROINFO", "");// => '', // 商品名称 + //dic.Add("REMARK1", "");// => '', // 备注 1 + //dic.Add("REMARK2", "");// => '', // 备注 2 + //dic.Add("FZINFO1", "");// => '', // 分账信息一 + //dic.Add("FZINFO2", "");// => '', // 分账信息二 + //dic.Add("SUB_APPID", "");// => '', // 子商户公众账号 ID + //dic.Add("RETURN_FIELD", "");// => '', // 返回信息位图 + //dic.Add("USERPARAM", "");// => '', // 实名支付 + //dic.Add("detail", "");// => '', // 商品详情 + //dic.Add("goods_tag", "");// => '', // 订单优惠标记 + + //商户信息 + Dictionary dicInfo = new Dictionary(); + dicInfo.Add("MERCHANTID", StaticPayInfo.MERCHANTID);// => self::MERCHANTID, // 商户号 + dicInfo.Add("POSID", StaticPayInfo.POSID);// => self::POSID, // 柜台号 + dicInfo.Add("BRANCHID", StaticPayInfo.BRANCHID);// => self::BRANCHID, // 分行号 + var Info = StringHelper.GetPars(dicInfo); + + //var newDic = dic.OrderBy(t => t.Key).ToDictionary(o => o.Key, p => p.Value); + //参数信息 + param = StringHelper.GetPars(dic); + //加密 + var paramEncryption = new CCBPayUtil().makeCCBParam(param, StaticPayInfo.pubKey); + //拼接请求串 + url = host + Info + "&ccbParam=" + paramEncryption; + //请求 + _logger.LogInformation($"请求地址->{url}"); + _logger.LogInformation($"请求参数->{param}"); + //转换数据 + PayResultModel payResult; try { - //设置最大轮询次数,跟建行保持一致 - int theLastTime = 6; - if (times > theLastTime) throw new Exception($"轮询次数超过最大次数{theLastTime}"); - - string host = "https://ibsbjstar.ccb.com.cn/CCBIS/B2CMainPlat_00_BEPAY?"; - - Dictionary dic = new Dictionary(); - - dic.Add("MERCHANTID", StaticPayInfo.MERCHANTID);// => self::MERCHANTID, // 商户号 - dic.Add("POSID", StaticPayInfo.POSID);// => self::POSID, // 柜台号 - dic.Add("BRANCHID", StaticPayInfo.BRANCHID);// => self::BRANCHID, // 分行号 - dic.Add("TXCODE", "PAY101");// => 'PAY100', // 交易码 - dic.Add("QRYTIME", times.ToString());// => '', // 查询此时(每次加1) - dic.Add("MERFLAG", "1");// => '', // 商户类型 - dic.Add("ORDERID", payModel.ORDERID);// => '', // 订单号 - dic.Add("QRCODE", payModel.QRCODE);// => '', // 码信息（一维码、二维码） - - - //dic.Add("GROUPMCH", "");// => '', // 集团商户信息 - //dic.Add("QRCODETYPE", "");// => '', // 支付类型1：龙支付 2：微信 3：支付宝 4：银联 - //dic.Add("TERMNO1", "");// => '', // 终端编号 1 - //dic.Add("TERMNO2", "");// => '', // 终端编号 2 - //dic.Add("AMOUNT", "");// => '0.01', // 订单金额，单位：元 - //dic.Add("PROINFO", "");// => '', // 商品名称 - //dic.Add("REMARK1", "");// => '', // 备注 1 - //dic.Add("REMARK2", "");// => '', // 备注 2 - //dic.Add("FZINFO1", "");// => '', // 分账信息一 - //dic.Add("FZINFO2", "");// => '', // 分账信息二 - //dic.Add("SUB_APPID", "");// => '', // 子商户公众账号 ID - //dic.Add("RETURN_FIELD", "");// => '', // 返回信息位图 - //dic.Add("USERPARAM", "");// => '', // 实名支付 - //dic.Add("detail", "");// => '', // 商品详情 - //dic.Add("goods_tag", "");// => '', // 订单优惠标记 - - //商户信息 - Dictionary dicInfo = new Dictionary(); - dicInfo.Add("MERCHANTID", StaticPayInfo.MERCHANTID);// => self::MERCHANTID, // 商户号 - dicInfo.Add("POSID", StaticPayInfo.POSID);// => self::POSID, // 柜台号 - dicInfo.Add("BRANCHID", StaticPayInfo.BRANCHID);// => self::BRANCHID, // 分行号 - var Info = StringHelper.GetPars(dicInfo); - - //var newDic = dic.OrderBy(t => t.Key).ToDictionary(o => o.Key, p => p.Value); - //参数信息 - param = StringHelper.GetPars(dic); - //加密 - var paramEncryption = new CCBPayUtil().makeCCBParam(param, StaticPayInfo.pubKey); - //拼接请求串 - url = host + Info + "&ccbParam=" + paramEncryption; - //请求 - _logger.LogInformation($"请求地址->{url}"); - _logger.LogInformation($"请求参数->{param}"); - //转换数据 - PayResultModel payResult; - try - { - returnData = await HttpHelper.PostAsync(url); - _logger.LogInformation($"响应数据->{returnData}"); - } - catch (Exception ex) - { - _logger.LogInformation($"异常信息:{ex.Message}"); - _logger.LogInformation($"异常堆栈:{ex.StackTrace}"); - return await PayCheck(payModel, ++times); - } - - - try - { - payResult = JsonHelper.ParseFormByJson(returnData); - } - catch - { - payResult = new PayResultModel { RESULT = "N", ERRMSG = "参数错误", ORDERID = payModel.ORDERID, AMOUNT = payModel.AMOUNT }; - } - - switch (payResult.RESULT) - { - case "Y": - Dictionary dicCheckPars = new Dictionary(); - dicCheckPars.Add("RESULT", payResult.RESULT); - dicCheckPars.Add("ORDERID", payResult.ORDERID); - dicCheckPars.Add("AMOUNT", payResult.AMOUNT); - dicCheckPars.Add("WAITTIME", payResult.WAITTIME); - string strCheckPars = StringHelper.GetPars(dicCheckPars); - if (NotifyCheck(strCheckPars, payResult.SIGN, StaticPayInfo.pubKey)) - { - messageModel.Success = true; - messageModel.Message = "支付成功"; - } - else - { - messageModel.Success = false; - messageModel.Message = "签名失败"; - } - break; - case "N": - messageModel.Success = false; - messageModel.Message = "支付失败"; - break; - case "U": - case "Q": - int waittime = payResult.WAITTIME.ObjToInt(); - if (waittime <= 0) waittime = 5;//如果需要等待默认等待5秒后再次查询 - Thread.Sleep(waittime * 1000); - //改成轮询查询 - messageModel = await PayCheck(payModel, ++times); - break; - default: - messageModel.Success = false; - messageModel.Message = "支付失败"; - break; - } - messageModel.Data.ORDERID = payResult.ORDERID; - messageModel.Data.ERRCODE = payResult.ERRCODE; - messageModel.Data.ERRMSG = payResult.ERRMSG; - messageModel.Data.TRACEID = payResult.TRACEID; - messageModel.Data.AMOUNT = payResult.AMOUNT; - messageModel.Data.QRCODETYPE = payResult.QRCODETYPE; + returnData = await HttpHelper.PostAsync(url); + _logger.LogInformation($"响应数据->{returnData}"); } catch (Exception ex) { - messageModel.Success = false; - messageModel.Message = "服务错误"; - messageModel.Data.ERRMSG = ex.Message; _logger.LogInformation($"异常信息:{ex.Message}"); _logger.LogInformation($"异常堆栈:{ex.StackTrace}"); + return await PayCheck(payModel, ++times); } - finally + + + try { - _logger.LogInformation($"返回数据->{JsonHelper.GetJSON>(messageModel)}"); - _logger.LogInformation("轮序结束"); + payResult = JsonHelper.ParseFormByJson(returnData); + } + catch + { + payResult = new PayResultModel { RESULT = "N", ERRMSG = "参数错误", ORDERID = payModel.ORDERID, AMOUNT = payModel.AMOUNT }; } - return messageModel; - } - public bool NotifyCheck(string strSrc, string sign, string pubKey) + switch (payResult.RESULT) + { + case "Y": + Dictionary dicCheckPars = new Dictionary(); + dicCheckPars.Add("RESULT", payResult.RESULT); + dicCheckPars.Add("ORDERID", payResult.ORDERID); + dicCheckPars.Add("AMOUNT", payResult.AMOUNT); + dicCheckPars.Add("WAITTIME", payResult.WAITTIME); + string strCheckPars = StringHelper.GetPars(dicCheckPars); + if (NotifyCheck(strCheckPars, payResult.SIGN, StaticPayInfo.pubKey)) + { + messageModel.Success = true; + messageModel.Message = "支付成功"; + } + else + { + messageModel.Success = false; + messageModel.Message = "签名失败"; + } + break; + case "N": + messageModel.Success = false; + messageModel.Message = "支付失败"; + break; + case "U": + case "Q": + int waittime = payResult.WAITTIME.ObjToInt(); + if (waittime <= 0) waittime = 5;//如果需要等待默认等待5秒后再次查询 + Thread.Sleep(waittime * 1000); + //改成轮询查询 + messageModel = await PayCheck(payModel, ++times); + break; + default: + messageModel.Success = false; + messageModel.Message = "支付失败"; + break; + } + messageModel.Data.ORDERID = payResult.ORDERID; + messageModel.Data.ERRCODE = payResult.ERRCODE; + messageModel.Data.ERRMSG = payResult.ERRMSG; + messageModel.Data.TRACEID = payResult.TRACEID; + messageModel.Data.AMOUNT = payResult.AMOUNT; + messageModel.Data.QRCODETYPE = payResult.QRCODETYPE; + } + catch (Exception ex) { - - return new CCBPayUtil().verifyNotifySign(strSrc, sign, pubKey); + messageModel.Success = false; + messageModel.Message = "服务错误"; + messageModel.Data.ERRMSG = ex.Message; + _logger.LogInformation($"异常信息:{ex.Message}"); + _logger.LogInformation($"异常堆栈:{ex.StackTrace}"); } + finally + { + _logger.LogInformation($"返回数据->{JsonHelper.GetJSON>(messageModel)}"); + _logger.LogInformation("轮序结束"); + } + return messageModel; + } + + public bool NotifyCheck(string strSrc, string sign, string pubKey) + { + + return new CCBPayUtil().verifyNotifySign(strSrc, sign, pubKey); } } diff --git a/Tiobon.Core.Services/PermissionServices.cs b/Tiobon.Core.Services/PermissionServices.cs index 2361a4cf..dab3f6e3 100644 --- a/Tiobon.Core.Services/PermissionServices.cs +++ b/Tiobon.Core.Services/PermissionServices.cs @@ -1,15 +1,9 @@ -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// PermissionServices +/// +public class PermissionServices : BaseServices, IPermissionServices { - /// - /// PermissionServices - /// - public class PermissionServices : BaseServices, IPermissionServices - { - } } diff --git a/Tiobon.Core.Services/RoleModulePermissionServices.cs b/Tiobon.Core.Services/RoleModulePermissionServices.cs index 2b01c4de..5679a1a1 100644 --- a/Tiobon.Core.Services/RoleModulePermissionServices.cs +++ b/Tiobon.Core.Services/RoleModulePermissionServices.cs @@ -1,92 +1,83 @@ -using Tiobon.Core.Common; -using Tiobon.Core.IRepository; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; +using Tiobon.Core.IRepository; -namespace Tiobon.Core.Services +namespace Tiobon.Core.Services; + +/// +/// RoleModulePermissionServices 应用服务 +/// +public class RoleModulePermissionServices : BaseServices, IRoleModulePermissionServices { - /// - /// RoleModulePermissionServices 应用服务 - /// - public class RoleModulePermissionServices : BaseServices, IRoleModulePermissionServices - { - readonly IRoleModulePermissionRepository _dal; - readonly IBaseRepository _moduleRepository; - readonly IBaseRepository _roleRepository; + readonly IRoleModulePermissionRepository _dal; + readonly IBaseRepository _moduleRepository; + readonly IBaseRepository _roleRepository; - // 将多个仓储接口注入 - public RoleModulePermissionServices( - IRoleModulePermissionRepository dal, - IBaseRepository moduleRepository, - IBaseRepository roleRepository) - { - - this._dal = dal; - this._moduleRepository = moduleRepository; - this._roleRepository = roleRepository; - } + // 将多个仓储接口注入 + public RoleModulePermissionServices( + IRoleModulePermissionRepository dal, + IBaseRepository moduleRepository, + IBaseRepository roleRepository) + { + + this._dal = dal; + this._moduleRepository = moduleRepository; + this._roleRepository = roleRepository; + } - /// - /// 获取全部 角色接口(按钮)关系数据 - /// - /// - [Caching(AbsoluteExpiration = 10)] - public async Task> GetRoleModule() - { - var roleModulePermissions = await base.Query(a => a.IsDeleted == false); - var roles = await _roleRepository.Query(a => a.IsDeleted == false); - var modules = await _moduleRepository.Query(a => a.IsDeleted == false); + /// + /// 获取全部 角色接口(按钮)关系数据 + /// + /// + [Caching(AbsoluteExpiration = 10)] + public async Task> GetRoleModule() + { + var roleModulePermissions = await base.Query(a => a.IsDeleted == false); + var roles = await _roleRepository.Query(a => a.IsDeleted == false); + var modules = await _moduleRepository.Query(a => a.IsDeleted == false); - //var roleModulePermissionsAsync = base.Query(a => a.IsDeleted == false); - //var rolesAsync = _roleRepository.Query(a => a.IsDeleted == false); - //var modulesAsync = _moduleRepository.Query(a => a.IsDeleted == false); + //var roleModulePermissionsAsync = base.Query(a => a.IsDeleted == false); + //var rolesAsync = _roleRepository.Query(a => a.IsDeleted == false); + //var modulesAsync = _moduleRepository.Query(a => a.IsDeleted == false); - //var roleModulePermissions = await roleModulePermissionsAsync; - //var roles = await rolesAsync; - //var modules = await modulesAsync; + //var roleModulePermissions = await roleModulePermissionsAsync; + //var roles = await rolesAsync; + //var modules = await modulesAsync; - if (roleModulePermissions.Count > 0) + if (roleModulePermissions.Count > 0) + { + foreach (var item in roleModulePermissions) { - foreach (var item in roleModulePermissions) - { - item.Role = roles.FirstOrDefault(d => d.Id == item.RoleId); - item.Module = modules.FirstOrDefault(d => d.Id == item.ModuleId); - } - + item.Role = roles.FirstOrDefault(d => d.Id == item.RoleId); + item.Module = modules.FirstOrDefault(d => d.Id == item.ModuleId); } - return roleModulePermissions; - } - public async Task> QueryMuchTable() - { - return await _dal.QueryMuchTable(); } + return roleModulePermissions; + } - public async Task> RoleModuleMaps() - { - return await _dal.RoleModuleMaps(); - } + public async Task> QueryMuchTable() + { + return await _dal.QueryMuchTable(); + } - public async Task> GetRMPMaps() - { - return await _dal.GetRMPMaps(); - } + public async Task> RoleModuleMaps() + { + return await _dal.RoleModuleMaps(); + } - /// - /// 批量更新菜单与接口的关系 - /// - /// 菜单主键 - /// 接口主键 - /// - public async Task UpdateModuleId(long permissionId, long moduleId) - { - await _dal.UpdateModuleId(permissionId, moduleId); - } + public async Task> GetRMPMaps() + { + return await _dal.GetRMPMaps(); + } + + /// + /// 批量更新菜单与接口的关系 + /// + /// 菜单主键 + /// 接口主键 + /// + public async Task UpdateModuleId(long permissionId, long moduleId) + { + await _dal.UpdateModuleId(permissionId, moduleId); } } diff --git a/Tiobon.Core.Services/RoleServices.cs b/Tiobon.Core.Services/RoleServices.cs index 12144404..c5b8c7eb 100644 --- a/Tiobon.Core.Services/RoleServices.cs +++ b/Tiobon.Core.Services/RoleServices.cs @@ -1,46 +1,37 @@ -using Tiobon.Core.Common; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using System.Linq; -using System.Threading.Tasks; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// RoleServices +/// +public class RoleServices : BaseServices, IRoleServices { - /// - /// RoleServices - /// - public class RoleServices : BaseServices, IRoleServices + /// + /// + /// + /// + /// + public async Task SaveRole(string roleName) { - /// - /// - /// - /// - /// - public async Task SaveRole(string roleName) + Role role = new Role(roleName); + Role model = new Role(); + var userList = await base.Query(a => a.Name == role.Name && a.Enabled); + if (userList.Count > 0) { - Role role = new Role(roleName); - Role model = new Role(); - var userList = await base.Query(a => a.Name == role.Name && a.Enabled); - if (userList.Count > 0) - { - model = userList.FirstOrDefault(); - } - else - { - var id = await base.Add(role); - model = await base.QueryById(id); - } - - return model; - + model = userList.FirstOrDefault(); } - - [Caching(AbsoluteExpiration = 30)] - public async Task GetRoleNameByRid(int rid) + else { - return ((await base.QueryById(rid))?.Name); + var id = await base.Add(role); + model = await base.QueryById(id); } + + return model; + + } + + [Caching(AbsoluteExpiration = 30)] + public async Task GetRoleNameByRid(int rid) + { + return ((await base.QueryById(rid))?.Name); } } diff --git a/Tiobon.Core.Services/SplitDemoServices.cs b/Tiobon.Core.Services/SplitDemoServices.cs index a1dd0602..ad97c22e 100644 --- a/Tiobon.Core.Services/SplitDemoServices.cs +++ b/Tiobon.Core.Services/SplitDemoServices.cs @@ -1,23 +1,15 @@ -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using System.Linq; -using System.Threading.Tasks; +namespace Tiobon.Core.FrameWork.Services; -namespace Tiobon.Core.FrameWork.Services +/// +/// sysUserInfoServices +/// +public class SplitDemoServices : BaseServices, ISplitDemoServices { - /// - /// sysUserInfoServices - /// - public class SplitDemoServices : BaseServices, ISplitDemoServices + private readonly IBaseRepository _splitDemoRepository; + public SplitDemoServices(IBaseRepository splitDemoRepository) { - private readonly IBaseRepository _splitDemoRepository; - public SplitDemoServices(IBaseRepository splitDemoRepository) - { - _splitDemoRepository = splitDemoRepository; - } + _splitDemoRepository = splitDemoRepository; + } - } } diff --git a/Tiobon.Core.Services/TasksLogServices.cs b/Tiobon.Core.Services/TasksLogServices.cs index fa7571a8..dd14d08f 100644 --- a/Tiobon.Core.Services/TasksLogServices.cs +++ b/Tiobon.Core.Services/TasksLogServices.cs @@ -1,137 +1,124 @@ -using System.Linq.Expressions; -using System; -using System.Threading.Tasks; -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using Tiobon.Core.Common.Extensions; -using SqlSugar; -using Tiobon.Core.Model; -using System.Collections.Generic; -using System.Linq; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +public partial class TasksLogServices : BaseServices, ITasksLogServices { - public partial class TasksLogServices : BaseServices, ITasksLogServices + public async Task> GetTaskLogs(long jobId, int page, int intPageSize, DateTime? runTime, DateTime? endTime) { - public async Task> GetTaskLogs(long jobId, int page, int intPageSize, DateTime? runTime, DateTime? endTime) - { - RefAsync totalCount = 0; - Expression> whereExpression = log => true; - if (jobId > 0) whereExpression = whereExpression.And(log => log.JobId == jobId); - var data = await this.Db.Queryable() - .LeftJoin((log, qz) => log.JobId == qz.Id) - .OrderByDescending((log) => log.RunTime) - .WhereIF(jobId > 0, (log) => log.JobId == jobId) - .WhereIF(runTime != null, (log) => log.RunTime >= runTime.Value) - .WhereIF(endTime != null, (log) => log.RunTime <= endTime.Value) - .Select((log, qz) => new Ghre_TasksLog - { - RunPars = log.RunPars, - RunResult = log.RunResult, - RunTime = log.RunTime, - EndTime = log.EndTime, - ErrMessage = log.ErrMessage, - ErrStackTrace = log.ErrStackTrace, - TotalTime = log.TotalTime, - Name = qz.Name, - JobGroup = qz.JobGroup + RefAsync totalCount = 0; + Expression> whereExpression = log => true; + if (jobId > 0) whereExpression = whereExpression.And(log => log.JobId == jobId); + var data = await this.Db.Queryable() + .LeftJoin((log, qz) => log.JobId == qz.Id) + .OrderByDescending((log) => log.RunTime) + .WhereIF(jobId > 0, (log) => log.JobId == jobId) + .WhereIF(runTime != null, (log) => log.RunTime >= runTime.Value) + .WhereIF(endTime != null, (log) => log.RunTime <= endTime.Value) + .Select((log, qz) => new Ghre_TasksLog + { + RunPars = log.RunPars, + RunResult = log.RunResult, + RunTime = log.RunTime, + EndTime = log.EndTime, + ErrMessage = log.ErrMessage, + ErrStackTrace = log.ErrStackTrace, + TotalTime = log.TotalTime, + Name = qz.Name, + JobGroup = qz.JobGroup - }) - .ToPageListAsync(page, intPageSize, totalCount); - return new PageModel(page, totalCount, intPageSize, data); - } - public async Task GetTaskOverview(long jobId, DateTime? runTime, DateTime? endTime, string type) + }) + .ToPageListAsync(page, intPageSize, totalCount); + return new PageModel(page, totalCount, intPageSize, data); + } + public async Task GetTaskOverview(long jobId, DateTime? runTime, DateTime? endTime, string type) + { + //按年 + if ("year".Equals(type)) { - //按年 - if ("year".Equals(type)) + + var days = endTime.Value.Year - runTime.Value.Year; + var dayArray = new List(); + while (days >= 0) { + dayArray.Add(new DateTime(runTime.Value.Year + days, 1, 1)); + days--; + } + var queryableLeft = this.Db.Reportable(dayArray).ToQueryable(); + var queryableRight = this.Db.Queryable().Where((x) => x.RunTime.Year >= runTime.Value.Year && x.RunTime.Year <= endTime.Value.Year); ; ; //声名表 - var days = endTime.Value.Year - runTime.Value.Year; - var dayArray = new List(); - while (days >= 0) + var list = this.Db.Queryable(queryableLeft, queryableRight, JoinType.Left, + (x1, x2) => x1.ColumnName.Year == x2.RunTime.Year) + .GroupBy((x1, x2) => x1.ColumnName) + .Select((x1, x2) => new { - dayArray.Add(new DateTime(runTime.Value.Year + days, 1, 1)); - days--; - } - var queryableLeft = this.Db.Reportable(dayArray).ToQueryable(); - var queryableRight = this.Db.Queryable().Where((x) => x.RunTime.Year >= runTime.Value.Year && x.RunTime.Year <= endTime.Value.Year); ; ; //声名表 - - var list = this.Db.Queryable(queryableLeft, queryableRight, JoinType.Left, - (x1, x2) => x1.ColumnName.Year == x2.RunTime.Year) - .GroupBy((x1, x2) => x1.ColumnName) - .Select((x1, x2) => new - { - 执行次数 = SqlFunc.AggregateSum(SqlFunc.IIF(x2.Id > 0, 1, 0)), - date = x1.ColumnName.Year.ToString() + "年" - }).ToList().OrderBy(t => t.date); - return list; - } - else if ("month".Equals(type)) - { - //按月 - var queryableLeft = this.Db.Reportable(ReportableDateType.MonthsInLast1years).ToQueryable(); //生成月份 //ReportableDateType.MonthsInLast1yea 表式近一年月份 并且queryable之后还能在where过滤 - var queryableRight = this.Db.Queryable().Where((x) => x.RunTime.Year == runTime.Value.Year); //声名表 + 执行次数 = SqlFunc.AggregateSum(SqlFunc.IIF(x2.Id > 0, 1, 0)), + date = x1.ColumnName.Year.ToString() + "年" + }).ToList().OrderBy(t => t.date); + return list; + } + else if ("month".Equals(type)) + { + //按月 + var queryableLeft = this.Db.Reportable(ReportableDateType.MonthsInLast1years).ToQueryable(); //生成月份 //ReportableDateType.MonthsInLast1yea 表式近一年月份 并且queryable之后还能在where过滤 + var queryableRight = this.Db.Queryable().Where((x) => x.RunTime.Year == runTime.Value.Year); //声名表 - //月份和表JOIN - var list = queryableLeft - .LeftJoin(queryableRight, (x1, x2) => x2.RunTime.ToString("MM月") == x1.ColumnName.ToString("MM月")) + //月份和表JOIN + var list = queryableLeft + .LeftJoin(queryableRight, (x1, x2) => x2.RunTime.ToString("MM月") == x1.ColumnName.ToString("MM月")) - .GroupBy((x1, x2) => x1.ColumnName) - .Select((x1, x2) => new - { - //null的数据要为0所以不能用count - 执行次数 = SqlFunc.AggregateSum(SqlFunc.IIF(x2.Id > 0, 1, 0)), - date = x1.ColumnName.ToString("MM月") - } - ).ToList().OrderBy(t => t.date); - await Task.CompletedTask; - return list; - } - else if ("day".Equals(type)) - { - //按日 - var time = runTime.Value; - var days = DateTime.DaysInMonth(time.Year, time.Month); - var dayArray = Enumerable.Range(1, days).Select(it => Convert.ToDateTime(time.ToString("yyyy-MM-" + it))).ToList();//转成时间数组 - var queryableLeft = this.Db.Reportable(dayArray).ToQueryable(); - var star = Convert.ToDateTime(runTime.Value.ToString("yyyy-MM-01 00:00:00")); - var end = Convert.ToDateTime(runTime.Value.ToString($"yyyy-MM-{days} 23:59:59")); - var queryableRight = this.Db.Queryable().Where((x) => x.RunTime >= star && x.RunTime <= end); ; ; //声名表 + .GroupBy((x1, x2) => x1.ColumnName) + .Select((x1, x2) => new + { + //null的数据要为0所以不能用count + 执行次数 = SqlFunc.AggregateSum(SqlFunc.IIF(x2.Id > 0, 1, 0)), + date = x1.ColumnName.ToString("MM月") + } + ).ToList().OrderBy(t => t.date); + await Task.CompletedTask; + return list; + } + else if ("day".Equals(type)) + { + //按日 + var time = runTime.Value; + var days = DateTime.DaysInMonth(time.Year, time.Month); + var dayArray = Enumerable.Range(1, days).Select(it => Convert.ToDateTime(time.ToString("yyyy-MM-" + it))).ToList();//转成时间数组 + var queryableLeft = this.Db.Reportable(dayArray).ToQueryable(); + var star = Convert.ToDateTime(runTime.Value.ToString("yyyy-MM-01 00:00:00")); + var end = Convert.ToDateTime(runTime.Value.ToString($"yyyy-MM-{days} 23:59:59")); + var queryableRight = this.Db.Queryable().Where((x) => x.RunTime >= star && x.RunTime <= end); ; ; //声名表 - var list = this.Db.Queryable(queryableLeft, queryableRight, JoinType.Left, - (x1, x2) => x1.ColumnName.Date == x2.RunTime.Date) - .GroupBy((x1, x2) => x1.ColumnName) - .Select((x1, x2) => new - { - 执行次数 = SqlFunc.AggregateSum(SqlFunc.IIF(x2.Id > 0, 1, 0)), - date = x1.ColumnName.Day - }).ToList().OrderBy(t => t.date); - await Task.CompletedTask; - return list; - } - else if ("hour".Equals(type)) - { - //按小时 - var time = runTime.Value; - var days = 24; - var dayArray = Enumerable.Range(0, days).Select(it => Convert.ToDateTime(time.ToString($"yyyy-MM-dd {it.ToString().PadLeft(2, '0')}:00:00"))).ToList();//转成时间数组 - var queryableLeft = this.Db.Reportable(dayArray).ToQueryable(); - var queryableRight = this.Db.Queryable().Where((x) => x.RunTime >= runTime.Value.Date && x.RunTime <= runTime.Value.Date.AddDays(1).AddMilliseconds(-1)); //声名表 + var list = this.Db.Queryable(queryableLeft, queryableRight, JoinType.Left, + (x1, x2) => x1.ColumnName.Date == x2.RunTime.Date) + .GroupBy((x1, x2) => x1.ColumnName) + .Select((x1, x2) => new + { + 执行次数 = SqlFunc.AggregateSum(SqlFunc.IIF(x2.Id > 0, 1, 0)), + date = x1.ColumnName.Day + }).ToList().OrderBy(t => t.date); + await Task.CompletedTask; + return list; + } + else if ("hour".Equals(type)) + { + //按小时 + var time = runTime.Value; + var days = 24; + var dayArray = Enumerable.Range(0, days).Select(it => Convert.ToDateTime(time.ToString($"yyyy-MM-dd {it.ToString().PadLeft(2, '0')}:00:00"))).ToList();//转成时间数组 + var queryableLeft = this.Db.Reportable(dayArray).ToQueryable(); + var queryableRight = this.Db.Queryable().Where((x) => x.RunTime >= runTime.Value.Date && x.RunTime <= runTime.Value.Date.AddDays(1).AddMilliseconds(-1)); //声名表 - var list = this.Db.Queryable(queryableLeft, queryableRight, JoinType.Left, - (x1, x2) => x1.ColumnName.Hour == x2.RunTime.Hour) - .GroupBy((x1, x2) => x1.ColumnName) - .Select((x1, x2) => new - { - 执行次数 = SqlFunc.AggregateSum(SqlFunc.IIF(x2.Id > 0, 1, 0)), - date = x1.ColumnName.Hour - }).ToList().OrderBy(t => t.date); - await Task.CompletedTask; - return list; - } + var list = this.Db.Queryable(queryableLeft, queryableRight, JoinType.Left, + (x1, x2) => x1.ColumnName.Hour == x2.RunTime.Hour) + .GroupBy((x1, x2) => x1.ColumnName) + .Select((x1, x2) => new + { + 执行次数 = SqlFunc.AggregateSum(SqlFunc.IIF(x2.Id > 0, 1, 0)), + date = x1.ColumnName.Hour + }).ToList().OrderBy(t => t.date); await Task.CompletedTask; - return null; + return list; } + await Task.CompletedTask; + return null; } } diff --git a/Tiobon.Core.Services/TasksQzServices.cs b/Tiobon.Core.Services/TasksQzServices.cs index 4320be03..590258fd 100644 --- a/Tiobon.Core.Services/TasksQzServices.cs +++ b/Tiobon.Core.Services/TasksQzServices.cs @@ -1,13 +1,7 @@ -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +public partial class TasksQzServices : BaseServices, ITasksQzServices { - public partial class TasksQzServices : BaseServices, ITasksQzServices - { - } } - \ No newline at end of file + \ No newline at end of file diff --git a/Tiobon.Core.Services/TenantService.cs b/Tiobon.Core.Services/TenantService.cs index 2c03cdab..3c9783db 100644 --- a/Tiobon.Core.Services/TenantService.cs +++ b/Tiobon.Core.Services/TenantService.cs @@ -1,10 +1,6 @@ using Tiobon.Core.Common.DB; using Tiobon.Core.Common.Seed; -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; using Tiobon.Core.Repository.UnitOfWorks; -using Tiobon.Core.Services.BASE; -using System.Threading.Tasks; namespace Tiobon.Core.Services; diff --git a/Tiobon.Core.Services/UserRoleServices.cs b/Tiobon.Core.Services/UserRoleServices.cs index fa0f152d..2f9ede2f 100644 --- a/Tiobon.Core.Services/UserRoleServices.cs +++ b/Tiobon.Core.Services/UserRoleServices.cs @@ -1,50 +1,41 @@ -using Tiobon.Core.Common; -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using System.Linq; -using System.Threading.Tasks; +namespace Tiobon.Core.Services; -namespace Tiobon.Core.Services +/// +/// UserRoleServices +/// +public class UserRoleServices : BaseServices, IUserRoleServices { /// - /// UserRoleServices - /// - public class UserRoleServices : BaseServices, IUserRoleServices + /// + /// + /// + /// + /// + public async Task SaveUserRole(long uid, long rid) { - /// - /// - /// - /// - /// - /// - public async Task SaveUserRole(long uid, long rid) - { - UserRole userRole = new UserRole(uid, rid); + UserRole userRole = new UserRole(uid, rid); - UserRole model = new UserRole(); - var userList = await base.Query(a => a.UserId == userRole.UserId && a.RoleId == userRole.RoleId); - if (userList.Count > 0) - { - model = userList.FirstOrDefault(); - } - else - { - var id = await base.Add(userRole); - model = await base.QueryById(id); - } + UserRole model = new UserRole(); + var userList = await base.Query(a => a.UserId == userRole.UserId && a.RoleId == userRole.RoleId); + if (userList.Count > 0) + { + model = userList.FirstOrDefault(); + } + else + { + var id = await base.Add(userRole); + model = await base.QueryById(id); + } - return model; + return model; - } + } - [Caching(AbsoluteExpiration = 30)] - public async Task GetRoleIdByUid(long uid) - { - return ((await base.Query(d => d.UserId == uid)).OrderByDescending(d => d.Id).LastOrDefault()?.RoleId).ObjToInt(); - } + [Caching(AbsoluteExpiration = 30)] + public async Task GetRoleIdByUid(long uid) + { + return ((await base.Query(d => d.UserId == uid)).OrderByDescending(d => d.Id).LastOrDefault()?.RoleId).ObjToInt(); } } diff --git a/Tiobon.Core.Services/sysUserInfoServices.cs b/Tiobon.Core.Services/sysUserInfoServices.cs index 00c9bfce..fbda6009 100644 --- a/Tiobon.Core.Services/sysUserInfoServices.cs +++ b/Tiobon.Core.Services/sysUserInfoServices.cs @@ -1,73 +1,65 @@ -using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Services.BASE; -using System.Linq; -using System.Threading.Tasks; +namespace Tiobon.Core.FrameWork.Services; -namespace Tiobon.Core.FrameWork.Services +/// +/// sysUserInfoServices +/// +public class SysUserInfoServices : BaseServices, ISysUserInfoServices { + private readonly IBaseRepository _userRoleRepository; + private readonly IBaseRepository _roleRepository; + public SysUserInfoServices(IBaseRepository userRoleRepository, IBaseRepository roleRepository) + { + _userRoleRepository = userRoleRepository; + _roleRepository = roleRepository; + } /// - /// sysUserInfoServices - /// - public class SysUserInfoServices : BaseServices, ISysUserInfoServices + /// + /// + /// + /// + /// + public async Task SaveUserInfo(string loginName, string loginPwd) { - private readonly IBaseRepository _userRoleRepository; - private readonly IBaseRepository _roleRepository; - public SysUserInfoServices(IBaseRepository userRoleRepository, IBaseRepository roleRepository) + SysUserInfo sysUserInfo = new SysUserInfo(loginName, loginPwd); + SysUserInfo model = new SysUserInfo(); + var userList = await base.Query(a => a.LoginName == sysUserInfo.LoginName && a.LoginPWD == sysUserInfo.LoginPWD); + if (userList.Count > 0) { - _userRoleRepository = userRoleRepository; - _roleRepository = roleRepository; + model = userList.FirstOrDefault(); } - /// - /// - /// - /// - /// - /// - public async Task SaveUserInfo(string loginName, string loginPwd) + else { - SysUserInfo sysUserInfo = new SysUserInfo(loginName, loginPwd); - SysUserInfo model = new SysUserInfo(); - var userList = await base.Query(a => a.LoginName == sysUserInfo.LoginName && a.LoginPWD == sysUserInfo.LoginPWD); - if (userList.Count > 0) - { - model = userList.FirstOrDefault(); - } - else - { - var id = await base.Add(sysUserInfo); - model = await base.QueryById(id); - } + var id = await base.Add(sysUserInfo); + model = await base.QueryById(id); + } - return model; + return model; - } + } - /// - /// - /// - /// - /// - /// - public async Task GetUserRoleNameStr(string loginName, string loginPwd) + /// + /// + /// + /// + /// + /// + public async Task GetUserRoleNameStr(string loginName, string loginPwd) + { + string roleName = ""; + var user = (await base.Query(a => a.LoginName == loginName && a.LoginPWD == loginPwd)).FirstOrDefault(); + var roleList = await _roleRepository.Query(a => a.IsDeleted == false); + if (user != null) { - string roleName = ""; - var user = (await base.Query(a => a.LoginName == loginName && a.LoginPWD == loginPwd)).FirstOrDefault(); - var roleList = await _roleRepository.Query(a => a.IsDeleted == false); - if (user != null) + var userRoles = await _userRoleRepository.Query(ur => ur.UserId == user.Id); + if (userRoles.Count > 0) { - var userRoles = await _userRoleRepository.Query(ur => ur.UserId == user.Id); - if (userRoles.Count > 0) - { - var arr = userRoles.Select(ur => ur.RoleId.ObjToString()).ToList(); - var roles = roleList.Where(d => arr.Contains(d.Id.ObjToString())); + var arr = userRoles.Select(ur => ur.RoleId.ObjToString()).ToList(); + var roles = roleList.Where(d => arr.Contains(d.Id.ObjToString())); - roleName = string.Join(',', roles.Select(r => r.Name).ToArray()); - } + roleName = string.Join(',', roles.Select(r => r.Name).ToArray()); } - return roleName; } + return roleName; } } diff --git a/Tiobon.Core.Tasks/HostedService/Job1TimedService.cs b/Tiobon.Core.Tasks/HostedService/Job1TimedService.cs index cb7d2c83..d6c4259e 100644 --- a/Tiobon.Core.Tasks/HostedService/Job1TimedService.cs +++ b/Tiobon.Core.Tasks/HostedService/Job1TimedService.cs @@ -1,60 +1,56 @@ -using Tiobon.Core.Common; +using Microsoft.Extensions.Hosting; +using Tiobon.Core.Common; using Tiobon.Core.IServices; -using Microsoft.Extensions.Hosting; -using System; -using System.Threading; -using System.Threading.Tasks; -namespace Tiobon.Core.Tasks +namespace Tiobon.Core.Tasks; + +public class Job1TimedService : IHostedService, IDisposable { - public class Job1TimedService : IHostedService, IDisposable + private Timer _timer; + private readonly ITiobonArticleServices _TiobonArticleServices; + + // 这里可以注入 + public Job1TimedService(ITiobonArticleServices TiobonArticleServices) { - private Timer _timer; - private readonly ITiobonArticleServices _TiobonArticleServices; + _TiobonArticleServices = TiobonArticleServices; + } - // 这里可以注入 - public Job1TimedService(ITiobonArticleServices TiobonArticleServices) - { - _TiobonArticleServices = TiobonArticleServices; - } + public Task StartAsync(CancellationToken cancellationToken) + { + Console.WriteLine("Job 1 is starting."); - public Task StartAsync(CancellationToken cancellationToken) - { - Console.WriteLine("Job 1 is starting."); + _timer = new Timer(DoWork, null, TimeSpan.Zero, + TimeSpan.FromSeconds(60 * 60));//一个小时 - _timer = new Timer(DoWork, null, TimeSpan.Zero, - TimeSpan.FromSeconds(60 * 60));//一个小时 + return Task.CompletedTask; + } - return Task.CompletedTask; + private void DoWork(object state) + { + try + { + var model = _TiobonArticleServices.GetTiobonDetails(1).Result; + Console.WriteLine($"Job 1 启动成功，获取id=1的博客title为:{model?.btitle}"); } - - private void DoWork(object state) + catch (Exception ex) { - try - { - var model = _TiobonArticleServices.GetTiobonDetails(1).Result; - Console.WriteLine($"Job 1 启动成功，获取id=1的博客title为:{model?.btitle}"); - } - catch (Exception ex) - { - Console.WriteLine($"Error:{ex.Message}"); - } - - ConsoleHelper.WriteSuccessLine($"Job 1： {DateTime.Now}"); + Console.WriteLine($"Error:{ex.Message}"); } - public Task StopAsync(CancellationToken cancellationToken) - { - Console.WriteLine("Job 1 is stopping."); + ConsoleHelper.WriteSuccessLine($"Job 1： {DateTime.Now}"); + } - _timer?.Change(Timeout.Infinite, 0); + public Task StopAsync(CancellationToken cancellationToken) + { + Console.WriteLine("Job 1 is stopping."); - return Task.CompletedTask; - } + _timer?.Change(Timeout.Infinite, 0); - public void Dispose() - { - _timer?.Dispose(); - } + return Task.CompletedTask; + } + + public void Dispose() + { + _timer?.Dispose(); } } diff --git a/Tiobon.Core.Tasks/HostedService/Job2TimedService.cs b/Tiobon.Core.Tasks/HostedService/Job2TimedService.cs index 05867b1f..bbf59f97 100644 --- a/Tiobon.Core.Tasks/HostedService/Job2TimedService.cs +++ b/Tiobon.Core.Tasks/HostedService/Job2TimedService.cs @@ -1,47 +1,43 @@ -using Tiobon.Core.Common; -using Microsoft.Extensions.Hosting; -using System; -using System.Threading; -using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; +using Tiobon.Core.Common; -namespace Tiobon.Core.Tasks +namespace Tiobon.Core.Tasks; + +public class Job2TimedService : IHostedService, IDisposable { - public class Job2TimedService : IHostedService, IDisposable - { - private Timer _timer; + private Timer _timer; - // 这里可以注入 - public Job2TimedService() - { - } + // 这里可以注入 + public Job2TimedService() + { + } - public Task StartAsync(CancellationToken cancellationToken) - { - Console.WriteLine("Job 2 is starting."); + public Task StartAsync(CancellationToken cancellationToken) + { + Console.WriteLine("Job 2 is starting."); - _timer = new Timer(DoWork, null, TimeSpan.Zero, - TimeSpan.FromSeconds(60 * 60 * 2));//两个小时 + _timer = new Timer(DoWork, null, TimeSpan.Zero, + TimeSpan.FromSeconds(60 * 60 * 2));//两个小时 - return Task.CompletedTask; - } + return Task.CompletedTask; + } - private void DoWork(object state) - { - ConsoleHelper.WriteWarningLine($"Job 2： {DateTime.Now}"); - } + private void DoWork(object state) + { + ConsoleHelper.WriteWarningLine($"Job 2： {DateTime.Now}"); + } - public Task StopAsync(CancellationToken cancellationToken) - { - Console.WriteLine("Job 2 is stopping."); + public Task StopAsync(CancellationToken cancellationToken) + { + Console.WriteLine("Job 2 is stopping."); - _timer?.Change(Timeout.Infinite, 0); + _timer?.Change(Timeout.Infinite, 0); - return Task.CompletedTask; - } + return Task.CompletedTask; + } - public void Dispose() - { - _timer?.Dispose(); - } + public void Dispose() + { + _timer?.Dispose(); } } diff --git a/Tiobon.Core.Tasks/QuartzNet/ISchedulerCenter.cs b/Tiobon.Core.Tasks/QuartzNet/ISchedulerCenter.cs index b85f5ceb..88915714 100644 --- a/Tiobon.Core.Tasks/QuartzNet/ISchedulerCenter.cs +++ b/Tiobon.Core.Tasks/QuartzNet/ISchedulerCenter.cs @@ -1,80 +1,76 @@ using Tiobon.Core.Model; using Tiobon.Core.Model.Models; using Tiobon.Core.Model.ViewModels; -using System.Collections.Generic; -using System.Threading.Tasks; -namespace Tiobon.Core.Tasks +namespace Tiobon.Core.Tasks; + +/// +/// 服务调度接口 +/// +public interface ISchedulerCenter { + /// - /// 服务调度接口 + /// 开启任务调度 /// - public interface ISchedulerCenter - { - - /// - /// 开启任务调度 - /// - /// - Task> StartScheduleAsync(); - /// - /// 停止任务调度 - /// - /// - Task> StopScheduleAsync(); - /// - /// - /// - /// - /// - Task> AddScheduleJobAsync(Ghre_TasksQz sysSchedule); - /// - /// 停止一个任务 - /// - /// - /// - Task> StopScheduleJobAsync(Ghre_TasksQz sysSchedule); - /// - /// 检测任务是否存在 - /// - /// - /// - Task IsExistScheduleJobAsync(Ghre_TasksQz sysSchedule); - /// - /// 暂停指定的计划任务 - /// - /// - /// - Task> PauseJob(Ghre_TasksQz sysSchedule); - /// - /// 恢复一个任务 - /// - /// - /// - Task> ResumeJob(Ghre_TasksQz sysSchedule); - - /// - /// 获取任务触发器状态 - /// - /// - /// - Task> GetTaskStaus(Ghre_TasksQz sysSchedule); - /// - /// 获取触发器标识 - /// - /// - /// - string GetTriggerState(string key); + /// + Task> StartScheduleAsync(); + /// + /// 停止任务调度 + /// + /// + Task> StopScheduleAsync(); + /// + /// + /// + /// + /// + Task> AddScheduleJobAsync(Ghre_TasksQz sysSchedule); + /// + /// 停止一个任务 + /// + /// + /// + Task> StopScheduleJobAsync(Ghre_TasksQz sysSchedule); + /// + /// 检测任务是否存在 + /// + /// + /// + Task IsExistScheduleJobAsync(Ghre_TasksQz sysSchedule); + /// + /// 暂停指定的计划任务 + /// + /// + /// + Task> PauseJob(Ghre_TasksQz sysSchedule); + /// + /// 恢复一个任务 + /// + /// + /// + Task> ResumeJob(Ghre_TasksQz sysSchedule); - /// - /// 立即执行 一个任务 - /// - /// - /// - Task> ExecuteJobAsync(Ghre_TasksQz tasksQz); + /// + /// 获取任务触发器状态 + /// + /// + /// + Task> GetTaskStaus(Ghre_TasksQz sysSchedule); + /// + /// 获取触发器标识 + /// + /// + /// + string GetTriggerState(string key); - Task> InitJobAsync(); + /// + /// 立即执行 一个任务 + /// + /// + /// + Task> ExecuteJobAsync(Ghre_TasksQz tasksQz); - } + Task> InitJobAsync(); } diff --git a/Tiobon.Core.Tasks/QuartzNet/JobFactory.cs b/Tiobon.Core.Tasks/QuartzNet/JobFactory.cs index 7392d622..373df9cc 100644 --- a/Tiobon.Core.Tasks/QuartzNet/JobFactory.cs +++ b/Tiobon.Core.Tasks/QuartzNet/JobFactory.cs @@ -1,50 +1,47 @@ using Microsoft.Extensions.DependencyInjection; using Quartz; using Quartz.Spi; -using System; -namespace Tiobon.Core.Tasks +namespace Tiobon.Core.Tasks; + +public class JobFactory : IJobFactory { - public class JobFactory : IJobFactory + /// + /// 注入反射获取依赖对象 + /// + private readonly IServiceProvider _serviceProvider; + public JobFactory(IServiceProvider serviceProvider) + { + _serviceProvider = serviceProvider; + } + /// + /// 实现接口Job + /// + /// + /// + /// + public IJob NewJob(TriggerFiredBundle bundle, IScheduler scheduler) { - /// - /// 注入反射获取依赖对象 - /// - private readonly IServiceProvider _serviceProvider; - public JobFactory(IServiceProvider serviceProvider) + try { - _serviceProvider = serviceProvider; + var serviceScope = _serviceProvider.CreateScope(); + var job = serviceScope.ServiceProvider.GetService(bundle.JobDetail.JobType) as IJob; + return job; + } - /// - /// 实现接口Job - /// - /// - /// - /// - public IJob NewJob(TriggerFiredBundle bundle, IScheduler scheduler) + catch (Exception) { - try - { - var serviceScope = _serviceProvider.CreateScope(); - var job = serviceScope.ServiceProvider.GetService(bundle.JobDetail.JobType) as IJob; - return job; - - } - catch (Exception) - { - throw; - } + throw; } + } - public void ReturnJob(IJob job) + public void ReturnJob(IJob job) + { + var disposable = job as IDisposable; + if (disposable != null) { - var disposable = job as IDisposable; - if (disposable != null) - { - disposable.Dispose(); - } - + disposable.Dispose(); } - } + } } diff --git a/Tiobon.Core.Tasks/QuartzNet/Jobs/JobBase.cs b/Tiobon.Core.Tasks/QuartzNet/Jobs/JobBase.cs index e6722a40..83450a90 100644 --- a/Tiobon.Core.Tasks/QuartzNet/Jobs/JobBase.cs +++ b/Tiobon.Core.Tasks/QuartzNet/Jobs/JobBase.cs @@ -1,85 +1,80 @@ -using Tiobon.Core.Common.Helper; +using Quartz; +using Tiobon.Core.Common.Helper; using Tiobon.Core.IServices; using Tiobon.Core.Model.Models; -using Quartz; -using System; -using System.Diagnostics; -using System.Threading.Tasks; -namespace Tiobon.Core.Tasks +namespace Tiobon.Core.Tasks; + +public class JobBase { - public class JobBase + public ITasksQzServices _tasksQzServices; + public ITasksLogServices _tasksLogServices; + public JobBase(ITasksQzServices tasksQzServices, ITasksLogServices tasksLogServices) + { + _tasksQzServices = tasksQzServices; + _tasksLogServices = tasksLogServices; + } + /// + /// 执行指定任务 + /// + /// + /// + public async Task ExecuteJob(IJobExecutionContext context, Func func) { - public ITasksQzServices _tasksQzServices; - public ITasksLogServices _tasksLogServices; - public JobBase(ITasksQzServices tasksQzServices, ITasksLogServices tasksLogServices) + //记录Job + Ghre_TasksLog tasksLog = new Ghre_TasksLog(); + //JOBID + int jobid = context.JobDetail.Key.Name.ObjToInt(); + //JOB组名 + string groupName = context.JobDetail.Key.Group; + //日志 + tasksLog.JobId = jobid; + tasksLog.RunTime = DateTime.Now; + string jobHistory = $"【{tasksLog.RunTime.ToString("yyyy-MM-dd HH:mm:ss")}】【执行开始】【Id：{jobid}，组别：{groupName}】"; + try { - _tasksQzServices = tasksQzServices; - _tasksLogServices = tasksLogServices; + await func();//执行任务 + tasksLog.EndTime = DateTime.Now; + tasksLog.RunResult = true; + jobHistory += $"，【{tasksLog.EndTime.ToString("yyyy-MM-dd HH:mm:ss")}】【执行成功】"; + + JobDataMap jobPars = context.JobDetail.JobDataMap; + tasksLog.RunPars = jobPars.GetString("JobParam"); } - /// - /// 执行指定任务 - /// - /// - /// - public async Task ExecuteJob(IJobExecutionContext context, Func func) + catch (Exception ex) { - //记录Job - Ghre_TasksLog tasksLog = new Ghre_TasksLog(); - //JOBID - int jobid = context.JobDetail.Key.Name.ObjToInt(); - //JOB组名 - string groupName = context.JobDetail.Key.Group; - //日志 - tasksLog.JobId = jobid; - tasksLog.RunTime = DateTime.Now; - string jobHistory = $"【{tasksLog.RunTime.ToString("yyyy-MM-dd HH:mm:ss")}】【执行开始】【Id：{jobid}，组别：{groupName}】"; - try - { - await func();//执行任务 - tasksLog.EndTime = DateTime.Now; - tasksLog.RunResult = true; - jobHistory += $"，【{tasksLog.EndTime.ToString("yyyy-MM-dd HH:mm:ss")}】【执行成功】"; - - JobDataMap jobPars = context.JobDetail.JobDataMap; - tasksLog.RunPars = jobPars.GetString("JobParam"); - } - catch (Exception ex) - { - tasksLog.EndTime = DateTime.Now; - tasksLog.RunResult = false; - //JobExecutionException e2 = new JobExecutionException(ex); - //true 是立即重新执行任务 - //e2.RefireImmediately = true; - tasksLog.ErrMessage = ex.Message; - tasksLog.ErrStackTrace = ex.StackTrace; - jobHistory += $"，【{tasksLog.EndTime.ToString("yyyy-MM-dd HH:mm:ss")}】【执行失败:{ex.Message}】"; - } - finally + tasksLog.EndTime = DateTime.Now; + tasksLog.RunResult = false; + //JobExecutionException e2 = new JobExecutionException(ex); + //true 是立即重新执行任务 + //e2.RefireImmediately = true; + tasksLog.ErrMessage = ex.Message; + tasksLog.ErrStackTrace = ex.StackTrace; + jobHistory += $"，【{tasksLog.EndTime.ToString("yyyy-MM-dd HH:mm:ss")}】【执行失败:{ex.Message}】"; + } + finally + { + tasksLog.TotalTime = Math.Round((tasksLog.EndTime - tasksLog.RunTime).TotalSeconds, 3); + jobHistory += $"(耗时:{tasksLog.TotalTime}秒)"; + if (_tasksQzServices != null) { - tasksLog.TotalTime = Math.Round((tasksLog.EndTime - tasksLog.RunTime).TotalSeconds, 3); - jobHistory += $"(耗时:{tasksLog.TotalTime}秒)"; - if (_tasksQzServices != null) + var model = await _tasksQzServices.QueryById(jobid); + if (model != null) { - var model = await _tasksQzServices.QueryById(jobid); - if (model != null) - { - if (_tasksLogServices != null) await _tasksLogServices.Add(tasksLog); - model.RunTimes += 1; - if (model.TriggerType == 0) model.CycleHasRunTimes += 1; - if (model.TriggerType == 0 && model.CycleRunTimes != 0 && model.CycleHasRunTimes >= model.CycleRunTimes) model.IsStart = false;//循环完善,当循环任务完成后,停止该任务,防止下次启动再次执行 - var separator = "
"; - // 这里注意数据库字段的长度问题，超过限制，会造成数据库remark不更新问题。 - model.Remark = - $"{jobHistory}{separator}" + string.Join(separator, StringHelper.GetTopDataBySeparator(model.Remark, separator, 9)); - await _tasksQzServices.Update(model); - } + if (_tasksLogServices != null) await _tasksLogServices.Add(tasksLog); + model.RunTimes += 1; + if (model.TriggerType == 0) model.CycleHasRunTimes += 1; + if (model.TriggerType == 0 && model.CycleRunTimes != 0 && model.CycleHasRunTimes >= model.CycleRunTimes) model.IsStart = false;//循环完善,当循环任务完成后,停止该任务,防止下次启动再次执行 + var separator = "
"; + // 这里注意数据库字段的长度问题，超过限制，会造成数据库remark不更新问题。 + model.Remark = + $"{jobHistory}{separator}" + string.Join(separator, StringHelper.GetTopDataBySeparator(model.Remark, separator, 9)); + await _tasksQzServices.Update(model); } } - - Console.Out.WriteLine(jobHistory); - return jobHistory; } - } + Console.Out.WriteLine(jobHistory); + return jobHistory; + } } diff --git a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_AccessTrendLog_Quartz.cs b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_AccessTrendLog_Quartz.cs index cc228f59..61092b60 100644 --- a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_AccessTrendLog_Quartz.cs +++ b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_AccessTrendLog_Quartz.cs @@ -1,147 +1,140 @@ -using Tiobon.Core.Common.LogHelper; -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Hosting; using Newtonsoft.Json; using Quartz; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; +using Tiobon.Core.Common.LogHelper; +using Tiobon.Core.IServices; +using Tiobon.Core.Model.Models; /// /// 这里要注意下，命名空间和程序集是一样的，不然反射不到 /// -namespace Tiobon.Core.Tasks +namespace Tiobon.Core.Tasks; + +public class Job_AccessTrendLog_Quartz : JobBase, IJob { - public class Job_AccessTrendLog_Quartz : JobBase, IJob + private readonly IAccessTrendLogServices _accessTrendLogServices; + private readonly IWebHostEnvironment _environment; + + public Job_AccessTrendLog_Quartz(IAccessTrendLogServices accessTrendLogServices, IWebHostEnvironment environment, ITasksQzServices tasksQzServices, ITasksLogServices tasksLogServices) + : base(tasksQzServices, tasksLogServices) { - private readonly IAccessTrendLogServices _accessTrendLogServices; - private readonly IWebHostEnvironment _environment; + _accessTrendLogServices = accessTrendLogServices; + _environment = environment; + _tasksQzServices = tasksQzServices; + } + public async Task Execute(IJobExecutionContext context) + { + var executeLog = await ExecuteJob(context, async () => await Run(context)); + } + public async Task Run(IJobExecutionContext context) + { + + // 可以直接获取 JobDetail 的值 + var jobKey = context.JobDetail.Key; + var jobId = jobKey.Name; + // 也可以通过数据库配置，获取传递过来的参数 + JobDataMap data = context.JobDetail.JobDataMap; - public Job_AccessTrendLog_Quartz(IAccessTrendLogServices accessTrendLogServices, IWebHostEnvironment environment, ITasksQzServices tasksQzServices, ITasksLogServices tasksLogServices) - : base(tasksQzServices, tasksLogServices) + var lastestLogDatetime = (await _accessTrendLogServices.Query(null, d => d.UpdateTime, false)).FirstOrDefault()?.UpdateTime; + if (lastestLogDatetime == null) { - _accessTrendLogServices = accessTrendLogServices; - _environment = environment; - _tasksQzServices = tasksQzServices; + lastestLogDatetime = Convert.ToDateTime("2021-09-01"); } - public async Task Execute(IJobExecutionContext context) - { - var executeLog = await ExecuteJob(context, async () => await Run(context)); - } - public async Task Run(IJobExecutionContext context) - { - - // 可以直接获取 JobDetail 的值 - var jobKey = context.JobDetail.Key; - var jobId = jobKey.Name; - // 也可以通过数据库配置，获取传递过来的参数 - JobDataMap data = context.JobDetail.JobDataMap; - - var lastestLogDatetime = (await _accessTrendLogServices.Query(null, d => d.UpdateTime, false)).FirstOrDefault()?.UpdateTime; - if (lastestLogDatetime == null) - { - lastestLogDatetime = Convert.ToDateTime("2021-09-01"); - } - var accLogs = GetAccessLogs().Where(d => d.User != "" && d.BeginTime.ObjToDate() >= lastestLogDatetime).ToList(); - var logUpdate = DateTime.Now; + var accLogs = GetAccessLogs().Where(d => d.User != "" && d.BeginTime.ObjToDate() >= lastestLogDatetime).ToList(); + var logUpdate = DateTime.Now; - var activeUsers = (from n in accLogs - group n by new { n.User } into g - select new ActiveUserVM - { - user = g.Key.User, - count = g.Count(), - }).ToList(); + var activeUsers = (from n in accLogs + group n by new { n.User } into g + select new ActiveUserVM + { + user = g.Key.User, + count = g.Count(), + }).ToList(); - foreach (var item in activeUsers) + foreach (var item in activeUsers) + { + var user = (await _accessTrendLogServices.Query(d => d.UserInfo != "" && d.UserInfo == item.user)).FirstOrDefault(); + if (user != null) { - var user = (await _accessTrendLogServices.Query(d => d.UserInfo != "" && d.UserInfo == item.user)).FirstOrDefault(); - if (user != null) - { - user.Count += item.count; - user.UpdateTime = logUpdate; - await _accessTrendLogServices.Update(user); - } - else - { - await _accessTrendLogServices.Add(new AccessTrendLog() - { - Count = item.count, - UpdateTime = logUpdate, - UserInfo = item.user - }); - } + user.Count += item.count; + user.UpdateTime = logUpdate; + await _accessTrendLogServices.Update(user); } - - // 重新拉取 - var actUsers = await _accessTrendLogServices.Query(d => d.UserInfo != "", d => d.Count, false); - actUsers = actUsers.Take(15).ToList(); - - List activeUserVMs = new(); - foreach (var item in actUsers) + else { - activeUserVMs.Add(new ActiveUserVM() + await _accessTrendLogServices.Add(new AccessTrendLog() { - user = item.UserInfo, - count = item.Count + Count = item.count, + UpdateTime = logUpdate, + UserInfo = item.user }); } + } + + // 重新拉取 + var actUsers = await _accessTrendLogServices.Query(d => d.UserInfo != "", d => d.Count, false); + actUsers = actUsers.Take(15).ToList(); - Parallel.For(0, 1, e => + List activeUserVMs = new(); + foreach (var item in actUsers) + { + activeUserVMs.Add(new ActiveUserVM() { - LogLock.OutLogAOP("ACCESSTRENDLOG", "", new string[] { activeUserVMs.GetType().ToString(), JsonConvert.SerializeObject(activeUserVMs) }, false); + user = item.UserInfo, + count = item.Count }); } - private List GetAccessLogs() + Parallel.For(0, 1, e => { - List userAccessModels = new(); - var accessLogs = LogLock.ReadLog( - Path.Combine(_environment.ContentRootPath, "Log"), "RecordAccessLogs_", Encoding.UTF8, ReadType.Prefix, 2 - ).ObjToString().TrimEnd(','); + LogLock.OutLogAOP("ACCESSTRENDLOG", "", new string[] { activeUserVMs.GetType().ToString(), JsonConvert.SerializeObject(activeUserVMs) }, false); + }); + } - try - { - return JsonConvert.DeserializeObject>("[" + accessLogs + "]"); - } - catch (Exception) + private List GetAccessLogs() + { + List userAccessModels = new(); + var accessLogs = LogLock.ReadLog( + Path.Combine(_environment.ContentRootPath, "Log"), "RecordAccessLogs_", Encoding.UTF8, ReadType.Prefix, 2 + ).ObjToString().TrimEnd(','); + + try + { + return JsonConvert.DeserializeObject>("[" + accessLogs + "]"); + } + catch (Exception) + { + var accLogArr = accessLogs.Split("\n"); + foreach (var item in accLogArr) { - var accLogArr = accessLogs.Split("\n"); - foreach (var item in accLogArr) + if (item.ObjToString() != "") { - if (item.ObjToString() != "") + try + { + var accItem = JsonConvert.DeserializeObject(item.TrimEnd(',')); + userAccessModels.Add(accItem); + } + catch (Exception) { - try - { - var accItem = JsonConvert.DeserializeObject(item.TrimEnd(',')); - userAccessModels.Add(accItem); - } - catch (Exception) - { - } } } - } - return userAccessModels; } - } - public class UserAccessFromFIles - { - public string User { get; set; } - public string IP { get; set; } - public string API { get; set; } - public string BeginTime { get; set; } - public string OPTime { get; set; } - public string RequestMethod { get; set; } = ""; - public string Agent { get; set; } + return userAccessModels; } } +public class UserAccessFromFIles +{ + public string User { get; set; } + public string IP { get; set; } + public string API { get; set; } + public string BeginTime { get; set; } + public string OPTime { get; set; } + public string RequestMethod { get; set; } = ""; + public string Agent { get; set; } +} diff --git a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_OperateLog_Quartz.cs b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_OperateLog_Quartz.cs index 1d32953e..7b8fe13a 100644 --- a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_OperateLog_Quartz.cs +++ b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_OperateLog_Quartz.cs @@ -1,83 +1,77 @@ -using Tiobon.Core.Common.LogHelper; -using Tiobon.Core.IServices; -using Tiobon.Core.Model.Models; -using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Hosting; using Quartz; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; +using Tiobon.Core.Common.LogHelper; +using Tiobon.Core.IServices; +using Tiobon.Core.Model.Models; /// /// 这里要注意下，命名空间和程序集是一样的，不然反射不到 /// -namespace Tiobon.Core.Tasks +namespace Tiobon.Core.Tasks; + +public class Job_OperateLog_Quartz : JobBase, IJob { - public class Job_OperateLog_Quartz : JobBase, IJob - { - private readonly IOperateLogServices _operateLogServices; - private readonly IWebHostEnvironment _environment; + private readonly IOperateLogServices _operateLogServices; + private readonly IWebHostEnvironment _environment; - public Job_OperateLog_Quartz(IOperateLogServices operateLogServices, IWebHostEnvironment environment, ITasksQzServices tasksQzServices, ITasksLogServices tasksLogServices) - : base(tasksQzServices, tasksLogServices) - { - _operateLogServices = operateLogServices; - _environment = environment; - } + public Job_OperateLog_Quartz(IOperateLogServices operateLogServices, IWebHostEnvironment environment, ITasksQzServices tasksQzServices, ITasksLogServices tasksLogServices) + : base(tasksQzServices, tasksLogServices) + { + _operateLogServices = operateLogServices; + _environment = environment; + } - public async Task Execute(IJobExecutionContext context) - { - var executeLog = await ExecuteJob(context, async () => await Run(context)); - } + public async Task Execute(IJobExecutionContext context) + { + var executeLog = await ExecuteJob(context, async () => await Run(context)); + } - public async Task Run(IJobExecutionContext context) - { + public async Task Run(IJobExecutionContext context) + { - // 可以直接获取 JobDetail 的值 - var jobKey = context.JobDetail.Key; - var jobId = jobKey.Name; - // 也可以通过数据库配置，获取传递过来的参数 - JobDataMap data = context.JobDetail.JobDataMap; + // 可以直接获取 JobDetail 的值 + var jobKey = context.JobDetail.Key; + var jobId = jobKey.Name; + // 也可以通过数据库配置，获取传递过来的参数 + JobDataMap data = context.JobDetail.JobDataMap; - List excLogs = new List(); - var exclogContent = LogLock.ReadLog(Path.Combine(_environment.ContentRootPath, "Log"), $"GlobalExceptionLogs_{DateTime.Now.ToString("yyyMMdd")}.log", Encoding.UTF8); + List excLogs = new List(); + var exclogContent = LogLock.ReadLog(Path.Combine(_environment.ContentRootPath, "Log"), $"GlobalExceptionLogs_{DateTime.Now.ToString("yyyMMdd")}.log", Encoding.UTF8); - if (!string.IsNullOrEmpty(exclogContent)) - { - excLogs = exclogContent.Split("--------------------------------") - .Where(d => !string.IsNullOrEmpty(d) && d != "\n" && d != "\r\n") - .Select(d => new LogInfo - { - Datetime = (d.Split("|")[0]).Split(',')[0].ObjToDate(), - Content = d.Split("|")[1]?.Replace("\r\n", "
"), - LogColor = "EXC", - Import = 9, - }).ToList(); - } + if (!string.IsNullOrEmpty(exclogContent)) + { + excLogs = exclogContent.Split("--------------------------------") + .Where(d => !string.IsNullOrEmpty(d) && d != "\n" && d != "\r\n") + .Select(d => new LogInfo + { + Datetime = (d.Split("|")[0]).Split(',')[0].ObjToDate(), + Content = d.Split("|")[1]?.Replace("\r\n", "
"), + LogColor = "EXC", + Import = 9, + }).ToList(); + } - var filterDatetime = DateTime.Now.AddHours(-1); - excLogs = excLogs.Where(d => d.Datetime >= filterDatetime).ToList(); + var filterDatetime = DateTime.Now.AddHours(-1); + excLogs = excLogs.Where(d => d.Datetime >= filterDatetime).ToList(); - var operateLogs = new List() { }; - excLogs.ForEach(m => + var operateLogs = new List() { }; + excLogs.ForEach(m => + { + operateLogs.Add(new OperateLog() { - operateLogs.Add(new OperateLog() - { - LogTime = m.Datetime, - Description = m.Content, - IPAddress = m.IP, - UserId = 0, - IsDeleted = false, - }); + LogTime = m.Datetime, + Description = m.Content, + IPAddress = m.IP, + UserId = 0, + IsDeleted = false, }); + }); - if (operateLogs.Count > 0) - { - var logsIds = await _operateLogServices.Add(operateLogs); - } + if (operateLogs.Count > 0) + { + var logsIds = await _operateLogServices.Add(operateLogs); } } } \ No newline at end of file diff --git a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_URL_Quartz.cs b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_URL_Quartz.cs index 05a35a8e..db8f1e14 100644 --- a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_URL_Quartz.cs +++ b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_URL_Quartz.cs @@ -1,47 +1,42 @@ -using Tiobon.Core.Common.Helper; -using Tiobon.Core.IServices; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging; using Quartz; -using System.Threading.Tasks; +using Tiobon.Core.Common.Helper; +using Tiobon.Core.IServices; /// /// 这里要注意下，命名空间和程序集是一样的，不然反射不到(任务类要去JobSetup添加注入) /// -namespace Tiobon.Core.Tasks +namespace Tiobon.Core.Tasks; + +public class Job_URL_Quartz : JobBase, IJob { - public class Job_URL_Quartz : JobBase, IJob + private readonly ILogger _logger; + + public Job_URL_Quartz(ILogger logger, ITasksQzServices tasksQzServices, ITasksLogServices tasksLogServices) + : base(tasksQzServices, tasksLogServices) { - private readonly ILogger _logger; + _tasksQzServices = tasksQzServices; + _logger = logger; + } + public async Task Execute(IJobExecutionContext context) + { + // 可以直接获取 JobDetail 的值 + var jobKey = context.JobDetail.Key; + var jobId = jobKey.Name; + var executeLog = await ExecuteJob(context, async () => await Run(context, jobId.ObjToInt())); - public Job_URL_Quartz(ILogger logger, ITasksQzServices tasksQzServices, ITasksLogServices tasksLogServices) - : base(tasksQzServices, tasksLogServices) + } + public async Task Run(IJobExecutionContext context, int jobid) + { + if (jobid > 0) { - _tasksQzServices = tasksQzServices; - _logger = logger; - } - public async Task Execute(IJobExecutionContext context) - { - // 可以直接获取 JobDetail 的值 - var jobKey = context.JobDetail.Key; - var jobId = jobKey.Name; - var executeLog = await ExecuteJob(context, async () => await Run(context, jobId.ObjToInt())); - - } - public async Task Run(IJobExecutionContext context, int jobid) - { - if (jobid > 0) + JobDataMap data = context.JobDetail.JobDataMap; + string pars = data.GetString("JobParam"); + if (!string.IsNullOrWhiteSpace(pars)) { - JobDataMap data = context.JobDetail.JobDataMap; - string pars = data.GetString("JobParam"); - if (!string.IsNullOrWhiteSpace(pars)) - { - var log = await HttpHelper.GetAsync(pars); - _logger.LogInformation(log); - } + var log = await HttpHelper.GetAsync(pars); + _logger.LogInformation(log); } } } - - - } diff --git a/Tiobon.Core.Tasks/QuartzNet/SchedulerCenterServer.cs b/Tiobon.Core.Tasks/QuartzNet/SchedulerCenterServer.cs index 55202179..f1454be4 100644 --- a/Tiobon.Core.Tasks/QuartzNet/SchedulerCenterServer.cs +++ b/Tiobon.Core.Tasks/QuartzNet/SchedulerCenterServer.cs @@ -1,544 +1,538 @@ -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Model.ViewModels; -using Quartz; +using Quartz; using Quartz.Impl; using Quartz.Impl.Triggers; using Quartz.Spi; -using System; -using System.Collections.Generic; using System.Collections.Specialized; using System.Reflection; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Razor.TagHelpers; -using Tiobon.Core.Common.Helper; using Tiobon.Core.Common; using Tiobon.Core.Common.DB.Dapper; +using Tiobon.Core.Model; +using Tiobon.Core.Model.Models; +using Tiobon.Core.Model.ViewModels; -namespace Tiobon.Core.Tasks +namespace Tiobon.Core.Tasks; + +/// +/// 任务调度管理中心 +/// +public class SchedulerCenterServer : ISchedulerCenter { - /// - /// 任务调度管理中心 - /// - public class SchedulerCenterServer : ISchedulerCenter + private Task _scheduler; + private readonly IJobFactory _iocjobFactory; + public SchedulerCenterServer(IJobFactory jobFactory) { - private Task _scheduler; - private readonly IJobFactory _iocjobFactory; - public SchedulerCenterServer(IJobFactory jobFactory) + _iocjobFactory = jobFactory; + _scheduler = GetSchedulerAsync(); + } + private Task GetSchedulerAsync() + { + if (_scheduler != null) + return this._scheduler; + else { - _iocjobFactory = jobFactory; - _scheduler = GetSchedulerAsync(); + // 从Factory中获取Scheduler实例 + NameValueCollection collection = new NameValueCollection + { + { "quartz.serializer.type", "binary" }, + }; + StdSchedulerFactory factory = new StdSchedulerFactory(collection); + return _scheduler = factory.GetScheduler(); } - private Task GetSchedulerAsync() + } + + /// + /// 开启任务调度 + /// + /// + public async Task> StartScheduleAsync() + { + var result = new ServiceResult(); + try { - if (_scheduler != null) - return this._scheduler; + this._scheduler.Result.JobFactory = this._iocjobFactory; + if (!this._scheduler.Result.IsStarted) + { + //等待任务运行完成 + await this._scheduler.Result.Start(); + await Console.Out.WriteLineAsync("任务调度开启！"); + result.Success = true; + result.Message = $"任务调度开启成功"; + return result; + } else { - // 从Factory中获取Scheduler实例 - NameValueCollection collection = new NameValueCollection - { - { "quartz.serializer.type", "binary" }, - }; - StdSchedulerFactory factory = new StdSchedulerFactory(collection); - return _scheduler = factory.GetScheduler(); + result.Success = false; + result.Message = $"任务调度已经开启"; + return result; } } + catch (Exception) + { + throw; + } + } - /// - /// 开启任务调度 - /// - /// - public async Task> StartScheduleAsync() + /// + /// 停止任务调度 + /// + /// + public async Task> StopScheduleAsync() + { + var result = new ServiceResult(); + try { - var result = new ServiceResult(); - try + if (!this._scheduler.Result.IsShutdown) { - this._scheduler.Result.JobFactory = this._iocjobFactory; - if (!this._scheduler.Result.IsStarted) - { - //等待任务运行完成 - await this._scheduler.Result.Start(); - await Console.Out.WriteLineAsync("任务调度开启！"); - result.Success = true; - result.Message = $"任务调度开启成功"; - return result; - } - else - { - result.Success = false; - result.Message = $"任务调度已经开启"; - return result; - } + //等待任务运行完成 + await this._scheduler.Result.Shutdown(); + await Console.Out.WriteLineAsync("任务调度停止！"); + result.Success = true; + result.Message = $"任务调度停止成功"; + return result; } - catch (Exception) + else { - throw; + result.Success = false; + result.Message = $"任务调度已经停止"; + return result; } } + catch (Exception) + { + throw; + } + } - /// - /// 停止任务调度 - /// - /// - public async Task> StopScheduleAsync() + /// + /// 添加一个计划任务（映射程序集指定IJob实现类） + /// + /// + /// + /// + public async Task> AddScheduleJobAsync(Ghre_TasksQz tasksQz) + { + var result = new ServiceResult(); + + if (tasksQz != null) { - var result = new ServiceResult(); try { - if (!this._scheduler.Result.IsShutdown) + JobKey jobKey = new JobKey(tasksQz.Id.ToString(), tasksQz.JobGroup); + if (await _scheduler.Result.CheckExists(jobKey)) { - //等待任务运行完成 - await this._scheduler.Result.Shutdown(); - await Console.Out.WriteLineAsync("任务调度停止！"); - result.Success = true; - result.Message = $"任务调度停止成功"; + result.Success = false; + result.Message = $"该任务计划已经在执行:【{tasksQz.Name}】,请勿重复启动！"; return result; } - else + if (tasksQz.TriggerType == 0 && tasksQz.CycleRunTimes != 0 && tasksQz.CycleHasRunTimes >= tasksQz.CycleRunTimes) { result.Success = false; - result.Message = $"任务调度已经停止"; + result.Message = $"该任务计划已完成:【{tasksQz.Name}】,无需重复启动,如需启动请修改已循环次数再提交"; return result; } - } - catch (Exception) - { - throw; - } - } + #region 设置开始时间和结束时间 - /// - /// 添加一个计划任务（映射程序集指定IJob实现类） - /// - /// - /// - /// - public async Task> AddScheduleJobAsync(Ghre_TasksQz tasksQz) - { - var result = new ServiceResult(); - - if (tasksQz != null) - { - try + if (tasksQz.BeginTime == null) { - JobKey jobKey = new JobKey(tasksQz.Id.ToString(), tasksQz.JobGroup); - if (await _scheduler.Result.CheckExists(jobKey)) - { - result.Success = false; - result.Message = $"该任务计划已经在执行:【{tasksQz.Name}】,请勿重复启动！"; - return result; - } - if (tasksQz.TriggerType == 0 && tasksQz.CycleRunTimes != 0 && tasksQz.CycleHasRunTimes >= tasksQz.CycleRunTimes) - { - result.Success = false; - result.Message = $"该任务计划已完成:【{tasksQz.Name}】,无需重复启动,如需启动请修改已循环次数再提交"; - return result; - } - #region 设置开始时间和结束时间 - - if (tasksQz.BeginTime == null) - { - tasksQz.BeginTime = DateTime.Now; - } - DateTimeOffset starRunTime = DateBuilder.NextGivenSecondDate(tasksQz.BeginTime, 1);//设置开始时间 - if (tasksQz.EndTime == null) - { - tasksQz.EndTime = DateTime.MaxValue.AddDays(-1); - } - DateTimeOffset endRunTime = DateBuilder.NextGivenSecondDate(tasksQz.EndTime, 1);//设置暂停时间 - - #endregion + tasksQz.BeginTime = DateTime.Now; + } + DateTimeOffset starRunTime = DateBuilder.NextGivenSecondDate(tasksQz.BeginTime, 1);//设置开始时间 + if (tasksQz.EndTime == null) + { + tasksQz.EndTime = DateTime.MaxValue.AddDays(-1); + } + DateTimeOffset endRunTime = DateBuilder.NextGivenSecondDate(tasksQz.EndTime, 1);//设置暂停时间 - #region 通过反射获取程序集类型和类 + #endregion - Assembly assembly = Assembly.Load(new AssemblyName(tasksQz.AssemblyName)); - Type jobType = assembly.GetType(tasksQz.AssemblyName + "." + tasksQz.ClassName); + #region 通过反射获取程序集类型和类 - #endregion - //判断任务调度是否开启 - if (!_scheduler.Result.IsStarted) - { - await StartScheduleAsync(); - } + Assembly assembly = Assembly.Load(new AssemblyName(tasksQz.AssemblyName)); + Type jobType = assembly.GetType(tasksQz.AssemblyName + "." + tasksQz.ClassName); - //传入反射出来的执行程序集 - IJobDetail job = new JobDetailImpl(tasksQz.Id.ToString(), tasksQz.JobGroup, jobType); - job.JobDataMap.Add("JobParam", tasksQz.JobParams); - ITrigger trigger; + #endregion + //判断任务调度是否开启 + if (!_scheduler.Result.IsStarted) + { + await StartScheduleAsync(); + } - #region 泛型传递 - //IJobDetail job = JobBuilder.Create() - // .WithIdentity(sysSchedule.Name, sysSchedule.JobGroup) - // .Build(); - #endregion + //传入反射出来的执行程序集 + IJobDetail job = new JobDetailImpl(tasksQz.Id.ToString(), tasksQz.JobGroup, jobType); + job.JobDataMap.Add("JobParam", tasksQz.JobParams); + ITrigger trigger; - if (tasksQz.Cron != null && CronExpression.IsValidExpression(tasksQz.Cron) && tasksQz.TriggerType > 0) - { - trigger = CreateCronTrigger(tasksQz); + #region 泛型传递 + //IJobDetail job = JobBuilder.Create() + // .WithIdentity(sysSchedule.Name, sysSchedule.JobGroup) + // .Build(); + #endregion - ((CronTriggerImpl)trigger).MisfireInstruction = MisfireInstruction.CronTrigger.DoNothing; - } - else - { - trigger = CreateSimpleTrigger(tasksQz); - } + if (tasksQz.Cron != null && CronExpression.IsValidExpression(tasksQz.Cron) && tasksQz.TriggerType > 0) + { + trigger = CreateCronTrigger(tasksQz); - // 告诉Quartz使用我们的触发器来安排作业 - await _scheduler.Result.ScheduleJob(job, trigger); - //await Task.Delay(TimeSpan.FromSeconds(120)); - //await Console.Out.WriteLineAsync("关闭了调度器！"); - //await _scheduler.Result.Shutdown(); - result.Success = true; - result.Message = $"【{tasksQz.Name}】成功"; - return result; + ((CronTriggerImpl)trigger).MisfireInstruction = MisfireInstruction.CronTrigger.DoNothing; } - catch (Exception ex) + else { - result.Success = false; - result.Message = $"任务计划异常:【{ex.Message}】"; - return result; + trigger = CreateSimpleTrigger(tasksQz); } + + // 告诉Quartz使用我们的触发器来安排作业 + await _scheduler.Result.ScheduleJob(job, trigger); + //await Task.Delay(TimeSpan.FromSeconds(120)); + //await Console.Out.WriteLineAsync("关闭了调度器！"); + //await _scheduler.Result.Shutdown(); + result.Success = true; + result.Message = $"【{tasksQz.Name}】成功"; + return result; } - else + catch (Exception ex) { result.Success = false; - result.Message = $"任务计划不存在:【{tasksQz?.Name}】"; + result.Message = $"任务计划异常:【{ex.Message}】"; return result; } } + else + { + result.Success = false; + result.Message = $"任务计划不存在:【{tasksQz?.Name}】"; + return result; + } + } - /// - /// 任务是否存在? - /// - /// - public async Task IsExistScheduleJobAsync(Ghre_TasksQz sysSchedule) + /// + /// 任务是否存在? + /// + /// + public async Task IsExistScheduleJobAsync(Ghre_TasksQz sysSchedule) + { + JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup); + if (await _scheduler.Result.CheckExists(jobKey)) + { + return true; + } + else + { + return false; + } + } + /// + /// 暂停一个指定的计划任务 + /// + /// + public async Task> StopScheduleJobAsync(Ghre_TasksQz sysSchedule) + { + var result = new ServiceResult(); + try { JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup); - if (await _scheduler.Result.CheckExists(jobKey)) + if (!await _scheduler.Result.CheckExists(jobKey)) { - return true; + result.Success = false; + result.Message = $"未找到要暂停的任务:【{sysSchedule.Name}】"; + return result; } else { - return false; + await this._scheduler.Result.DeleteJob(jobKey); + result.Success = true; + result.Message = $"【{sysSchedule.Name}】成功"; + return result; } } - /// - /// 暂停一个指定的计划任务 - /// - /// - public async Task> StopScheduleJobAsync(Ghre_TasksQz sysSchedule) + catch (Exception) { - var result = new ServiceResult(); - try - { - JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup); - if (!await _scheduler.Result.CheckExists(jobKey)) - { - result.Success = false; - result.Message = $"未找到要暂停的任务:【{sysSchedule.Name}】"; - return result; - } - else - { - await this._scheduler.Result.DeleteJob(jobKey); - result.Success = true; - result.Message = $"【{sysSchedule.Name}】成功"; - return result; - } - } - catch (Exception) - { - throw; - } + throw; } + } - /// - /// 恢复指定的计划任务 - /// - /// - /// - public async Task> ResumeJob(Ghre_TasksQz sysSchedule) + /// + /// 恢复指定的计划任务 + /// + /// + /// + public async Task> ResumeJob(Ghre_TasksQz sysSchedule) + { + var result = new ServiceResult(); + try { - var result = new ServiceResult(); - try + JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup); + if (!await _scheduler.Result.CheckExists(jobKey)) { - JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup); - if (!await _scheduler.Result.CheckExists(jobKey)) - { - result.Success = false; - result.Message = $"未找到要恢复的任务:【{sysSchedule.Name}】"; - return result; - } - await this._scheduler.Result.ResumeJob(jobKey); - result.Success = true; - result.Message = $"【{sysSchedule.Name}】成功"; + result.Success = false; + result.Message = $"未找到要恢复的任务:【{sysSchedule.Name}】"; return result; } - catch (Exception) - { - throw; - } + await this._scheduler.Result.ResumeJob(jobKey); + result.Success = true; + result.Message = $"【{sysSchedule.Name}】成功"; + return result; } - /// - /// 暂停指定的计划任务 - /// - /// - /// - public async Task> PauseJob(Ghre_TasksQz sysSchedule) + catch (Exception) { - var result = new ServiceResult(); - try - { - JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup); - if (!await _scheduler.Result.CheckExists(jobKey)) - { - result.Success = false; - result.Message = $"未找到要暂停的任务:【{sysSchedule.Name}】"; - return result; - } - await this._scheduler.Result.PauseJob(jobKey); - result.Success = true; - result.Message = $"【{sysSchedule.Name}】成功"; - return result; - } - catch (Exception) - { - throw; - } + throw; } - #region 状态状态帮助方法 - public async Task> GetTaskStaus(Ghre_TasksQz sysSchedule) + } + /// + /// 暂停指定的计划任务 + /// + /// + /// + public async Task> PauseJob(Ghre_TasksQz sysSchedule) + { + var result = new ServiceResult(); + try { - - var ls = new List(); - var noTask = new List{ new TaskInfoDto { - jobId = sysSchedule.Id.ObjToString(), - jobGroup = sysSchedule.JobGroup, - triggerId = "", - triggerGroup = "", - triggerStatus = "不存在" - } }; JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup); - IJobDetail job = await this._scheduler.Result.GetJobDetail(jobKey); - if (job == null) - { - return noTask; - } - //info.Append(string.Format("任务ID:{0}\r\n任务名称:{1}\r\n", job.Key.Name, job.Description)); - var triggers = await this._scheduler.Result.GetTriggersOfJob(jobKey); - if (triggers == null || triggers.Count == 0) + if (!await _scheduler.Result.CheckExists(jobKey)) { - return noTask; + result.Success = false; + result.Message = $"未找到要暂停的任务:【{sysSchedule.Name}】"; + return result; } - foreach (var trigger in triggers) - { - var triggerStaus = await this._scheduler.Result.GetTriggerState(trigger.Key); - string state = GetTriggerState(triggerStaus.ObjToString()); - ls.Add(new TaskInfoDto - { - jobId = job.Key.Name, - jobGroup = job.Key.Group, - triggerId = trigger.Key.Name, - triggerGroup = trigger.Key.Group, - triggerStatus = state - }); - //info.Append(string.Format("触发器ID:{0}\r\n触发器名称:{1}\r\n状态:{2}\r\n", item.Key.Name, item.Description, state)); + await this._scheduler.Result.PauseJob(jobKey); + result.Success = true; + result.Message = $"【{sysSchedule.Name}】成功"; + return result; + } + catch (Exception) + { + throw; + } + } + #region 状态状态帮助方法 + public async Task> GetTaskStaus(Ghre_TasksQz sysSchedule) + { - } - return ls; + var ls = new List(); + var noTask = new List{ new TaskInfoDto { + jobId = sysSchedule.Id.ObjToString(), + jobGroup = sysSchedule.JobGroup, + triggerId = "", + triggerGroup = "", + triggerStatus = "不存在" + } }; + JobKey jobKey = new JobKey(sysSchedule.Id.ToString(), sysSchedule.JobGroup); + IJobDetail job = await this._scheduler.Result.GetJobDetail(jobKey); + if (job == null) + { + return noTask; } - public string GetTriggerState(string key) + //info.Append(string.Format("任务ID:{0}\r\n任务名称:{1}\r\n", job.Key.Name, job.Description)); + var triggers = await this._scheduler.Result.GetTriggersOfJob(jobKey); + if (triggers == null || triggers.Count == 0) { - string state = null; - if (key != null) - key = key.ToUpper(); - switch (key) - { - case "1": - state = "暂停"; - break; - case "2": - state = "完成"; - break; - case "3": - state = "出错"; - break; - case "4": - state = "阻塞"; - break; - case "0": - state = "正常"; - break; - case "-1": - state = "不存在"; - break; - case "BLOCKED": - state = "阻塞"; - break; - case "COMPLETE": - state = "完成"; - break; - case "ERROR": - state = "出错"; - break; - case "NONE": - state = "不存在"; - break; - case "NORMAL": - state = "正常"; - break; - case "PAUSED": - state = "暂停"; - break; - } - return state; + return noTask; } - #endregion - #region 创建触发器帮助方法 - - /// - /// 创建SimpleTrigger触发器（简单触发器） - /// - /// - /// - /// - /// - private ITrigger CreateSimpleTrigger(Ghre_TasksQz sysSchedule) + foreach (var trigger in triggers) { - if (sysSchedule.CycleRunTimes > 0) - { - ITrigger trigger = TriggerBuilder.Create() - .WithIdentity(sysSchedule.Id.ToString(), sysSchedule.JobGroup) - .StartAt(sysSchedule.BeginTime.Value) - .WithSimpleSchedule(x => x - .WithIntervalInSeconds(sysSchedule.IntervalSecond) - .WithRepeatCount(sysSchedule.CycleRunTimes - 1)) - .EndAt(sysSchedule.EndTime.Value) - .Build(); - return trigger; - } - else + var triggerStaus = await this._scheduler.Result.GetTriggerState(trigger.Key); + string state = GetTriggerState(triggerStaus.ObjToString()); + ls.Add(new TaskInfoDto { - ITrigger trigger = TriggerBuilder.Create() - .WithIdentity(sysSchedule.Id.ToString(), sysSchedule.JobGroup) - .StartAt(sysSchedule.BeginTime.Value) - .WithSimpleSchedule(x => x - .WithIntervalInSeconds(sysSchedule.IntervalSecond) - .RepeatForever() - ) - .EndAt(sysSchedule.EndTime.Value) - .Build(); - return trigger; - } - // 触发作业立即运行，然后每10秒重复一次，无限循环 + jobId = job.Key.Name, + jobGroup = job.Key.Group, + triggerId = trigger.Key.Name, + triggerGroup = trigger.Key.Group, + triggerStatus = state + }); + //info.Append(string.Format("触发器ID:{0}\r\n触发器名称:{1}\r\n状态:{2}\r\n", item.Key.Name, item.Description, state)); } - /// - /// 创建类型Cron的触发器 - /// - /// - /// - private ITrigger CreateCronTrigger(Ghre_TasksQz sysSchedule) + return ls; + } + public string GetTriggerState(string key) + { + string state = null; + if (key != null) + key = key.ToUpper(); + switch (key) { - // 作业触发器 - return TriggerBuilder.Create() - .WithIdentity(sysSchedule.Id.ToString(), sysSchedule.JobGroup) - .StartAt(sysSchedule.BeginTime.Value)//开始时间 - .EndAt(sysSchedule.EndTime.Value)//结束数据 - .WithCronSchedule(sysSchedule.Cron)//指定cron表达式 - .ForJob(sysSchedule.Id.ToString(), sysSchedule.JobGroup)//作业名称 - .Build(); + case "1": + state = "暂停"; + break; + case "2": + state = "完成"; + break; + case "3": + state = "出错"; + break; + case "4": + state = "阻塞"; + break; + case "0": + state = "正常"; + break; + case "-1": + state = "不存在"; + break; + case "BLOCKED": + state = "阻塞"; + break; + case "COMPLETE": + state = "完成"; + break; + case "ERROR": + state = "出错"; + break; + case "NONE": + state = "不存在"; + break; + case "NORMAL": + state = "正常"; + break; + case "PAUSED": + state = "暂停"; + break; } - #endregion + return state; + } + #endregion + #region 创建触发器帮助方法 + /// + /// 创建SimpleTrigger触发器（简单触发器） + /// + /// + /// + /// + /// + private ITrigger CreateSimpleTrigger(Ghre_TasksQz sysSchedule) + { + if (sysSchedule.CycleRunTimes > 0) + { + ITrigger trigger = TriggerBuilder.Create() + .WithIdentity(sysSchedule.Id.ToString(), sysSchedule.JobGroup) + .StartAt(sysSchedule.BeginTime.Value) + .WithSimpleSchedule(x => x + .WithIntervalInSeconds(sysSchedule.IntervalSecond) + .WithRepeatCount(sysSchedule.CycleRunTimes - 1)) + .EndAt(sysSchedule.EndTime.Value) + .Build(); + return trigger; + } + else + { + ITrigger trigger = TriggerBuilder.Create() + .WithIdentity(sysSchedule.Id.ToString(), sysSchedule.JobGroup) + .StartAt(sysSchedule.BeginTime.Value) + .WithSimpleSchedule(x => x + .WithIntervalInSeconds(sysSchedule.IntervalSecond) + .RepeatForever() + ) + .EndAt(sysSchedule.EndTime.Value) + .Build(); + return trigger; + } + // 触发作业立即运行，然后每10秒重复一次，无限循环 - /// - /// 立即执行 一个任务 - /// - /// - /// - public async Task> ExecuteJobAsync(Ghre_TasksQz tasksQz) + } + /// + /// 创建类型Cron的触发器 + /// + /// + /// + private ITrigger CreateCronTrigger(Ghre_TasksQz sysSchedule) + { + // 作业触发器 + return TriggerBuilder.Create() + .WithIdentity(sysSchedule.Id.ToString(), sysSchedule.JobGroup) + .StartAt(sysSchedule.BeginTime.Value)//开始时间 + .EndAt(sysSchedule.EndTime.Value)//结束数据 + .WithCronSchedule(sysSchedule.Cron)//指定cron表达式 + .ForJob(sysSchedule.Id.ToString(), sysSchedule.JobGroup)//作业名称 + .Build(); + } + #endregion + + + /// + /// 立即执行 一个任务 + /// + /// + /// + public async Task> ExecuteJobAsync(Ghre_TasksQz tasksQz) + { + var result = new ServiceResult(); + try { - var result = new ServiceResult(); - try - { - JobKey jobKey = new JobKey(tasksQz.Id.ToString(), tasksQz.JobGroup); + JobKey jobKey = new JobKey(tasksQz.Id.ToString(), tasksQz.JobGroup); - //判断任务是否存在，存在则 触发一次，不存在则先添加一个任务，触发以后再 停止任务 - if (!await _scheduler.Result.CheckExists(jobKey)) - { - //不存在 则 添加一个计划任务 - await AddScheduleJobAsync(tasksQz); + //判断任务是否存在，存在则 触发一次，不存在则先添加一个任务，触发以后再 停止任务 + if (!await _scheduler.Result.CheckExists(jobKey)) + { + //不存在 则 添加一个计划任务 + await AddScheduleJobAsync(tasksQz); - //触发执行一次 - await _scheduler.Result.TriggerJob(jobKey); + //触发执行一次 + await _scheduler.Result.TriggerJob(jobKey); - //停止任务 - await StopScheduleJobAsync(tasksQz); + //停止任务 + await StopScheduleJobAsync(tasksQz); - result.Success = true; - result.Message = $"立即执行计划任务:【{tasksQz.Name}】成功"; - } - else - { - await _scheduler.Result.TriggerJob(jobKey); - result.Success = true; - result.Message = $"立即执行计划任务:【{tasksQz.Name}】成功"; - } + result.Success = true; + result.Message = $"立即执行计划任务:【{tasksQz.Name}】成功"; } - catch (Exception ex) + else { - result.Message = $"立即执行计划任务失败:【{ex.Message}】"; + await _scheduler.Result.TriggerJob(jobKey); + result.Success = true; + result.Message = $"立即执行计划任务:【{tasksQz.Name}】成功"; } - - return result; } + catch (Exception ex) + { + result.Message = $"立即执行计划任务失败:【{ex.Message}】"; + } + + return result; + } - #region 初始化任务 - /// - /// 初始化任务 - /// - /// - public async Task> InitJobAsync() + #region 初始化任务 + /// + /// 初始化任务 + /// + /// + public async Task> InitJobAsync() + { + var result = new ServiceResult(); + try { - var result = new ServiceResult(); - try - { - if (AppSettings.app("Middleware", "QuartzNetJob", "Enabled").ObjToBool()) + if (AppSettings.app("Middleware", "QuartzNetJob", "Enabled").ObjToBool()) + { + var allQzServices = DbAccess.QueryList("select * from Ghre_TasksQz"); + foreach (var item in allQzServices) { - var allQzServices = DbAccess.QueryList("select * from Ghre_TasksQz"); - foreach (var item in allQzServices) + if (item.IsStart) { - if (item.IsStart) + result = await AddScheduleJobAsync(item); + if (result.Success) + { + Console.WriteLine($"QuartzNetJob{item.Name}启动成功！"); + } + else { - result = await AddScheduleJobAsync(item); - if (result.Success) - { - Console.WriteLine($"QuartzNetJob{item.Name}启动成功！"); - } - else - { - Console.WriteLine($"QuartzNetJob{item.Name}启动失败！错误信息：{result.Message}"); - } + Console.WriteLine($"QuartzNetJob{item.Name}启动失败！错误信息：{result.Message}"); } } } - - result.Message = $"初始化计划任务成功！"; - } - catch (Exception ex) - { - result.Message = $"初始化计划任务失败:【{ex.Message}】"; } - return result; + result.Message = $"初始化计划任务成功！"; + } + catch (Exception ex) + { + result.Message = $"初始化计划任务失败:【{ex.Message}】"; } - #endregion - + return result; } + #endregion + + }