Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

NuGet.Config

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="fengwo.org" value="http://nuget.12345lm.cn/v3/index.json" />
+    <add key="fengwo.org" value="http://110.188.24.182:5555/v3/index.json" />
   </packageSources>
 </configuration>

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.Api/StartupHelper.cs

@@ -105,7 +105,7 @@ namespace Hotline.Api
             services.AddSwaggerGen(c =>
             {
                 //添加文档
-                c.SwaggerDoc("v1", new OpenApiInfo() { Title = "Hotline Api", Version = "v1.0", Description = "城市热线api" });
+                c.SwaggerDoc("v1", new OpenApiInfo() { Title = "Hotline Api", Version = "v1.0", Description = "智慧热线api" });
                 var files = Directory.GetFiles(AppContext.BaseDirectory).Where(d => d.EndsWith(".xml"));
                 foreach (var file in files)
                 {

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -1745,10 +1745,7 @@ namespace Hotline.FlowEngine.Workflows
                     HandleStepsByTerminalCs(nextStep, steps, traces, ref updateSteps, ref updateTraces);
                 }
             }
-            else
-            {
-                EndStepByTerminalCs(step, traces, ref updateSteps, ref updateTraces);
-            }
+            EndStepByTerminalCs(step, traces, ref updateSteps, ref updateTraces);
         }
 
         private void EndStepByTerminalCs(WorkflowStep step, List<WorkflowTrace> traces, ref List<WorkflowStep> updateSteps, ref List<WorkflowTrace> updateTraces)

src/Hotline/Hotline.csproj

@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
     <PackageReference Include="RestSharp" Version="110.2.0" />
-    <PackageReference Include="XF.Utility.MQ" Version="1.0.5" />
+    <PackageReference Include="XF.Utility.MQ" Version="1.0.9" />
   </ItemGroup>
 
   <ItemGroup>

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;