xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善大部分问题

Browse Source
This commit is contained in:
橙子
2022-04-08 23:44:25 +08:00
parent 5fcd4fb5a4
commit feb73174eb
26 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Yi.Framework.Net6/Yi.Framework.Model/Models/BaseModel/BaseModelEntity.cs
View File

@@ -41,16 +41,6 @@ namespace Yi.Framework.Model.Models
[SugarColumn(ColumnName = "ModifyTime")]
public DateTime? ModifyTime { get; set; }
/// <summary>
/// 删除者
///</summary>
[SugarColumn(ColumnName = "DeleteUser")]
public Guid? DeleteUser { get; set; }
/// <summary>
/// 删除时间
///</summary>
[SugarColumn(ColumnName = "DeleteTime")]
public DateTime? DeleteTime { get; set; }
/// <summary>
/// 是否删除
///</summary>
[SugarColumn(ColumnName = "IsDeleted")]

34
Yi.Framework.Net6/Yi.Framework.Model/Models/TenantEntity.cs
View File

@@ -8,38 +8,12 @@ namespace Yi.Framework.Model.Models
/// 租户表
///</summary>
[SugarTable("Tenant")]
public partial class TenantEntity
public partial class TenantEntity:BaseModelEntity
{
public TenantEntity()
{
this.Id=Guid.NewGuid();
this.IsDeleted=false;
this.CreateTime = DateTime.Now;
}
/// <summary>
/// 1
/// 租户名
///</summary>
[SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )]
public Guid Id { get; set; }
/// <summary>
/// 创建者
///</summary>
[SugarColumn(ColumnName="CreateUser" )]
public Guid? CreateUser { get; set; }
/// <summary>
/// 创建时间
///</summary>
[SugarColumn(ColumnName="CreateTime" )]
public DateTime? CreateTime { get; set; }
/// <summary>
/// 修改时间
///</summary>
[SugarColumn(ColumnName="ModifyTime" )]
public DateTime? ModifyTime { get; set; }
/// <summary>
/// 是否删除
///</summary>
[SugarColumn(ColumnName="IsDeleted" )]
public bool? IsDeleted { get; set; }
[SugarColumn(ColumnName="TenantName" )]
public string TenantName { get; set; }
}
}

30
Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs
View File

@@ -11,11 +11,6 @@ namespace Yi.Framework.Model.Models
public partial class UserEntity:BaseModelEntity
{
/// <summary>
/// 1
///</summary>
[SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )]
public Guid Id { get; set; }
/// <summary>
/// 姓名
///</summary>
[SugarColumn(ColumnName="Name" )]
@@ -26,31 +21,6 @@ namespace Yi.Framework.Model.Models
[SugarColumn(ColumnName="Age" )]
public int? Age { get; set; }
/// <summary>
/// 创建者
///</summary>
[SugarColumn(ColumnName="CreateUser" )]
public Guid? CreateUser { get; set; }
/// <summary>
/// 创建时间
///</summary>
[SugarColumn(ColumnName="CreateTime" )]
public DateTime? CreateTime { get; set; }
/// <summary>
/// 修改者
///</summary>
[SugarColumn(ColumnName="ModifyUser" )]
public Guid? ModifyUser { get; set; }
/// <summary>
/// 修改时间
///</summary>
[SugarColumn(ColumnName="ModifyTime" )]
public DateTime? ModifyTime { get; set; }
/// <summary>
/// 是否删除
///</summary>
[SugarColumn(ColumnName="IsDeleted" )]
public bool? IsDeleted { get; set; }
/// <summary>
/// 租户Id
///</summary>
[SugarColumn(ColumnName="TenantId" )]

11
Yi.Framework.Net6/Yi.Framework.Model/Query/QueryCondition.cs
View File

@@ -6,11 +6,18 @@ using System.Threading.Tasks;
namespace Yi.Framework.Model.Query
{
public class QueryCondition
public class QueryPageCondition
{
public int Index { get; set; }
public int Size { get; set; }
public int Count { get; set; }
public List<QueryParameter> Parameters { get; set; } = new List<QueryParameter>();
public List<string> OrderBys { get; set; } = new List<string>();
}
public class QueryCondition
{
public List<QueryParameter> Parameters { get; set; } = new List<QueryParameter>();
public List<string> OrderBys { get; set; } = new List<string>();

11
Yi.Framework.Net6/Yi.Framework.Model/Query/QueryParameter.cs
View File

@@ -1,16 +1,19 @@
using SqlSugar;
using Newtonsoft.Json.Converters;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
namespace Yi.Framework.Model.Query
{
public class QueryParameter
{
public string FieldName { get; set; }
public string FieldValue { get; set; }
public ConditionalType ConditionalType { get; set; } = ConditionalType.Like;
public string Key { get; set; }
public string Value { get; set; }
[JsonConverter(typeof(StringEnumConverter))]
public ConditionalType Type { get; set; } = ConditionalType.Like;
}
}