src/DataSharing.Host/Controllers/HotlineWebController.cs

@@ -1183,19 +1183,22 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
         /// <summary>
         /// 及时率查询
         /// </summary>
-        /// <param name="StartTime"></param>
-        /// <param name="EndTime"></param>
+        /// <param name="dto"></param>
         /// <returns></returns>
         [HttpGet("getcalculateuploadrate")]
         [AllowAnonymous]
-        public async Task<CalculateUploadRateDto> GetCalculateUploadRate(DateTime StartTime, DateTime EndTime)
+        public async Task<CalculateUploadRateDto> GetCalculateUploadRate([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 = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59"));
             CalculateUploadRateDto calculateUploadRateDto = new();
 
             //工单
             var orderRate = await _dsOrderSendRepository.Queryable()
                    .LeftJoin<DsTelCall>((p, o) => p.CallId == o.CallId)
-                    .Where((p, o) => p.CreationTime >= StartTime && p.CreationTime <= EndTime && p.FirstSendProvinceTime >= StartTime && p.FirstSendProvinceTime <= EndTime)
+                    .Where((p, o) => p.CreationTime >=dto. StartTime && p.CreationTime <= dto.EndTime && p.FirstSendProvinceTime >= dto.StartTime && p.FirstSendProvinceTime <= dto.EndTime)
                     .Where((p, o) => p.FirstSendProvinceTime.HasValue && p.StartTime.HasValue)
                     .Select((p, o) => new
                     {
@@ -1225,7 +1228,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
 
             //电话
             var callRate = await _dsTelCallRepository.Queryable()
-              .Where(p => p.OverTime >= StartTime && p.OverTime <= EndTime && p.FirstSendProvinceTime >= StartTime && p.FirstSendProvinceTime <= EndTime)
+              .Where(p => p.OverTime >= dto.StartTime && p.OverTime <= dto.EndTime && p.FirstSendProvinceTime >= dto.StartTime && p.FirstSendProvinceTime <= dto.EndTime)
               .Where(p => p.FirstSendProvinceTime.HasValue && p.OverTime.HasValue)
               .Select(p => new
               {
@@ -1248,7 +1251,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
 
             //回访
             var visitList = await _dsOrderVisitSendRepository.Queryable()
-                .Where(p => p.VisitTime >= StartTime && p.VisitTime <= EndTime && p.IsProvince == false && p.FirstSendProvinceTime >= StartTime && p.FirstSendProvinceTime <= EndTime)
+                .Where(p => p.VisitTime >= dto.StartTime && p.VisitTime <= dto.EndTime && p.IsProvince == false && p.FirstSendProvinceTime >= dto.StartTime && p.FirstSendProvinceTime <= dto.EndTime)
                 .Select(p => new
                 {
                     p.SubjectResultSatifyCode,
@@ -1268,12 +1271,12 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
 
             //查询知识总量
             calculateUploadRateDto.KnowledgeCount = await _knowledgeRawDataRepository.Queryable()
-                       .Where(p => p.CreationTime >= StartTime && p.CreationTime <= EndTime)
+                       .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
                        .CountAsync();
 
             //修改知识库量-以第一次上传成功的记录为准
             calculateUploadRateDto.UpdateKnowledgeCount = await _waitSendTaskProvinceOtherRepository.Queryable()
-                .Where(p => p.FirstTime >= StartTime && p.FirstTime <= EndTime && p.TaskType == "GetKnowledgeInfoUpdate")
+                .Where(p => p.FirstTime >= dto.StartTime && p.FirstTime <= dto.EndTime && p.TaskType == "GetKnowledgeInfoUpdate")
                 .Select(p => new
                 {
                     p.Id,