xinzneg ziduan

src/DataSharing.Host/Controllers/HotlineWebController.cs

@@ -698,7 +698,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                     operationLog.ReceiveServiceInterface = data.TaskType;
                     operationLog.Path = data.Path;
                     operationLog.RequestData = data.Request;
-                    resultId = await _initPushDataService.InitDsSendTaskSubmitCaseRecord(data.ProvinceNo,data.CallId, data.Request, data.RequestData, data.GenerationTime, HttpContext.RequestAborted);
+                    resultId = await _initPushDataService.InitDsSendTaskSubmitCaseRecord(data.ProvinceNo, data.CallId, data.Request, data.RequestData, data.GenerationTime, HttpContext.RequestAborted);
                 }
             }
 
@@ -780,6 +780,30 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
 
             //数据查询
             RefAsync<int> total = 0;
+
+            //var items = await _sendTaskSubmitCaseInfoRepository.Queryable()
+            //    .Where(p => p.GenerationTime >= dto.StartTime && p.GenerationTime <= dto.EndTime)
+            //   .Where(p => p.FirstTime >= dto.StartTime && p.FirstTime <= dto.EndTime && p.IsSuccess == ESendTaskState.PushSuccess)
+            //     .Select(p => new
+            //     {
+            //         index = SqlFunc.RowNumber($"{p.FirstTime} 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.FirstTime.Value)
+            //     })
+            //     .MergeTable()
+            //     .Where(d => d.index == 1)
+            //     .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, d => SqlFunc.DateDiff(DateType.Second, d.StartTime.Value, d.FirstTime.Value) <= 180)//及时上传
+            //     .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, d => SqlFunc.DateDiff(DateType.Second, d.StartTime.Value, d.FirstTime.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)
@@ -822,6 +846,29 @@ 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.FirstTime >= dto.StartTime && p.FirstTime <= dto.EndTime && p.IsSuccess == ESendTaskState.PushSuccess)
+            //     .Select(p => new
+            //     {
+            //         index = SqlFunc.RowNumber($"{p.FirstTime} asc ", $"{p.CallId}"),
+            //         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.FirstTime.Value),
+            //         p.RequestData
+            //     })
+            //     .MergeTable()
+            //     .Where(d => d.index == 1)
+            //     .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, d => SqlFunc.DateDiff(DateType.Second, d.StartTime.Value, d.FirstTime.Value) <= 180)//及时上传
+            //     .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, d => SqlFunc.DateDiff(DateType.Second, d.StartTime.Value, d.FirstTime.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)
@@ -870,7 +917,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
         /// <returns></returns>
         [HttpGet("getordermatchingcalllist")]
         [AllowAnonymous]
-        public async Task<PagedDto<DsOrderSend>> GetOrderMatchingCallList([FromQuery] QuerySendTaskDto dto)
+        public async Task<PagedDto<object>> GetOrderMatchingCallList([FromQuery] QuerySendTaskDto dto)
         {
             if (!dto.StartTime.HasValue)
                 dto.StartTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
@@ -878,6 +925,63 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                 dto.EndTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59"));
 
             RefAsync<int> total = 0;
+            //var queryableCall = _sendTaskSubmitCaseRecordRepository.Queryable()
+            //          .Where(p => p.GenerationTime >= dto.StartTime && p.GenerationTime <= dto.EndTime)
+            //       .Where(p => p.FirstTime >= dto.StartTime && p.FirstTime <= dto.EndTime && p.IsSuccess == ESendTaskState.PushSuccess)
+            //         .Select(p => new
+            //         {
+            //             index = SqlFunc.RowNumber($"{p.FirstTime} desc ", $"{p.CallId}"),
+            //             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.FirstTime.Value),
+            //             p.CallId,
+            //             p.RequestData
+            //         })
+            //         .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.FirstTime >= dto.StartTime && p.FirstTime <= dto.EndTime && p.IsSuccess == ESendTaskState.PushSuccess)
+            //   .Where(p => p.CaseSource == "RGDH")
+            //   .Select(p => new
+            //   {
+            //       index = SqlFunc.RowNumber($"{p.FirstTime} desc ", $"{p.ProvinceNo}"),
+            //       ProvinceNo = p.ProvinceNo,
+            //       FirstTime = p.FirstTime,
+            //       LastTime = p.LastTime,
+            //       SendTimes = p.SendTimes,
+            //       StartTime = p.GenerationTime,
+            //       CreationTime = p.CreationTime,
+            //       p.RequestData
+
+            //   })
+            //   .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,
+            //       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);
 
             var items = await _dsOrderSendRepository.Queryable()
                 .LeftJoin<DsTelCall>((p, o) => p.CallId == o.CallId)
@@ -888,7 +992,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                 .OrderByDescending((p, o) => p.CreationTime)
                .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
 
-            return new PagedDto<DsOrderSend>(total, _mapper.Map<IReadOnlyList<DsOrderSend>>(items));
+            return new PagedDto<object>(total, _mapper.Map<IReadOnlyList<DsOrderSend>>(items));
         }
 
         /// <summary>

src/DataSharing/Province/SendTask/SubmitCaseInfo/DsSendTaskSubmitCaseInfo.cs

@@ -27,5 +27,10 @@ namespace DataSharing.Province.SendTask.SubmitCaseInfo
         /// </summary>
         [SugarColumn(ColumnDescription = "期满时间")]
         public DateTime? ExpiredTime { get; set; }
+
+        /// <summary>
+        /// 诉求渠道
+        /// </summary>
+        public string? CaseSource { get; set; }
     }
 }

src/DataSharing/Province/SendTask/SubmitCaseInfo/DsWaitSendTaskSubmitCaseInfo.cs

@@ -21,5 +21,10 @@ namespace DataSharing.Province.SendTask.SubmitCaseInfo
         /// </summary>
         [SugarColumn(ColumnDescription = "期满时间")]
         public DateTime? ExpiredTime { get; set; }
+
+        /// <summary>
+        /// 诉求渠道
+        /// </summary>
+        public string? CaseSource { get; set; }
     }
 }

src/DataSharing/SendTask/InitPushDataService.cs

@@ -108,7 +108,8 @@ namespace DataSharing.SendTask
                 RequestData = requestData,
                 GenerationTime = generationTime,
                 PathType = EPathType.HuiJu,
-                ExpiredTime = requestData.TfdBackTimeBf
+                ExpiredTime = requestData.TfdBackTimeBf,
+                CaseSource=requestData.CaseSource
             };
             waitTask.Id = await _waitSendTaskSubmitCaseInfoRepository.AddAsync(waitTask, cancellationToken);