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

src/Hotline.Api/Controllers/WebPortalController.cs

@@ -15,6 +15,7 @@ using Hotline.Share.Dtos.DataSharing.PusherHotlineDto;
 using Hotline.Share.Dtos.Order;
 using Hotline.Share.Dtos.Schedulings;
 using Hotline.Share.Dtos.WebPortal;
+using Hotline.Share.Enums.KnowledgeBase;
 using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Push;
 using Hotline.WebPortal;
@@ -1364,7 +1365,7 @@ namespace Hotline.Api.Controllers
             }
 
             var (total, items) = await _knowledgeRepository.Queryable()
-                .Where(p => p.IsPublic == true)
+                .Where(p => p.IsPublic == true && p.Status == EKnowledgeStatus.OnShelf)
                 .WhereIF(!string.IsNullOrEmpty(dto.Title), p => p.Title.Contains(dto.Title))
                 .WhereIF(!string.IsNullOrEmpty(typeSpliceNameTags), p => p.KnowledgeType.Any(t => t.KnowledgeTypeSpliceName.EndsWith(typeSpliceNameTags)))
                 .WhereIF(!string.IsNullOrEmpty(typeSpliceName), x => x.KnowledgeType.Any(t => t.KnowledgeTypeSpliceName.EndsWith(typeSpliceName)))
@@ -1471,7 +1472,7 @@ namespace Hotline.Api.Controllers
 
             //数据查询
             var listFileType = await _orderRepository.Queryable()
-                .Where(p => p.FiledTime >= Convert.ToDateTime(dto.StartTime) && p.FiledTime <= Convert.ToDateTime(dto.EndTime) && p.Status >= EOrderStatus.Filed)
+                .Where(p => p.FiledTime >= Convert.ToDateTime(dto.StartTime) && p.FiledTime <= Convert.ToDateTime(dto.EndTime) && p.Status >= EOrderStatus.Visited)
                 .Select(it => new
                 {
                     it.AcceptType,

src/Hotline.Application/Mappers/WebPortalMapperConfigs.cs

@@ -40,7 +40,7 @@ namespace Hotline.Application.Mappers
             .Map(d => d.FlowFromName, x => x.SourceChannel)
             .Map(d => d.FlowPurTypeName, x => x.AcceptType)
             .Map(d => d.FlowConTypeName, x => x.HotspotName)
-            .Map(d => d.FlowAddDate, x => x.StartTime)
+            .Map(d => d.FlowAddDate, x => x.CreationTime)
             .Map(d => d.FlowEndDate, x => x.ActualHandleTime)
             .Map(d => d.FlowBMID, x => x.ActualHandleOrgCode)
             .Map(d => d.FlowBMName, x => x.ActualHandleOrgName)