timelimit

src/Hotline.Api/Controllers/TestController.cs

@@ -92,7 +92,7 @@ namespace Hotline.Api.Controllers;
 public class TestController : BaseController
 {
     private readonly ILogger<TestController> _logger;
-    private readonly IAuthorizeGenerator _authorizeGenerator;
+    //private readonly IAuthorizeGenerator _authorizeGenerator;
     private readonly IOptionsSnapshot<CallCenterConfiguration> _options;
     private readonly ISessionContext _sessionContext;
     private readonly IRepository<User> _userRepository;
@@ -147,9 +147,8 @@ public class TestController : BaseController
 
 
     public TestController(
-        INewRockClient client,
         ILogger<TestController> logger,
-        IAuthorizeGenerator authorizeGenerator,
+        //IAuthorizeGenerator authorizeGenerator,
         IOptionsSnapshot<CallCenterConfiguration> options,
         ISessionContext sessionContext,
         IRepository<User> userRepository,
@@ -198,7 +197,7 @@ ICallApplication callApplication
         )
     {
         _logger = logger;
-        _authorizeGenerator = authorizeGenerator;
+        //_authorizeGenerator = authorizeGenerator;
         _options = options;
         _sessionContext = sessionContext;
         _userRepository = userRepository;
@@ -581,11 +580,11 @@ ICallApplication callApplication
         //var endTime = _timeLimitDomainService
         //.CalcEndTime(DateTime.Parse("2024-07-09 14:57:51"), ETimeType.WorkDay, -3, 0, 0);///.EndTime;
         //var timeResult = _timeLimitDomainService.CalcEndTime(DateTime.Now, ETimeType.WorkDay, 3, 80, 50);
-        //var t = _timeLimitDomainService.CalcWorkTimeEx(DateTime.Parse("2024-07-22 11:30:00"), DateTime.Parse("2024-07-23 14:00:00"), false);
+        var t = _timeLimitDomainService.CalcWorkTimeEx(DateTime.Parse(batchId), DateTime.Parse(taskId), false);
         //var r = await _aiVisitService.QueryAiVisitTaskEx("MTAwMDAx173ASS0kSUAqK2rl2sFGME", "", HttpContext.RequestAborted);
         //var r = await _aiVisitService.QueryAiVisitTaskResult(batchId, DateTime.Parse("2024-07-28"), DateTime.Parse("2024-08-01"), HttpContext.RequestAborted);
 
-        var r = _timeLimitDomainService.CalcExpiredTime(DateTime.Now, EFlowDirection.CenterToCenter, batchId);
+        //var r = _timeLimitDomainService.CalcExpiredTime(DateTime.Now, EFlowDirection.CenterToCenter, batchId);
 
         return OpenResponse.Ok(DateTime.Now.ToString("F"));
     }

src/Hotline/Settings/TimeLimits/TimeLimitDomainService.cs

@@ -493,6 +493,10 @@ namespace Hotline.Settings.TimeLimits
                         if (beginTime > AfterWorkEndTime)
                         {
                             beginTime = MornWorkBeginTime.AddDays(1);
+                            MornWorkBeginTime = MornWorkBeginTime.AddDays(1);
+                            MornWorkEndTime = MornWorkEndTime.AddDays(1);
+                            AfterWorkBeginTime = AfterWorkBeginTime.AddDays(1);
+                            AfterWorkEndTime = AfterWorkEndTime.AddDays(1);
                         }
                     }
                     if (beginTime >= endTime)