tangjiang před 10 měsíci
rodič
revize
dcfbc1adee

+ 11 - 0
src/DataSharing.Host/Controllers/HotlineWebController.cs

@@ -160,6 +160,7 @@ namespace DataSharing.Host.Controllers
             else
                 dto.EndTime = dto.EndTime.Value.AddDays(1).AddSeconds(-1);
 
+            #region 其他接口
             //其他接口
             var waitSendTaskProvinceOther = _waitSendTaskProvinceOtherRepository.Queryable()
                 .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
@@ -180,7 +181,9 @@ namespace DataSharing.Host.Controllers
                     CreationTime = p.CreationTime
                 })
                 .MergeTable();
+            #endregion
 
+            #region 服务工单受理
             //服务工单受理
             var waitSendTaskSubmitCaseInfo = _waitSendTaskSubmitCaseInfoRepository.Queryable()
                 .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
@@ -201,7 +204,9 @@ namespace DataSharing.Host.Controllers
                    CreationTime = p.CreationTime
                })
                 .MergeTable();
+            #endregion
 
+            #region 服务工单处理过程
             //服务工单处理过程
             var waitSendTaskSubmitCaseProcess = _waitSendTaskSubmitCaseProcessRepository.Queryable()
                 .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
@@ -222,7 +227,9 @@ namespace DataSharing.Host.Controllers
                      CreationTime = p.CreationTime
                  })
                 .MergeTable();
+            #endregion
 
+            #region 电话记录
             //电话记录
             var waitSendTaskSubmitCaseRecord = _waitSendTaskSubmitCaseRecordRepository.Queryable()
                 .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
@@ -243,7 +250,9 @@ namespace DataSharing.Host.Controllers
                      CreationTime = p.CreationTime
                  })
                 .MergeTable();
+            #endregion
 
+            #region 服务工单处理结果
             //服务工单处理结果
             var waitSendTaskSubmitCaseResult = _waitSendTaskSubmitCaseResultRepository.Queryable()
                 .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
@@ -264,7 +273,9 @@ namespace DataSharing.Host.Controllers
                      CreationTime = p.CreationTime
                  })
                 .MergeTable();
+            #endregion
 
+            //连表查询数据
             RefAsync<int> total = 0;
             var items = await _waitSendTaskRepository.UnionAll(waitSendTaskProvinceOther, waitSendTaskSubmitCaseInfo, waitSendTaskSubmitCaseProcess,
              waitSendTaskSubmitCaseRecord, waitSendTaskSubmitCaseResult)

+ 2 - 1
src/DataSharing.Repository/WaitSendTaskRepository.cs

@@ -42,7 +42,8 @@ namespace DataSharing.Repository
                       Path = p.Path,
                       Request = p.Request,
                       PathType = p.PathType,
-                      GenerationTime = p.GenerationTime
+                      GenerationTime = p.GenerationTime,
+                      CreationTime=p.CreationTime
                   })
                 .MergeTable();
         }