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

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

@@ -83,7 +83,7 @@ public class WorkGridScheduleService : IWorkGridScheduleService
             .Where(x => request.UserCodes.Contains(x.UserCode))
             .ToListAsync();
 
-        await _dbContext.DeleteReallyAsync(data);
+        await _dbContext.DeleteAsync(data);
         await _operateLog.LogAsync(OperateLogType.WorkGrid, $"移除网格({workGrid.Name}){request.Date.ToString("yyyy-M-d")}的{request.PeriodType.GetDescription()}人员:{request.UserCodes.Join(",")}");
     }
 
@@ -113,7 +113,7 @@ public class WorkGridScheduleService : IWorkGridScheduleService
                 item.MaximumConsecutiveSchedules = maximumConsecutiveUserCodes.FirstOrDefault(x => x.UserCode == item.UserCode);
             }
         }
-        
+
         return data;
     }
 
@@ -228,7 +228,8 @@ public class WorkGridScheduleService : IWorkGridScheduleService
         var p = userCodes.Select(x => $"@param{x}").Join(",");
         var values = userCodes.ToDictionary(x => $"param{x}", x => x);
 
-        values.Add("date", date.ToString("yyyy-MM-dd"));
+        values.Add("dateBefore", date.AddDays(-1).ToString("yyyy-MM-dd"));
+        values.Add("dateAfter", date.AddDays(1).ToString("yyyy-MM-dd"));
         values.Add("days", days.ToString());
 
         var sql = $@"
@@ -250,7 +251,11 @@ WITH ranked_dates AS (SELECT UserCode,
                  GROUP BY UserCode, grp
                  HAVING streak_days >= @days)
 SELECT UserCode, streak_days as Count, start_date as Start, end_date as End
-FROM streaks where @date>= start_date and @date<= end_date;
+FROM streaks 
+where (@dateBefore >= start_date
+    and @dateBefore <= end_date)
+   or (@dateAfter >= start_date
+    and @dateAfter <= end_date);
 
 ";