add Count,Alias

Src/Dlhis.Basic/WorkGrids/Request/WorkGridSaveRequest.cs

@@ -39,4 +39,16 @@ public class WorkGridSaveRequest
     /// </summary>
     [Range(1, int.MaxValue, ErrorMessage = "请设置连续排班限制")]
     public int MaxConsecutiveLimitCount { get; set; }
+
+    /// <summary>
+    /// 别名
+    /// </summary>
+    [Required(ErrorMessage = "别名不可为空")]
+    public string Alias { get; set; }
+
+    /// <summary>
+    /// 编制人数
+    /// </summary>
+    [Range(1, int.MaxValue, ErrorMessage = "编制人数")]
+    public int Count { get; set; }
 }

Src/Dlhis.Basic/WorkGrids/Response/WorkGridPageResponse.cs

@@ -42,4 +42,15 @@ public class WorkGridPageResponse
     public int MaxConsecutiveTipCount { get; set; }
 
     public int MaxConsecutiveLimitCount { get; set; }
+    
+    
+    /// <summary>
+    /// 别名
+    /// </summary>
+    public string Alias { get; set; }
+
+    /// <summary>
+    /// 编制人数
+    /// </summary>
+    public int Count { get; set; }
 }

Src/Dlhis.Basic/WorkGrids/Response/WorkGridUserPageResponse.cs

@@ -35,6 +35,16 @@ public class WorkGridUserPageResponse
     public int MaxConsecutiveTipCount { get; set; }
 
     public int MaxConsecutiveLimitCount { get; set; }
+    
+    /// <summary>
+    /// 别名
+    /// </summary>
+    public string Alias { get; set; }
+
+    /// <summary>
+    /// 编制人数
+    /// </summary>
+    public int Count { get; set; }
 
     /// <summary>
     /// 员工明细

Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs

@@ -120,7 +120,10 @@ public class WorkGridService : IWorkGridService
 
                 updateGrids.Add($"{entity.Name}->{request.Name}," +
                                 $"排班用户数{entity.MaxUserTipCount}->{request.MaxUserTipCount}," +
-                                $"连续排班天数:{entity.MaxConsecutiveTipCount}->{request.MaxConsecutiveTipCount},${entity.MaxConsecutiveLimitCount}->{request.MaxConsecutiveLimitCount}");
+                                $"连续排班天数:{entity.MaxConsecutiveTipCount}->{request.MaxConsecutiveTipCount}," +
+                                $"最大排班限制:{entity.MaxConsecutiveTipCount}->{request.MaxConsecutiveTipCount}," +
+                                $"别名:{entity.Alias}->{request.Alias}," +
+                                $"编制人数{entity.Count}->{request.Count}");
                 request.Adapt(entity);
                 entity.LeaderUserCode = request.LeaderUserCode;
 
@@ -162,6 +165,8 @@ public class WorkGridService : IWorkGridService
                 MaxUserTipCount = x.MaxUserTipCount,
                 MaxConsecutiveTipCount = x.MaxConsecutiveTipCount,
                 MaxConsecutiveLimitCount = x.MaxConsecutiveLimitCount,
+                Alias = x.Alias,
+                Count = x.Count,
                 UserCount = SqlFunc.Subqueryable<WorkGridUserEntity>().Where(p => p.WorkGridCode == x.Code && p.IsDeleted == false).Count()
             })
             .ToPageListAsync(request);
@@ -207,7 +212,9 @@ public class WorkGridService : IWorkGridService
                 Remark = x.Remark,
                 MaxUserTipCount = x.MaxUserTipCount,
                 MaxConsecutiveTipCount = x.MaxConsecutiveTipCount,
-                MaxConsecutiveLimitCount = x.MaxConsecutiveLimitCount
+                MaxConsecutiveLimitCount = x.MaxConsecutiveLimitCount,
+                Alias = x.Alias,
+                Count = x.Count
             })
             .SingleAsync();
 

Src/Dlhis.Entity/Basic/Entity/WorkGridEntity.cs

@@ -55,6 +55,18 @@ public class WorkGridEntity : SugarBaseEntity, ISoftDeleted
     [SugarColumn(IsNullable = false, ColumnDescription = "请设置连续排班限制")]
     public int MaxConsecutiveLimitCount { get; set; }
     
+    /// <summary>
+    /// 别名
+    /// </summary>
+    [SugarColumn(IsNullable = true)]
+    public string Alias { get; set; }
+
+    /// <summary>
+    /// 编制人数
+    /// </summary>
+    [SugarColumn(IsNullable = false, DefaultValue = "100")]
+    public int Count { get; set; } = 50;
+
 
     public bool IsDeleted { get; set; }
 }