src/DataSharing.Host/Controllers/HotlineWebController.cs

@@ -158,6 +158,13 @@ namespace DataSharing.Host.Controllers
         [AllowAnonymous]
         public async Task<PagedDto<DsOrder>> GetOrderlist([FromQuery] QuerySendTaskDto dto)
         {
+            if (!dto.StartTime.HasValue)
+                dto.StartTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
+            if (!dto.EndTime.HasValue)
+                dto.EndTime = dto.StartTime.Value.AddDays(1).AddSeconds(-1);
+            else
+                dto.EndTime = dto.EndTime.Value.AddDays(1).AddSeconds(-1);
+
             //数据查询
             RefAsync<int> total = 0;
             var items = await _dsOrderRepository.Queryable()
@@ -232,6 +239,13 @@ namespace DataSharing.Host.Controllers
         [AllowAnonymous]
         public async Task<PagedDto<DsTelCall>> GetCalllist([FromQuery] QuerySendTaskDto dto)
         {
+            if (!dto.StartTime.HasValue)
+                dto.StartTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
+            if (!dto.EndTime.HasValue)
+                dto.EndTime = dto.StartTime.Value.AddDays(1).AddSeconds(-1);
+            else
+                dto.EndTime = dto.EndTime.Value.AddDays(1).AddSeconds(-1);
+
             RefAsync<int> total = 0;
             var items = await _dsTelCallRepository.Queryable()
                 .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
@@ -302,23 +316,29 @@ namespace DataSharing.Host.Controllers
         /// <summary>
         /// 查询没匹配到通话记录的电话来源工单
         /// </summary>
-        /// <param name="StartDate"></param>
-        /// <param name="EndDate"></param>
+        /// <param name="dto"></param>
         /// <returns></returns>
         [HttpGet("getordermatchingcall")]
         [AllowAnonymous]
-        public async Task<List<DsOrder>> GetOrderMatchingCall(DateTime StartDate, DateTime EndDate)
+        public async Task<PagedDto<DsOrder>> GetOrderMatchingCall([FromQuery] QuerySendTaskDto dto)
         {
-            EndDate = EndDate.AddDays(1).AddSeconds(-1);
+            if (!dto.StartTime.HasValue)
+                dto.StartTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
+            if (!dto.EndTime.HasValue)
+                dto.EndTime = dto.StartTime.Value.AddDays(1).AddSeconds(-1);
+            else
+                dto.EndTime = dto.EndTime.Value.AddDays(1).AddSeconds(-1);
+
+            RefAsync<int> total = 0;
 
             var items = await _dsOrderRepository.Queryable()
                 .LeftJoin<DsTelCall>((p, o) => p.CallId == o.CallId)
-                .Where((p, o) => p.FirstSendProvinceTime >= StartDate && p.FirstSendProvinceTime <= EndDate && p.CaseSourceCode == "RGDH")
+                .Where((p, o) => p.FirstSendProvinceTime >= dto.StartTime && p.FirstSendProvinceTime <= dto.EndTime && p.CaseSourceCode == "RGDH")
                 .Where((p, o) => p.FirstSendProvinceTime.HasValue)
                 .Where((p, o) => o.CallId == null)
-                .ToListAsync();
+               .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
 
-            return items;
+            return new PagedDto<DsOrder>(total, _mapper.Map<IReadOnlyList<DsOrder>>(items));
         }
 
         /// <summary>
@@ -331,6 +351,8 @@ namespace DataSharing.Host.Controllers
         [AllowAnonymous]
         public async Task<CalculateUploadRateDto> CalculateUploadRate(DateTime StartDate, DateTime EndDate)
         {
+            EndDate = EndDate.AddDays(1).AddSeconds(-1);
+
             CalculateUploadRateDto calculateUploadRateDto = new();
 
             //工单

src/DataSharing.Share/Dtos/WebPortal/DsSendTaskDto.cs

@@ -76,5 +76,8 @@ namespace DataSharing.Share.Dtos.WebPortal
         /// 附件
         /// </summary>
         public List<FileJson>? FileJson { get; set; }
+
+
+
     }
 }