Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/TestController.cs

@@ -460,11 +460,22 @@ public class TestController : BaseController
     [HttpPost("t3")]
     public async Task TestExportExcel()
     {
-        var items = await _workflowTraceRepository.Queryable()
-            .Where(d => !SqlFunc.Subqueryable<WorkflowStepHandler>().Where(x => x.WorkflowStepId == d.StepId).Any())
+        // var items = await _workflowTraceRepository.Queryable()
+        //     .Where(d => !SqlFunc.Subqueryable<WorkflowStepHandler>().Where(x => x.WorkflowStepId == d.StepId).Any())
+        //     .ToListAsync(HttpContext.RequestAborted);
+
+        var handlerStepIds = await _workflowStepHandleRepository
+            .Queryable()
+            .Select(d=>d.WorkflowStepId)
             .ToListAsync(HttpContext.RequestAborted);
+        _logger.LogInformation($"handler stepids: {handlerStepIds.Count}");
 
+        var items = await _workflowTraceRepository
+            .Queryable()
+            .Where(d => !handlerStepIds.Distinct().Contains(d.StepId))
+            .ToListAsync(HttpContext.RequestAborted);
         _logger.LogInformation($"traces.count: {items.Count}");
+
         //var items = await _workflowTraceRepository.Queryable()
         //    .LeftJoin<WorkflowStepHandler>((t, h) => t.StepId == h.WorkflowStepId)
         //    .Where((t, h) => h == null)