fix .

Src/Dlhis.Basic/WorkGrids/Controllers/WorkGridsController.cs

@@ -51,15 +51,9 @@ public class WorkGridsController : ControllerBase
     /// <returns></returns>
     [HttpPost("save")]
     [Transactional]
-    public async Task<DefaultApiResult> SaveWorkGridsAsync(List<WorkGridSaveRequest> requests)
+    public async Task SaveWorkGridsAsync(List<WorkGridSaveRequest> requests)
     {
-        var msg = await _workGridService.SaveAsync(requests);
+        await _workGridService.SaveAsync(requests);
-        return new DefaultApiResult
-        {
-            Msg = msg,
-            Data = null,
-            Code = ApiStateCode.Success
-        };
     }
 
     /// <summary>
@@ -122,15 +116,9 @@ public class WorkGridsController : ControllerBase
     /// <param name="request"></param>
     /// <returns></returns>
     [HttpPost("user/assign")]
-    public async Task<DefaultApiResult> AssignUsersToWorkGridAsync(WorkGridUserAssignRequest request)
+    public async Task AssignUsersToWorkGridAsync(WorkGridUserAssignRequest request)
     {
-        var msg = await _workGridService.AssignAsync(request);
+        await _workGridService.AssignAsync(request);
-        return new DefaultApiResult
-        {
-            Msg = msg,
-            Data = null,
-            Code = ApiStateCode.Success
-        };
     }
 
     /// <summary>
@@ -153,7 +141,7 @@ public class WorkGridsController : ControllerBase
     [Transactional]
     public async Task SaveScheduleAsync(WorkGridScheduleSaveRequest request)
     {
-        await _workGridScheduleService.SaveAsync(request);
+         await _workGridScheduleService.SaveAsync(request);
     }
 
     /// <summary>

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

@@ -19,11 +19,17 @@ public class WorkGridSaveRequest
     /// 备注
     /// </summary>
     public string Remark { get; set; }
-    
+
-    
     /// <summary>
-    /// 最大用户数
+    /// 排班用户数提醒
     /// </summary>
-    [Range(1, int.MaxValue, ErrorMessage = "请设置最大用户数")]
+    [Range(1, int.MaxValue, ErrorMessage = "请设置排班用户数提醒")]
-    public int MaxUserCount { get; set; }
+    public int MaxUserTipCount { get; set; }
+
+
+    /// <summary>
+    /// 连续排班数提醒
+    /// </summary>
+    [Range(1, int.MaxValue, ErrorMessage = "请设置连续排班数提醒")]
+    public int MaxConsecutiveTipCount { get; set; }
 }

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

@@ -37,5 +37,7 @@ public class WorkGridPageResponse
     /// <summary>
     /// 最大用户数设置
     /// </summary>
-    public int MaxUserCount { get; set; }
+    public int MaxUserTipCount { get; set; }
+
+    public int MaxConsecutiveTipCount { get; set; }
 }

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

@@ -23,11 +23,16 @@ public class WorkGridUserPageResponse
     /// 员工数
     /// </summary>
     public int UserCount { get; set; }
-
+    
     /// <summary>
     /// 最大用户数设置
     /// </summary>
-    public int MaxUserCount { get; set; }
+    public int MaxUserTipCount { get; set; }
+    
+    /// <summary>
+    /// 请设置连续排班数提醒
+    /// </summary>
+    public int MaxConsecutiveTipCount { get; set; }
 
     /// <summary>
     /// 员工明细

Src/Dlhis.Basic/WorkGrids/Services/IWorkGridService.cs

@@ -21,7 +21,7 @@ public interface IWorkGridService : IScopeDependency
     /// </summary>
     /// <param name="requests"></param>
     /// <returns></returns>
-    Task<string> SaveAsync(List<WorkGridSaveRequest> requests);
+    Task SaveAsync(List<WorkGridSaveRequest> requests);
 
     /// <summary>
     /// /网格分页
@@ -48,7 +48,7 @@ public interface IWorkGridService : IScopeDependency
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
-    Task<string> AssignAsync(WorkGridUserAssignRequest request);
+    Task AssignAsync(WorkGridUserAssignRequest request);
 
     /// <summary>
     /// 移除人员

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

@@ -74,11 +74,10 @@ public class WorkGridService : IWorkGridService
     }
 
     /// <inheritdoc />
-    public async Task<string> SaveAsync(List<WorkGridSaveRequest> requests)
+    public async Task SaveAsync(List<WorkGridSaveRequest> requests)
     {
         var insertGrids = new List<string>();
         var updateGrids = new List<string>();
-        var tips = new List<string>();
 
         var leaderUserCodes = requests.Select(x => x.LeaderUserCode).Distinct().ToList();
         var existsUserCodes = await _dbContext.Queryable<GainfoEntity>().Where(x => leaderUserCodes.Contains(x.Code)).Select(x => x.Code).ToListAsync();
@@ -107,23 +106,14 @@ public class WorkGridService : IWorkGridService
                 entity.LeaderUserCode = request.LeaderUserCode;
 
                 await _dbContext.InsertAsync(entity);
-                insertGrids.Add($"{entity.Name}({entity.LeaderUserCode}),最大用户数:{entity.MaxUserCount}");
+                insertGrids.Add($"{entity.Name}({entity.LeaderUserCode}),最大用户数:{entity.MaxUserTipCount}");
             }
             else
             {
                 var entity = await _dbContext.Queryable<WorkGridEntity>().Where(x => x.Id == request.Id).SingleAsync();
                 entity.ThrowIfNull("网格不存在");
 
-                updateGrids.Add($"{entity.Name}->{request.Name},{entity.MaxUserCount}->{request.MaxUserCount}");
+                updateGrids.Add($"{entity.Name}->{request.Name},排版用户数{entity.MaxUserTipCount}->{request.MaxUserTipCount},连续排班天数:{entity.MaxConsecutiveTipCount}->{request.MaxConsecutiveTipCount}");
-                if (request.MaxUserCount < entity.MaxUserCount)
-                {
-                    var userCount = await _dbContext.Queryable<WorkGridUserEntity>().Where(x => x.WorkGridCode == entity.Code).CountAsync();
-                    if (userCount > request.MaxUserCount)
-                    {
-                        tips.Add($"{request.Name}人员{userCount}超出最大人数设置{request.MaxUserCount}");
-                    }
-                }
-
                 request.Adapt(entity);
 
                 await _dbContext.UpdateAsync(entity);
@@ -132,9 +122,6 @@ public class WorkGridService : IWorkGridService
 
         await _operateLog.LogAsync(OperateLogType.WorkGrid, "创建网格:" + insertGrids.Join("\r\n"));
         await _operateLog.LogAsync(OperateLogType.WorkGrid, "修改网格:" + updateGrids.Join("\r\n"));
-
-
-        return tips.Any() ? tips.Join("\r\n") : null;
     }
 
     /// <inheritdoc />
@@ -158,7 +145,8 @@ public class WorkGridService : IWorkGridService
                 LeaderUserCode = x.LeaderUserCode,
                 UserName = ga.Name,
                 Remark = x.Remark,
-                MaxUserCount = x.MaxUserCount,
+                MaxUserTipCount = x.MaxUserTipCount,
+                MaxConsecutiveTipCount = x.MaxConsecutiveTipCount,
                 UserCount = SqlFunc.Subqueryable<WorkGridUserEntity>().Where(p => p.WorkGridCode == x.Code && p.IsDeleted == false).Count()
             })
             .ToPageListAsync(request);
@@ -197,7 +185,8 @@ public class WorkGridService : IWorkGridService
                 Code = x.Code,
                 Name = x.Name,
                 Remark = x.Remark,
-                MaxUserCount = x.MaxUserCount
+                MaxUserTipCount = x.MaxUserTipCount,
+                MaxConsecutiveTipCount = x.MaxConsecutiveTipCount
             })
             .SingleAsync();
 
@@ -230,7 +219,7 @@ public class WorkGridService : IWorkGridService
     }
 
     /// <inheritdoc />
-    public async Task<string> AssignAsync(WorkGridUserAssignRequest request)
+    public async Task AssignAsync(WorkGridUserAssignRequest request)
     {
         var currentFactory = _currentUser.GetStringTenantId();
         var role = _currentUser.GetRole();
@@ -264,12 +253,7 @@ public class WorkGridService : IWorkGridService
         }).ToList();
 
         await _dbContext.InsertAsync(dataToInserts);
-        var userCount = await _dbContext.Queryable<WorkGridUserEntity>().Where(x => x.WorkGridCode == myWorkGrid.Code).CountAsync();
         await _operateLog.LogAsync(OperateLogType.WorkGrid, $"分配人员到网格({myWorkGrid.Name}),人员:{dataToInserts.Select(x => x.UserCode).Join(",")}");
-
-        return userCount > myWorkGrid.MaxUserCount
-            ? $"{myWorkGrid.Name}人员{userCount}超出最大人数设置{myWorkGrid.MaxUserCount}"
-            : null;
     }
 
     /// <inheritdoc />

Src/Dlhis.Basic/appsettings.Development.json

@@ -23,7 +23,7 @@
     "Timeout": 30,
     "SlowSqlTime": 1,
     "EnableSqlLog": true,
-    "Generate": false
+    "Generate": true
   },
   "SwaggerOptions": {
     "Enable": true,

Src/Dlhis.Basic/appsettings.json

@@ -44,7 +44,7 @@
     }
   },
   "RedisOptions": {
-    "ConnectionString": "192.168.199.30:30115,defaultDatabase=1,password=dlhis123"
+    "ConnectionString": "192.168.199.124:6379,defaultDatabase=1,password=dlhis123"
   },
   "IdentityServerOptions": {
     "Authority": "http://identity.oauth.svc.cluster.local",

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

@@ -36,12 +36,18 @@ public class WorkGridEntity : SugarBaseEntity, ISoftDeleted
     /// </summary>
     [SugarColumn(IsNullable = true, ColumnDescription = "备注")]
     public string Remark { get; set; }
-    
+
     /// <summary>
-    /// 最大用户数
+    /// 最大排班用户数提醒
     /// </summary>
-    [SugarColumn(IsNullable = false, ColumnDescription = "最大用户数")]
+    [SugarColumn(IsNullable = false, ColumnDescription = "最大排班用户数提醒")]
-    public int MaxUserCount { get; set; }
+    public int MaxUserTipCount { get; set; }
+
+    /// <summary>
+    /// 最大排班连续天数提醒
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "最大排班连续天数提醒")]
+    public int MaxConsecutiveTipCount { get; set; }
 
     public bool IsDeleted { get; set; }
 }