Forráskód Böngészése

修改门户查询

tangjiang 5 hónapja
szülő
commit
37ee03e3c5

+ 2 - 3
src/Hotline.Api/Controllers/WebPortalController.cs

@@ -945,6 +945,7 @@ namespace Hotline.Api.Controllers
                      HotspotId = it.HotspotId.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("2")),
                  })
                  .MergeTable()
+                 .Where(it => it.HotspotId != "18")
                  .GroupBy(it => it.HotspotId)//对新表进行分组
                  .Select(it => new
                  {
@@ -961,8 +962,6 @@ namespace Hotline.Api.Controllers
                      num = it.num
                  }).ToListAsync();
 
-
-
             ////数据查询-查询总数前5的数据
             //var listHot = await _orderRepository.Queryable()
             //    .Where(p => p.StartTime >= startDate && p.StartTime <= endDate && p.Status > EOrderStatus.WaitForAccept)
@@ -1014,7 +1013,7 @@ namespace Hotline.Api.Controllers
               AllCount = SqlFunc.AggregateSum(SqlFunc.IIF(p.Status > EOrderStatus.WaitForAccept, 1, 0)) + 7079457,
               AllTrandCount = SqlFunc.AggregateSum(SqlFunc.IIF(p.Status >= EOrderStatus.Filed, 1, 0)) + 7079214,
               DayCount = SqlFunc.AggregateSum(SqlFunc.IIF(p.CreationTime >= startDate && p.CreationTime <= endDate && p.Status > EOrderStatus.WaitForAccept, 1, 0)),
-              DayTrandCount = SqlFunc.AggregateSum(SqlFunc.IIF(p.FiledTime >= startDate && p.FiledTime <= endDate && p.Status >= EOrderStatus.Filed, 1, 0)),
+              DayTrandCount = SqlFunc.AggregateSum(SqlFunc.IIF(p.CreationTime >= startDate && p.CreationTime <= endDate && p.FiledTime >= startDate && p.FiledTime <= endDate && p.Status >= EOrderStatus.Filed, 1, 0)),
           })
           .FirstAsync();
             return OpenResponse.Ok(WebPortalDeResponse<GetStatistDto>.Success(getStatistDto));

+ 2 - 0
src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -1024,6 +1024,8 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public bool IsSecret { get; set; }
 
+        public string IsSecretText => IsSecret ? "保密" : "";
+
         /// <summary>
         /// 工作单位(当“来电/信人身份”为“企业”时必填,其他情况非必填)
         /// </summary>