src/DataSharing.Host/Controllers/HotlineWebController.cs

@@ -434,21 +434,21 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
         /// <summary>
         /// 及时率查询
         /// </summary>
-        /// <param name="StartDate"></param>
-        /// <param name="EndDate"></param>
+        /// <param name="StartTime"></param>
+        /// <param name="EndTime"></param>
         /// <returns></returns>
         [HttpGet("calculateuploadrate")]
         [AllowAnonymous]
-        public async Task<CalculateUploadRateDto> CalculateUploadRate(DateTime StartDate, DateTime EndDate)
+        public async Task<CalculateUploadRateDto> CalculateUploadRate(DateTime StartTime, DateTime EndTime)
         {
-            EndDate = EndDate.AddDays(1).AddSeconds(-1);
+            EndTime = EndTime.AddDays(1).AddSeconds(-1);
 
             CalculateUploadRateDto calculateUploadRateDto = new();
 
             //工单
             var orderRate = await _dsOrderRepository.Queryable()
                    .LeftJoin<DsTelCall>((p, o) => p.CallId == o.CallId)
-                    .Where((p, o) => p.CreationTime >= StartDate && p.CreationTime <= EndDate && p.FirstSendProvinceTime >= StartDate && p.FirstSendProvinceTime <= EndDate)
+                    .Where((p, o) => p.CreationTime >= StartTime && p.CreationTime <= EndTime && p.FirstSendProvinceTime >= StartTime && p.FirstSendProvinceTime <= EndTime)
                     .Where((p, o) => p.FirstSendProvinceTime.HasValue)
                     .Where((p, o) => p.StartTime.HasValue)
                     .Select((p, o) => new
@@ -479,7 +479,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
 
             //电话
             var callRate = await _dsTelCallRepository.Queryable()
-              .Where(p => p.OverTime >= StartDate && p.OverTime <= EndDate && p.FirstSendProvinceTime >= StartDate && p.FirstSendProvinceTime <= EndDate)
+              .Where(p => p.OverTime >= StartTime && p.OverTime <= EndTime && p.FirstSendProvinceTime >= StartTime && p.FirstSendProvinceTime <= EndTime)
               .Where(p => p.FirstSendProvinceTime.HasValue)
               .Where(p => p.OverTime.HasValue)
               .Select(p => new
@@ -503,7 +503,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
 
             //回访
             var visitList = await _dsOrderVisitSendRepository.Queryable()
-                .Where(p => p.VisitTime >= StartDate && p.VisitTime <= EndDate && p.IsProvince == false && p.FirstSendProvinceTime >= StartDate && p.FirstSendProvinceTime <= EndDate)
+                .Where(p => p.VisitTime >= StartTime && p.VisitTime <= EndTime && p.IsProvince == false && p.FirstSendProvinceTime >= StartTime && p.FirstSendProvinceTime <= EndTime)
                 .Select(p => new
                 {
                     p.SubjectResultSatifyCode,
@@ -523,12 +523,12 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
 
             //查询知识总量
             calculateUploadRateDto.KnowledgeCount = await _knowledgeRawDataRepository.Queryable()
-                       .Where(p => p.CreationTime >= StartDate && p.CreationTime <= EndDate)
+                       .Where(p => p.CreationTime >= StartTime && p.CreationTime <= EndTime)
                        .CountAsync();
 
             //修改知识库量-以第一次上传成功的记录为准
             calculateUploadRateDto.UpdateKnowledgeCount = await _taskRepository.Queryable()
-                .Where(p => p.FirstTime >= StartDate && p.FirstTime <= EndDate && p.TaskType == "GetKnowledgeInfoUpdate")
+                .Where(p => p.FirstTime >= StartTime && p.FirstTime <= EndTime && p.TaskType == "GetKnowledgeInfoUpdate")
                 .Select(p => new
                 {
                     p.Id,
@@ -1174,19 +1174,19 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
         /// <summary>
         /// 及时率查询
         /// </summary>
-        /// <param name="StartDate"></param>
-        /// <param name="EndDate"></param>
+        /// <param name="StartTime"></param>
+        /// <param name="EndTime"></param>
         /// <returns></returns>
         [HttpGet("getcalculateuploadrate")]
         [AllowAnonymous]
-        public async Task<CalculateUploadRateDto> GetCalculateUploadRate(DateTime StartDate, DateTime EndDate)
+        public async Task<CalculateUploadRateDto> GetCalculateUploadRate(DateTime StartTime, DateTime EndTime)
         {
             CalculateUploadRateDto calculateUploadRateDto = new();
 
             //工单
             var orderRate = await _dsOrderSendRepository.Queryable()
                    .LeftJoin<DsTelCall>((p, o) => p.CallId == o.CallId)
-                    .Where((p, o) => p.CreationTime >= StartDate && p.CreationTime <= EndDate && p.FirstSendProvinceTime >= StartDate && p.FirstSendProvinceTime <= EndDate)
+                    .Where((p, o) => p.CreationTime >= StartTime && p.CreationTime <= EndTime && p.FirstSendProvinceTime >= StartTime && p.FirstSendProvinceTime <= EndTime)
                     .Where((p, o) => p.FirstSendProvinceTime.HasValue && p.StartTime.HasValue)
                     .Select((p, o) => new
                     {
@@ -1216,7 +1216,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
 
             //电话
             var callRate = await _dsTelCallRepository.Queryable()
-              .Where(p => p.OverTime >= StartDate && p.OverTime <= EndDate && p.FirstSendProvinceTime >= StartDate && p.FirstSendProvinceTime <= EndDate)
+              .Where(p => p.OverTime >= StartTime && p.OverTime <= EndTime && p.FirstSendProvinceTime >= StartTime && p.FirstSendProvinceTime <= EndTime)
               .Where(p => p.FirstSendProvinceTime.HasValue && p.OverTime.HasValue)
               .Select(p => new
               {
@@ -1239,7 +1239,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
 
             //回访
             var visitList = await _dsOrderVisitSendRepository.Queryable()
-                .Where(p => p.VisitTime >= StartDate && p.VisitTime <= EndDate && p.IsProvince == false && p.FirstSendProvinceTime >= StartDate && p.FirstSendProvinceTime <= EndDate)
+                .Where(p => p.VisitTime >= StartTime && p.VisitTime <= EndTime && p.IsProvince == false && p.FirstSendProvinceTime >= StartTime && p.FirstSendProvinceTime <= EndTime)
                 .Select(p => new
                 {
                     p.SubjectResultSatifyCode,
@@ -1259,12 +1259,12 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
 
             //查询知识总量
             calculateUploadRateDto.KnowledgeCount = await _knowledgeRawDataRepository.Queryable()
-                       .Where(p => p.CreationTime >= StartDate && p.CreationTime <= EndDate)
+                       .Where(p => p.CreationTime >= StartTime && p.CreationTime <= EndTime)
                        .CountAsync();
 
             //修改知识库量-以第一次上传成功的记录为准
             calculateUploadRateDto.UpdateKnowledgeCount = await _waitSendTaskProvinceOtherRepository.Queryable()
-                .Where(p => p.FirstTime >= StartDate && p.FirstTime <= EndDate && p.TaskType == "GetKnowledgeInfoUpdate")
+                .Where(p => p.FirstTime >= StartTime && p.FirstTime <= EndTime && p.TaskType == "GetKnowledgeInfoUpdate")
                 .Select(p => new
                 {
                     p.Id,
@@ -1443,7 +1443,6 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
             if (user == null)
                 throw UserFriendlyException.SameMessage("用户信息获取失败");
 
-            UserInfo user = new UserInfo();
             bool isSuccess = true;
             string error = "";
             //调用工单创建接口