src/DataSharing.Host/Controllers/HotlineWebController.cs

@@ -785,55 +785,56 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
             //数据查询
             RefAsync<int> total = 0;
 
-            //var items = await _sendTaskSubmitCaseInfoRepository.Queryable()
-            //    .Where(p => p.GenerationTime >= dto.StartTime && p.GenerationTime <= dto.EndTime)
-            //   .Where(p => p.LastTime >= dto.StartTime && p.LastTime <= dto.EndTime && p.IsSuccess == ESendTaskState.PushSuccess)
-            //     .Select(p => new
-            //     {
-            //         index = SqlFunc.RowNumber($"{p.LastTime} asc ", $"{p.ProvinceNo}"),
-            //         ProvinceNo = p.ProvinceNo,
-            //         FirstTime = p.FirstTime,
-            //         LastTime = p.LastTime,
-            //         SendTimes = p.SendTimes,
-            //         StartTime = p.GenerationTime,
-            //         CreationTime = p.CreationTime,
-            //         IntervalTime = SqlFunc.DateDiff(DateType.Second, p.GenerationTime.Value, p.LastTime.Value),
-            //         CaseSource=p.CaseSource
-            //     })
-            //     .MergeTable()
-            //     .Where(d => d.index == 1)
-            //     .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, d => SqlFunc.DateDiff(DateType.Second, d.StartTime.Value, d.LastTime.Value) <= 180)//及时上传
-            //     .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, d => SqlFunc.DateDiff(DateType.Second, d.StartTime.Value, d.LastTime.Value) > 180)//不及时上传
-            //     .OrderByDescending(d => d.CreationTime)
-            //     .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
-            //return new PagedDto<object>(total, items);
+            var items = await _sendTaskSubmitCaseInfoRepository.Queryable()
+                .Where(p => p.GenerationTime >= dto.StartTime && p.GenerationTime <= dto.EndTime)
+               .Where(p => p.LastTime >= dto.StartTime && p.LastTime <= dto.EndTime && p.IsSuccess == ESendTaskState.PushSuccess)
+                 .Select(p => new
+                 {
+                     index = SqlFunc.RowNumber($"{p.LastTime} asc ", $"{p.ProvinceNo}"),
+                     ProvinceNo = p.ProvinceNo,
+                     FirstTime = p.FirstTime,
+                     LastTime = p.LastTime,
+                     SendTimes = p.SendTimes,
+                     StartTime = p.GenerationTime,
+                     CreationTime = p.CreationTime,
+                     IntervalTime = SqlFunc.DateDiff(DateType.Second, p.GenerationTime.Value, p.LastTime.Value),
+                     CaseSource = p.CaseSource,
+                     p.RequestData
+                 })
+                 .MergeTable()
+                 .Where(d => d.index == 1)
+                 .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, d => SqlFunc.DateDiff(DateType.Second, d.StartTime.Value, d.LastTime.Value) <= 180)//及时上传
+                 .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, d => SqlFunc.DateDiff(DateType.Second, d.StartTime.Value, d.LastTime.Value) > 180)//不及时上传
+                 .OrderByDescending(d => d.CreationTime)
+                 .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
+            return new PagedDto<object>(total, items);
 
 
-            var items = await _dsOrderSendRepository.Queryable()
-                .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
-                .Where(p => p.FirstSendProvinceTime.HasValue && p.StartTime.HasValue)
-                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
-                .Select(p => new
-                {
-                    p.OrderId,
-                    p.OrderNo,
-                    p.ProvinceNo,
-                    p.CaseDate,
-                    p.StartTime,
-                    p.CallId,
-                    p.FirstSendProvinceTime,
-                    p.LastSendProvinceTime,
-                    p.CaseSource,
-                    p.CaseSourceCode,
-                    p.ExpiredTime,
-                    p.CreationTime
-                })
-                .MergeTable()
-                .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, p => SqlFunc.DateDiff(DateType.Second, p.StartTime.Value, p.FirstSendProvinceTime.Value) <= 180)//及时上传
-                .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, p => SqlFunc.DateDiff(DateType.Second, p.StartTime.Value, p.FirstSendProvinceTime.Value) > 180)//不及时上传
-                 .OrderByDescending(p => p.CreationTime)
-                .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
-            return new PagedDto<object>(total, items);
+            //var items = await _dsOrderSendRepository.Queryable()
+            //    .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+            //    .Where(p => p.FirstSendProvinceTime.HasValue && p.StartTime.HasValue)
+            //    .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
+            //    .Select(p => new
+            //    {
+            //        p.OrderId,
+            //        p.OrderNo,
+            //        p.ProvinceNo,
+            //        p.CaseDate,
+            //        p.StartTime,
+            //        p.CallId,
+            //        p.FirstSendProvinceTime,
+            //        p.LastSendProvinceTime,
+            //        p.CaseSource,
+            //        p.CaseSourceCode,
+            //        p.ExpiredTime,
+            //        p.CreationTime
+            //    })
+            //    .MergeTable()
+            //    .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, p => SqlFunc.DateDiff(DateType.Second, p.StartTime.Value, p.FirstSendProvinceTime.Value) <= 180)//及时上传
+            //    .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, p => SqlFunc.DateDiff(DateType.Second, p.StartTime.Value, p.FirstSendProvinceTime.Value) > 180)//不及时上传
+            //     .OrderByDescending(p => p.CreationTime)
+            //    .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
+            //return new PagedDto<object>(total, items);
         }
 
         /// <summary>
@@ -851,72 +852,72 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                 dto.StartTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59"));
 
             RefAsync<int> total = 0;
-            //var items = await _sendTaskSubmitCaseRecordRepository.Queryable()
-            //      .Where(p => p.GenerationTime >= dto.StartTime && p.GenerationTime <= dto.EndTime)
-            //   .Where(p => p.LastTime >= dto.StartTime && p.LastTime <= dto.EndTime && p.IsSuccess == ESendTaskState.PushSuccess)
-            //     .Select(p => new
-            //     {
-            //         index = SqlFunc.RowNumber($"{p.LastTime} asc ", $"{p.CallLogId}"),
-            //         ProvinceNo = p.ProvinceNo,
-            //         FirstTime = p.FirstTime,
-            //         LastTime = p.LastTime,
-            //         SendTimes = p.SendTimes,
-            //         StartTime = p.GenerationTime,
-            //         CreationTime = p.CreationTime,
-            //         IntervalTime = SqlFunc.DateDiff(DateType.Second, p.GenerationTime.Value, p.LastTime.Value),
-            //         CallId=p.CallId,
-            //         CallLogId=p.CallLogId,
-            //         CallDirection=p.CallDirection,
-            //         OnState=p.OnState,
-            //         p.RequestData
-            //     })
-            //     .MergeTable()
-            //     .Where(d => d.index == 1)
-            //     .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, d => SqlFunc.DateDiff(DateType.Second, d.StartTime.Value, d.LastTime.Value) <= 180)//及时上传
-            //     .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, d => SqlFunc.DateDiff(DateType.Second, d.StartTime.Value, d.LastTime.Value) > 180)//不及时上传
-            //     .OrderByDescending(d => d.CreationTime)
-            //     .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
-            //return new PagedDto<object>(total, items);
-
-            var items = await _dsTelCallRepository.Queryable()
-                .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
-                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
-                .Where(p => p.FirstSendProvinceTime != null)
-                .Where(p => p.OverTime != null)
-                .Select(p => new
-                {
-                    p.CallId,
-                    p.CPN,
-                    p.CDPN,
-                    p.CallDirection,
-                    p.TelNo,
-                    p.UserName,
-                    p.BeginIvrTime,
-                    p.EndIvrTime,
-                    p.BeginQueueTime,
-                    p.EndQueueTime,
-                    p.BeginRingTime,
-                    p.EndRingTimg,
-                    p.AnsweredTime,
-                    p.OverTime,
-                    p.Duration,
-                    p.RingTimes,
-                    p.QueueTims,
-                    p.OnState,
-                    p.RecordingFileUrl,
-                    p.ProvinceNo,
-                    p.FirstSendProvinceTime,
-                    p.LastSendProvinceTime,
-                    p.TaskId,
-                    p.CreationTime
-                })
-                .MergeTable()
-                .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, p => SqlFunc.DateDiff(DateType.Second, p.OverTime.Value, p.FirstSendProvinceTime.Value) <= 180)//及时
-                .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, p => SqlFunc.DateDiff(DateType.Second, p.OverTime.Value, p.FirstSendProvinceTime.Value) > 180)//不及时
-                .OrderByDescending(p => p.CreationTime)
-                .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
+            var items = await _sendTaskSubmitCaseRecordRepository.Queryable()
+                  .Where(p => p.GenerationTime >= dto.StartTime && p.GenerationTime <= dto.EndTime)
+               .Where(p => p.LastTime >= dto.StartTime && p.LastTime <= dto.EndTime && p.IsSuccess == ESendTaskState.PushSuccess)
+                 .Select(p => new
+                 {
+                     index = SqlFunc.RowNumber($"{p.LastTime} asc ", $"{p.CallLogId}"),
+                     ProvinceNo = p.ProvinceNo,
+                     FirstTime = p.FirstTime,
+                     LastTime = p.LastTime,
+                     SendTimes = p.SendTimes,
+                     StartTime = p.GenerationTime,
+                     CreationTime = p.CreationTime,
+                     IntervalTime = SqlFunc.DateDiff(DateType.Second, p.GenerationTime.Value, p.LastTime.Value),
+                     CallId = p.CallId,
+                     CallLogId = p.CallLogId,
+                     CallDirection = p.CallDirection,
+                     OnState = p.OnState,
+                     p.RequestData
+                 })
+                 .MergeTable()
+                 .Where(d => d.index == 1)
+                 .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, d => SqlFunc.DateDiff(DateType.Second, d.StartTime.Value, d.LastTime.Value) <= 180)//及时上传
+                 .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, d => SqlFunc.DateDiff(DateType.Second, d.StartTime.Value, d.LastTime.Value) > 180)//不及时上传
+                 .OrderByDescending(d => d.CreationTime)
+                 .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
             return new PagedDto<object>(total, items);
 
+            //var items = await _dsTelCallRepository.Queryable()
+            //    .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+            //    .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
+            //    .Where(p => p.FirstSendProvinceTime != null)
+            //    .Where(p => p.OverTime != null)
+            //    .Select(p => new
+            //    {
+            //        p.CallId,
+            //        p.CPN,
+            //        p.CDPN,
+            //        p.CallDirection,
+            //        p.TelNo,
+            //        p.UserName,
+            //        p.BeginIvrTime,
+            //        p.EndIvrTime,
+            //        p.BeginQueueTime,
+            //        p.EndQueueTime,
+            //        p.BeginRingTime,
+            //        p.EndRingTimg,
+            //        p.AnsweredTime,
+            //        p.OverTime,
+            //        p.Duration,
+            //        p.RingTimes,
+            //        p.QueueTims,
+            //        p.OnState,
+            //        p.RecordingFileUrl,
+            //        p.ProvinceNo,
+            //        p.FirstSendProvinceTime,
+            //        p.LastSendProvinceTime,
+            //        p.TaskId,
+            //        p.CreationTime
+            //    })
+            //    .MergeTable()
+            //    .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, p => SqlFunc.DateDiff(DateType.Second, p.OverTime.Value, p.FirstSendProvinceTime.Value) <= 180)//及时
+            //    .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, p => SqlFunc.DateDiff(DateType.Second, p.OverTime.Value, p.FirstSendProvinceTime.Value) > 180)//不及时
+            //    .OrderByDescending(p => p.CreationTime)
+            //    .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
+            //return new PagedDto<object>(total, items);
+
         }
 
         /// <summary>
@@ -935,78 +936,78 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
 
             RefAsync<int> total = 0;
 
-            //var queryableCall = _sendTaskSubmitCaseRecordRepository.Queryable()
-            //          .Where(p => p.GenerationTime >= dto.StartTime && p.GenerationTime <= dto.EndTime)
-            //       .Where(p => p.LastTime >= dto.StartTime && p.LastTime <= dto.EndTime && p.IsSuccess == ESendTaskState.PushSuccess)
-            //         .Select(p => new
-            //         {
-            //             index = SqlFunc.RowNumber($"{p.CreationTime} desc ", $"{p.CallLogId}"),
-            //             ProvinceNo = p.ProvinceNo,
-            //             FirstTime = p.FirstTime,
-            //             LastTime = p.LastTime,
-            //             SendTimes = p.SendTimes,
-            //             StartTime = p.GenerationTime,
-            //             CreationTime = p.CreationTime,
-            //             IntervalTime = SqlFunc.DateDiff(DateType.Second, p.GenerationTime.Value, p.LastTime.Value),
-            //             p.CallId,
-            //             p.RequestData,
-            //             p.CallLogId
-            //         })
-            //         .MergeTable()
-            //         .Where(d => d.index == 1)
-            //        .MergeTable();
-
-            //var items = await _sendTaskSubmitCaseInfoRepository.Queryable()
-            //  .Where(p => p.GenerationTime >= dto.StartTime && p.GenerationTime <= dto.EndTime)
-            //  .Where(p => p.LastTime >= dto.StartTime && p.LastTime <= dto.EndTime && p.IsSuccess == ESendTaskState.PushSuccess)
-            //   .Where(p => p.CaseSource == "RGDH")
-            //   .Select(p => new
-            //   {
-            //       index = SqlFunc.RowNumber($"{p.CreationTime} desc ", $"{p.ProvinceNo}"),
-            //       ProvinceNo = p.ProvinceNo,
-            //       FirstTime = p.FirstTime,
-            //       LastTime = p.LastTime,
-            //       SendTimes = p.SendTimes,
-            //       StartTime = p.GenerationTime,
-            //       CreationTime = p.CreationTime,
-            //       p.RequestData,
-            //       p.ExpiredTime,
-            //       p.CaseSource
-            //   })
-            //   .MergeTable()
-            //   .Where(d => d.index == 1)
-            //   .MergeTable()
-            //   .LeftJoin(queryableCall, (o, c) => o.ProvinceNo == c.ProvinceNo)
-            //   .Select((o, c) => new
-            //   {
-            //       ProvinceNo = o.ProvinceNo,
-            //       FirstTime = o.FirstTime,
-            //       LastTime = o.LastTime,
-            //       SendTimes = o.SendTimes,
-            //       StartTime = o.StartTime,
-            //       CreationTime = o.CreationTime,
-            //       CallId = c.CallId,
-            //       CallLogId = c.CallLogId,
-            //       o.CaseSource,
-            //       o.RequestData
-            //   })
-            //   .MergeTable()
-            //   .Where(o => o.CallId == null || o.CallId == "")
-            //   .OrderByDescending(o => o.CreationTime)
-            //   .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
+            var queryableCall = _sendTaskSubmitCaseRecordRepository.Queryable()
+                      .Where(p => p.GenerationTime >= dto.StartTime && p.GenerationTime <= dto.EndTime)
+                   .Where(p => p.LastTime >= dto.StartTime && p.LastTime <= dto.EndTime && p.IsSuccess == ESendTaskState.PushSuccess)
+                     .Select(p => new
+                     {
+                         index = SqlFunc.RowNumber($"{p.CreationTime} desc ", $"{p.CallLogId}"),
+                         ProvinceNo = p.ProvinceNo,
+                         FirstTime = p.FirstTime,
+                         LastTime = p.LastTime,
+                         SendTimes = p.SendTimes,
+                         StartTime = p.GenerationTime,
+                         CreationTime = p.CreationTime,
+                         IntervalTime = SqlFunc.DateDiff(DateType.Second, p.GenerationTime.Value, p.LastTime.Value),
+                         p.CallId,
+                         p.RequestData,
+                         p.CallLogId
+                     })
+                     .MergeTable()
+                     .Where(d => d.index == 1)
+                    .MergeTable();
+
+            var items = await _sendTaskSubmitCaseInfoRepository.Queryable()
+              .Where(p => p.GenerationTime >= dto.StartTime && p.GenerationTime <= dto.EndTime)
+              .Where(p => p.LastTime >= dto.StartTime && p.LastTime <= dto.EndTime && p.IsSuccess == ESendTaskState.PushSuccess)
+               .Where(p => p.CaseSource == "RGDH")
+               .Select(p => new
+               {
+                   index = SqlFunc.RowNumber($"{p.CreationTime} desc ", $"{p.ProvinceNo}"),
+                   ProvinceNo = p.ProvinceNo,
+                   FirstTime = p.FirstTime,
+                   LastTime = p.LastTime,
+                   SendTimes = p.SendTimes,
+                   StartTime = p.GenerationTime,
+                   CreationTime = p.CreationTime,
+                   p.RequestData,
+                   p.ExpiredTime,
+                   p.CaseSource
+               })
+               .MergeTable()
+               .Where(d => d.index == 1)
+               .MergeTable()
+               .LeftJoin(queryableCall, (o, c) => o.ProvinceNo == c.ProvinceNo)
+               .Select((o, c) => new
+               {
+                   ProvinceNo = o.ProvinceNo,
+                   FirstTime = o.FirstTime,
+                   LastTime = o.LastTime,
+                   SendTimes = o.SendTimes,
+                   StartTime = o.StartTime,
+                   CreationTime = o.CreationTime,
+                   CallId = c.CallId,
+                   CallLogId = c.CallLogId,
+                   o.CaseSource,
+                   o.RequestData
+               })
+               .MergeTable()
+               .Where(o => o.CallId == null || o.CallId == "")
+               .OrderByDescending(o => o.CreationTime)
+               .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
 
-            //return new PagedDto<object>(total, items);
+            return new PagedDto<object>(total, items);
 
-            var items = await _dsOrderSendRepository.Queryable()
-                .LeftJoin<DsTelCall>((p, o) => p.CallId == o.CallId)
-                .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 || o.CallId == "")
-                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
-                .OrderByDescending((p, o) => p.CreationTime)
-               .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
+            //var items = await _dsOrderSendRepository.Queryable()
+            //    .LeftJoin<DsTelCall>((p, o) => p.CallId == o.CallId)
+            //    .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 || o.CallId == "")
+            //    .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
+            //    .OrderByDescending((p, o) => p.CreationTime)
+            //   .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
 
-            return new PagedDto<object>(total, _mapper.Map<IReadOnlyList<DsOrderSend>>(items));
+            //return new PagedDto<object>(total, _mapper.Map<IReadOnlyList<DsOrderSend>>(items));
         }
 
         /// <summary>

src/DataSharing.Host/Controllers/Police110/PoliceDCJTController.cs

@@ -98,7 +98,7 @@ namespace DataSharing.Host.Controllers.Police110
         /// 工单受理
         /// </summary>
         /// <returns></returns>
-        [HttpPost("/service/api/dcjt/110To12345/chainAlarm")]
+        [HttpPost("service/api/dcjt/110To12345/chainAlarm")]
         [AllowAnonymous]
         public async Task<OpenResponse> ChainAlarm_Receive()
         {