Преглед изворни кода

Merge branch 'dev' of http://110.188.24.182:10023/Fengwo/hotline into dev

田爽 пре 6 месеци
родитељ
комит
832a2e343d
1 измењених фајлова са 3 додато и 1 уклоњено
  1. 3 1
      src/Hotline.Api/Controllers/Bi/BiOrderController.cs

+ 3 - 1
src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -564,6 +564,7 @@ namespace Hotline.Api.Controllers.Bi
                 .WhereIF(dto.QueryDto.EndTime.HasValue, (x, o) => o.CreationTime <= dto.QueryDto.EndTime)
                 .WhereIF(!string.IsNullOrEmpty(dto.QueryDto.Keyword), (x, o) => x.HotSpotName.Contains(dto.QueryDto.Keyword!))
                 .WhereIF(IsCenter == false, (x, o) => o.ActualHandleOrgCode == _sessionContext.RequiredOrgId)
+                .Where((x, o) => x.ParentId == dto.QueryDto.Id)
                 .Where((x, o) => x.IsDeleted == false)
                 .GroupBy((x, o) => new { x.Id, x.HotSpotName })
                 .Select((x, o) => new HotspotDataLsitVo
@@ -600,6 +601,7 @@ namespace Hotline.Api.Controllers.Bi
                 .WhereIF(dto.QueryDto.EndTime.HasValue, (x, o) => o.CreationTime <= chainEndTime)
                 .WhereIF(!string.IsNullOrEmpty(dto.QueryDto.Keyword), (x, o) => x.HotSpotName.Contains(dto.QueryDto.Keyword!))
                 .WhereIF(IsCenter == false, (x, o) => o.ActualHandleOrgCode == _sessionContext.RequiredOrgId)
+                .Where((x, o) => x.ParentId == dto.QueryDto.Id)
                 .Where((x, o) => x.IsDeleted == false)
                 .GroupBy((x, o) => new { x.Id, x.HotSpotName })
                 .Select((x, o) => new
@@ -647,7 +649,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var stream = ExcelHelper.CreateStream(dtos);
 
-            return ExcelStreamResult(stream, "部门不满意统计明细");
+            return ExcelStreamResult(stream, "热点类型统计");
             //return new { List = res, Total = total };
         }