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

src/Hotline.Api/Controllers/Bigscreen/DataScreenController.cs

@@ -437,7 +437,7 @@ namespace Hotline.Api.Controllers.Bigscreen
                     VisitOrgCode = x.VisitOrgCode.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("6")),
                     VisitOrgName = x.VisitOrgName,
                     SatisfiedCount = SqlFunc.AggregateSum(SqlFunc.IIF(SqlFunc.JsonField(x.OrgProcessingResults, "Key") != "1" && SqlFunc.JsonField(x.OrgProcessingResults, "Key") != "2", 1, 0)),
-                    VisitCount = SqlFunc.AggregateCount(x.VisitOrgCode)
+                    VisitCount = SqlFunc.AggregateCount(x.VisitOrgName)
                 }).MergeTable().OrderByDescending(x=>x.SatisfiedCount).Take(10).ToListAsync();
             return list;
         }
@@ -466,7 +466,7 @@ namespace Hotline.Api.Controllers.Bigscreen
                 {
                     Name = x.SourceChannel,
                     SumCount = SumCount,
-                    HasCount = SqlFunc.AggregateCount(x.SourceChannelCode)
+                    HasCount = SqlFunc.AggregateCount(x.SourceChannel)
                 }).ToListAsync();
                 return list;
             }

src/Hotline.Api/Controllers/OrderController.cs

@@ -1209,11 +1209,24 @@ public class OrderController : BaseController
     }
 
     /// <summary>
-    /// 延期列表
+    /// 取消工单延期
     /// </summary>
+    /// <param name="id"></param>
     /// <returns></returns>
-    //[Permission(EPermission.DelayList)]
-    [HttpGet("delay")]
+    [HttpPost("delay/cancel")]
+    [LogFilter("取消工单延期")]
+    public async Task CancelDelay([FromBody]string id)
+    {
+
+    }
+
+
+	/// <summary>
+	/// 延期列表
+	/// </summary>
+	/// <returns></returns>
+	//[Permission(EPermission.DelayList)]
+	[HttpGet("delay")]
     public async Task<PagedDto<OrderDelayDto>> DelayList([FromQuery] DelayListDto dto)
     {
         var (total, items) = await _orderDelayRepository.Queryable(viewFilter: false)

src/Hotline.Api/Controllers/TestController.cs

@@ -185,8 +185,8 @@ 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-02-29 10:12:33"), ETimeType.WorkDay,3,false,80);
-        var r = _timeLimitDomainService.CalcExpiredTime(DateTime.Parse("2024-02-29 10:12:33"), Share.Enums.FlowEngine.EFlowDirection.OrgToCenter, "10");
+        var r = _timeLimitDomainService.CalcEndTime(DateTime.Parse("2024-03-05 15:36:14"), ETimeType.WorkDay,45,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);
 
         //var rsp = await _daprClient.InvokeMethodAsync<ApiResponse<string>>(HttpMethod.Get, "identity", "api/v1/Test/time", HttpContext.RequestAborted);

src/Hotline.Share/Dtos/Settings/TimeLimitDto.cs

@@ -241,6 +241,5 @@ namespace Hotline.Share.Dtos.Settings
         public int Percentage { get; set; }
     }
 
-
     #endregion
 }

src/Hotline/Settings/TimeLimits/TimeLimitDomainService.cs

@@ -19,6 +19,7 @@ namespace Hotline.Settings.TimeLimits
         private readonly IRepository<SystemSetting> _systemSettingRepository;
         private readonly ISystemSettingCacheManager _systemSettingCacheManager;
         private readonly IMapper _mapper;
+        private List<CalcTimeSetting> sourceSettingList;
 
         public TimeLimitDomainService(ITimeLimitRepository timeLimitRepository, IDaySettingRepository daySettingRepository, 
             IRepository<SystemSetting> systemSettingRepository, ISystemSettingCacheManager systemSettingCacheManager,
@@ -52,6 +53,10 @@ namespace Hotline.Settings.TimeLimits
             timeSettingList.Add(setting9);
             CalcTimeSetting setting10 = new CalcTimeSetting() { BusCode = "40", BusName = "其他", TimeType = ETimeType.WorkDay, TimeValue = 3, Percentage = 80 };
             timeSettingList.Add(setting10);
+
+            sourceSettingList = new List<CalcTimeSetting>();
+            CalcTimeSetting sourceSetting1 = new CalcTimeSetting() { BusCode = "12315", BusName = "12315工单", TimeType = ETimeType.WorkDay, TimeValue = 45, Percentage = 80 };
+            sourceSettingList.Add(sourceSetting1);
         }