timelimit

src/Hotline.Api/Controllers/TestController.cs

@@ -185,7 +185,7 @@ public class TestController : BaseController
 
         //int a = _timeLimitDomainService.CalcWorkTime(DateTime.Now, DateTime.Parse("2023-09-11 16:21:00"));
         //int m = _timeLimitDomainService.CalcWorkTime(DateTime.Parse("2023-09-19 12:00:00"), DateTime.Parse("2023-09-20 18:00:00"), false);
-        var r = _timeLimitDomainService.CalcEndTime(DateTime.Parse("2024-03-05 15:36:14"), ETimeType.WorkDay,45,false,80);
+        var r = _timeLimitDomainService.CalcEndTime(DateTime.Parse("2024-03-07 14:09:45"), ETimeType.WorkDay,1,false,80);
         //var r = _timeLimitDomainService.CalcExpiredTime(DateTime.Parse("2024-02-29 10:12:33"), Share.Enums.FlowEngine.EFlowDirection.OrgToCenter, "10");
         //await _wfModuleDomainService.PersistenceModulesAsync(HttpContext.RequestAborted);
 

src/Hotline/Settings/TimeLimits/TimeLimitDomainService.cs

@@ -501,6 +501,7 @@ namespace Hotline.Settings.TimeLimits
                                 {
                                     if (startTime.AddMinutes(totalWorkMinutes)> DateTime.Parse(startTime.ToShortDateString() + " " + workTimeWorkDay.SettingValue[1] + ":00"))
                                     {
+                                        totalWorkMinutes = totalWorkMinutes - ((DateTime.Parse(startTime.ToShortDateString() + " " + workTimeWorkDay.SettingValue[1] + ":00") - startTime).TotalMinutes);
                                         startTime = startTime.AddDays(day);
                                         startTime = DateTime.Parse(startTime.ToShortDateString() + " " + workTimeWorkDay.SettingValue[0] + ":00").AddMinutes(totalWorkMinutes);
                                         totalWorkMinutes = 0;