yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 逻辑优化

Browse Source
This commit is contained in:
liguoyang
2025-03-04 15:02:00 +08:00
parent 2f32885663
commit 443c06dc1f
15 changed files with 208 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Src/Dlhis.Entity/Basic/Entity/WorkGridScheduleEntity.cs
View File

@@ -1,5 +1,4 @@
using Dlhis.Entity.Basic.Enums;
using Kurisu.AspNetCore.DataAccess.Entity;
using Kurisu.AspNetCore.DataAccess.SqlSugar;
using SqlSugar;
using SqlSugar.DbConvert;
@@ -9,19 +8,19 @@ namespace Dlhis.Entity.Basic.Entity;
/// <summary>
///
/// </summary>
[SugarTable(TableName = "WorkGridSchedule")]
public class WorkGridScheduleEntity : SugarBaseEntity, ITenantId
[SugarTable(TableName = "WorkGridSchedules")]
public class WorkGridScheduleEntity : SugarBaseEntity
{
/// <summary>
/// 网格code
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "网格code")]
[SugarColumn(IsNullable = false, ColumnDescription = "网格code", IndexGroupNameList = new[] { "idx_WorkGridSchedules_workGridCode_date" })]
public Guid WorkGridCode { get; set; }
/// <summary>
/// 排班日期
/// </summary>
[SugarColumn(IsNullable = false, ColumnDataType = "date", ColumnDescription = "排班日期")]
[SugarColumn(IsNullable = false, ColumnDataType = "date", ColumnDescription = "排班日期", IndexGroupNameList = new[] { "idx_WorkGridSchedules_workGridCode_date" })]
public DateOnly Date { get; set; }
/// <summary>
@@ -33,10 +32,6 @@ public class WorkGridScheduleEntity : SugarBaseEntity, ITenantId
/// <summary>
/// 工号
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "工号")]
[SugarColumn(IsNullable = false, ColumnDescription = "工号", IndexGroupNameList = new[] { "idx_WorkGridSchedules_userCode" })]
public string UserCode { get; set; }
/// <inheritdoc />
public string TenantId { get; set; }
}

16
Src/Dlhis.Entity/Basic/Entity/WorkGridUserEntity.cs
View File

@@ -1,8 +1,5 @@
using Dlhis.Entity.Basic.Enums;
using Kurisu.AspNetCore.DataAccess.Entity;
using Kurisu.AspNetCore.DataAccess.SqlSugar;
using SqlSugar;
using SqlSugar.DbConvert;
namespace Dlhis.Entity.Basic.Entity;
@@ -10,7 +7,7 @@ namespace Dlhis.Entity.Basic.Entity;
/// 网格人员
/// </summary>
[SugarTable(TableName = "WorkGridUsers")]
public class WorkGridUserEntity : SugarBaseEntity, ITenantId
public class WorkGridUserEntity : SugarBaseEntity
{
/// <summary>
/// 网格code
@@ -21,15 +18,6 @@ public class WorkGridUserEntity : SugarBaseEntity, ITenantId
/// <summary>
/// 网格人员
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "网格人员")]
[SugarColumn(IsNullable = false, ColumnDescription = "网格人员", UniqueGroupNameList = new[] { "idx_WorkGridUsers_userCode" })]
public string UserCode { get; set; }
/// <summary>
/// 排班类型
/// </summary>
[SugarColumn(IsNullable = true,ColumnDataType = "varchar(50)",ColumnDescription = "排班类型", SqlParameterDbType = typeof(EnumToStringConvert))]
public WorkGridTimePeriodEnumType? ScheduleType { get; set; }
/// <inheritdoc />
public string TenantId { get; set; }
}

7
Src/Dlhis.Entity/Sys/Entities/FactorySettingEntity.cs
View File

@@ -34,12 +34,15 @@ public class FactorySettingEntity : SugarBaseEntity, ITenantId
/// </summary>
[SugarColumn(ColumnDescription = "人脸检测配置", IsNullable = true, IsJson = true)]
public FaceImageDetectionDto FaceImageDetection { get; set; }
/// <summary>
/// 外包自动离职天数(无通行记录)
/// </summary>
public int NoRecordAutoResignOutsourceDays { get; set; }
[SugarColumn(IsNullable = true, ColumnDataType = "time", ColumnDescription = "工作网格编辑限制时间")]
public TimeOnly? WorkGridSetLimit { get; set; }
public string TenantId { get; set; }
}