Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/TestController.cs

@@ -551,8 +551,9 @@ ICallApplication callApplication,
         //var r = _timeLimitDomainService.CalcExpiredTime(DateTime.Now, EFlowDirection.CenterToCenter, batchId);
         //var r = _timeLimitDomainService.CalcEndTime(DateTime.Parse("2024-09-12 14:45:47"), Share.Enums.Settings.ETimeType.WorkDay, 2, 80, 50);
         //_capPublisher.PublishDelay((DateTime.Now.AddMinutes(2) - DateTime.Now), EventNames.OrderRelateCall, "123");
-        var times =await _expireTime.CalcExpiredTime(DateTime.Parse("2024-12-31 13:25:13.137977"), DateTime.Parse("2024-12-31 13:25:13.137977"), EFlowDirection.CenterToOrg,new OrderTimeClacInfo() { AcceptTypeCode= "10" });
-        //var times = await _expireTime.CalcWorkTimeToDecimal(DateTime.Parse("2024-12-16 21:36:27"), DateTime.Parse("2024-12-17 12:47:05"), false);
+        //var times =await _expireTime.CalcExpiredTime(DateTime.Parse("2024-12-31 13:25:13.137977"), DateTime.Parse("2024-12-31 13:25:13.137977"), EFlowDirection.CenterToOrg,new OrderTimeClacInfo() { AcceptTypeCode= "10" });
+        //await _expireTime.CalcWorkTimeToDecimal(visit.VisitTime.Value, DateTime.Now, false);
+        var times = await _expireTime.CalcWorkTimeToDecimal(DateTime.Parse("2024-12-16 21:36:27"), DateTime.Parse("2024-12-17 12:47:05"), false);
         //await _capPublisher.PublishDelay(EventNames.OrderRelateCall, "123", cancellationToken: HttpContext.RequestAborted);
         return OpenResponse.Ok(times);
     }

src/Hotline.Application/CallCenter/DefaultCallApplication.cs

@@ -299,6 +299,8 @@ public abstract class DefaultCallApplication : ICallApplication
             .WhereIF(!string.IsNullOrEmpty(dto.StaffNo), d => d.StaffNo == dto.StaffNo)
             .WhereIF(!string.IsNullOrEmpty(dto.GroupId), d => d.GroupId == dto.GroupId)
             .WhereIF(dto.OperateState != null, d => d.OperateState == dto.OperateState)
+            .WhereIF(dto.OperateTimeStart.HasValue, x => x.OperateTime >= dto.OperateTimeStart)
+            .WhereIF(dto.OperateTimeEnd.HasValue, x => x.OperateTime <= dto.OperateTimeEnd)
             .OrderByDescending(d => d.Id)
             .ToFixedListAsync(dto, cancellationToken);
     }
@@ -597,7 +599,7 @@ public abstract class DefaultCallApplication : ICallApplication
             TrCallRecordDto = call.Adapt<TrCallDto>()
         }, cancellationToken: cancellationToken);
         var msg = $"原CallId: {orderCall.CallId}, 更新CallId: {call.Id}";
-        _systemLogRepository.Add("延迟更新工单通话", orderId, msg,status:1, ipUrl: orderCall.CallId);
+        _systemLogRepository.Add("延迟更新工单通话", orderId, msg, status: 1, ipUrl: orderCall.CallId);
         return msg + "(完成推省上)";
     }
 

src/Hotline.Application/Snapshot/SnapshotApplicationBase.cs

@@ -123,7 +123,6 @@ public abstract class SnapshotApplicationBase
     public async Task<HomePageOutDto> GetHomePageAsync()
     {
         var fileServiceUrl = _sysSetting.FileServerUrl;
-        var fileDownloadApi = fileServiceUrl + _sysSetting.FileDownloadApi;
         var items = await _industryRepository.Queryable()
             .Where(m => m.IsEnable)
             .OrderBy(m => m.DisplayOrder)
@@ -131,18 +130,18 @@ public abstract class SnapshotApplicationBase
         items.ForEach(m =>
         {
             if (m.BackgroundImgUrl.NotNullOrEmpty())
-                m.BackgroundImgUrl = fileDownloadApi + m.BackgroundImgUrl;
+                m.BackgroundImgUrl = fileServiceUrl + m.BackgroundImgUrl;
             if (m.BannerImgUrl.NotNullOrEmpty())
-                m.BannerImgUrl = fileDownloadApi + m.BannerImgUrl;
+                m.BannerImgUrl = fileServiceUrl + m.BannerImgUrl;
             if (m.CareCellImgUrl.NotNullOrEmpty())
-                m.CareCellImgUrl = fileDownloadApi + m.CareCellImgUrl;
+                m.CareCellImgUrl = fileServiceUrl + m.CareCellImgUrl;
             if (m.CellImgUrl.NotNullOrEmpty())
-                m.CellImgUrl = fileDownloadApi + m.CellImgUrl;
+                m.CellImgUrl = fileServiceUrl + m.CellImgUrl;
         });
 
         return new HomePageOutDto
         {
-            Banners = _sysSetting.AppBanner.Split('|').Select(m => fileDownloadApi + m).ToList(),
+            Banners = _sysSetting.AppBanner.Split('|').Select(m => fileServiceUrl + m).ToList(),
             Industrys = items
         };
     }
@@ -293,6 +292,9 @@ public abstract class SnapshotApplicationBase
     {
         var openId = _sessionContext.OpenId;
         var thirdAccount = await _thirdAccountRepository.GetByOpenIdAsync(openId);
+        if (thirdAccount.PhoneNumber.IsNullOrEmpty() && _sessionContext.Phone.NotNullOrEmpty())
+            thirdAccount.PhoneNumber = _sessionContext.Phone;
+
         var dayTime = DateTime.Now;
         var readPack = await _redPackRecordRepository.Queryable()
             .Where(m => m.WXOpenId == openId && m.PickupStatus == ERedPackPickupStatus.Received)

src/Hotline.Share/Dtos/CallCenter/QueryTelOperationsFixedDto.cs

@@ -28,5 +28,15 @@ namespace Hotline.Share.Dtos.CallCenter
         /// 操作类型
         /// </summary>
         public int? OperateState { get; set; }
+
+        /// <summary>
+        /// 动作开始时间Star
+        /// </summary>
+        public DateTime? OperateTimeStart { get; set; }
+
+        /// <summary>
+        /// 动作开始时间End
+        /// </summary>
+        public DateTime? OperateTimeEnd { get; set; }
     }
 }

src/Hotline/Settings/TimeLimitDomain/ExpireTimeHandler.cs

@@ -134,7 +134,7 @@ public class ExpireTimeHandler : IExpireTimeHandler, IScopeDependency
                         //最后一天
                         if (beginTime.Date == endTime.Date)
                         {
-                            if (endTime > WorkEndTime)
+                            if (endTime > DateTime.Parse(endTime.ToShortDateString() + " " + workTime[1] + ":00"))
                             {
                                 if (i != 1)
                                 {