fix 逻辑删除增加,消息通知

This commit is contained in:
2025-03-06 16:49:02 +08:00
parent 7e71884b32
commit bf392a7c46
16 changed files with 170 additions and 28 deletions

View File

@@ -1,3 +1,4 @@
using Kurisu.AspNetCore.DataAccess.Entity;
using Kurisu.AspNetCore.DataAccess.SqlSugar;
using Mapster;
using SqlSugar;
@@ -7,8 +8,8 @@ namespace Dlhis.Entity.Basic.Entity;
/// <summary>
/// 工作网格
/// </summary>
[SugarTable(TableName = "WorkGrid")]
public class WorkGridEntity : SugarBaseEntity
[SugarTable(TableName = "WorkGrids")]
public class WorkGridEntity : SugarBaseEntity, ISoftDeleted
{
/// <summary>
/// 网格code
@@ -35,4 +36,7 @@ public class WorkGridEntity : SugarBaseEntity
/// </summary>
[SugarColumn(IsNullable = true, ColumnDescription = "备注")]
public string Remark { get; set; }
public bool IsDeleted { get; set; }
}

View File

@@ -1,4 +1,5 @@
using Dlhis.Entity.Basic.Enums;
using Kurisu.AspNetCore.DataAccess.Entity;
using Kurisu.AspNetCore.DataAccess.SqlSugar;
using SqlSugar;
using SqlSugar.DbConvert;
@@ -9,7 +10,7 @@ namespace Dlhis.Entity.Basic.Entity;
///
/// </summary>
[SugarTable(TableName = "WorkGridSchedules")]
public class WorkGridScheduleEntity : SugarBaseEntity
public class WorkGridScheduleEntity : SugarBaseEntity , ISoftDeleted
{
/// <summary>
/// 网格code
@@ -34,4 +35,7 @@ public class WorkGridScheduleEntity : SugarBaseEntity
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "工号", IndexGroupNameList = new[] { "idx_WorkGridSchedules_userCode" })]
public string UserCode { get; set; }
public bool IsDeleted { get; set; }
}

View File

@@ -10,8 +10,8 @@ namespace Dlhis.Entity.Basic.Entity;
/// <summary>
/// 工作网格
/// </summary>
[SugarTable(TableName = "WorkGridTimePeriod")]
public class WorkGridTimePeriodEntity : SugarBaseEntity, ITenantId
[SugarTable(TableName = "WorkGridTimePeriods")]
public class WorkGridTimePeriodEntity : SugarBaseEntity, ITenantId , ISoftDeleted
{
/// <summary>
/// 班次
@@ -43,4 +43,8 @@ public class WorkGridTimePeriodEntity : SugarBaseEntity, ITenantId
public TimeOnly End { get; set; }
public string TenantId { get; set; }
/// <inheritdoc />
public bool IsDeleted { get; set; }
}

View File

@@ -1,3 +1,4 @@
using Kurisu.AspNetCore.DataAccess.Entity;
using Kurisu.AspNetCore.DataAccess.SqlSugar;
using SqlSugar;
@@ -7,7 +8,7 @@ namespace Dlhis.Entity.Basic.Entity;
/// 网格人员
/// </summary>
[SugarTable(TableName = "WorkGridUsers")]
public class WorkGridUserEntity : SugarBaseEntity
public class WorkGridUserEntity : SugarBaseEntity, ISoftDeleted
{
/// <summary>
/// 网格code
@@ -18,6 +19,9 @@ public class WorkGridUserEntity : SugarBaseEntity
/// <summary>
/// 网格人员
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "网格人员", UniqueGroupNameList = new[] { "idx_WorkGridUsers_userCode" })]
[SugarColumn(IsNullable = false, ColumnDescription = "网格人员", IndexGroupNameList = new[] { "idx_WorkGridUsers_userCode" })]
public string UserCode { get; set; }
/// <inheritdoc />
public bool IsDeleted { get; set; }
}