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

src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -737,7 +737,7 @@ namespace Hotline.Api.Controllers.Bi
                     AcceptType = x.AcceptType,
                     OneHotspot = SqlFunc.Substring(x.HotspotSpliceName, 0, SqlFunc.CharIndex("-", x.HotspotSpliceName + "-")),
                     Id = x.Id
-                }).MergeTable()
+                }).MergeTable().Where(x => x.OneHotspot != "非受理范围")
                 .GroupBy(x => new { x.OneHotspot })
                 .Select(x => new AcceptTypeTop10Vo
                 {

src/Hotline.Api/Controllers/OrderController.cs

@@ -382,6 +382,38 @@ public class OrderController : BaseController
 
                     visitedDetail.Add(seatDetail);
                     await _orderVisitedDetailRepository.AddRangeAsync(visitedDetail, HttpContext.RequestAborted);
+
+                    if (orderVisit.VisitState == EVisitState.Visited)
+                    {
+                        //推省上
+                        await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderVisited,
+                            new PublishVisitDto()
+                            {
+                                Order = _mapper.Map<OrderDto>(order),
+                                No = orderVisit.No,
+                                VisitType = orderVisit.VisitType,
+                                VisitName = orderVisit.CreatorName,
+                                VisitTime = orderVisit.VisitTime,
+                                VisitRemark = orderVisit.NowEvaluate?.Value,
+                                AreaCode = order.AreaCode!,
+                                SubjectResultSatifyCode = orderVisit.NowEvaluate?.Key,
+                                FirstSatisfactionCode = orderVisit.NowEvaluate?.Key,
+                                ClientGuid = ""
+                            }, cancellationToken: HttpContext.RequestAborted);
+                    }
+
+                    //推门户
+                    await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderVisitedWeb, new PublishVisitAllDto()
+                    {
+                        Id = orderVisit.Id,
+                        Order = _mapper.Map<OrderDto>(order),
+                        OrderVisitDetails = _mapper.Map<List<VisitDetailDto>>(orderVisit.OrderVisitDetails),
+                        VisitName = _sessionContext.UserName,
+                        VisitTime = orderVisit.VisitTime,
+                        VisitType = orderVisit.VisitType,
+                        VisitState = orderVisit.VisitState,
+                        PublishTime = orderVisit.PublishTime,
+                    }, cancellationToken: HttpContext.RequestAborted);
                 }
                 catch
                 {
@@ -489,6 +521,27 @@ public class OrderController : BaseController
 
         visitedDetail.Add(seatDetail);
         await _orderVisitedDetailRepository.AddRangeAsync(visitedDetail, HttpContext.RequestAborted);
+
+
+        if (orderVisit.VisitState == EVisitState.Visited)
+        {
+            //推省上
+            await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderVisited,
+                new PublishVisitDto()
+                {
+                    Order = _mapper.Map<OrderDto>(order),
+                    No = orderVisit.No,
+                    VisitType = orderVisit.VisitType,
+                    VisitName = orderVisit.CreatorName,
+                    VisitTime = orderVisit.VisitTime,
+                    VisitRemark = orderVisit.NowEvaluate?.Value,
+                    AreaCode = order.AreaCode!,
+                    SubjectResultSatifyCode = orderVisit.NowEvaluate?.Key,
+                    FirstSatisfactionCode = orderVisit.NowEvaluate?.Key,
+                    ClientGuid = ""
+                }, cancellationToken: HttpContext.RequestAborted);
+        }
+
         //推送回访信息
         //推门户
         await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderVisitedWeb, new PublishVisitAllDto()

src/Hotline.Api/Controllers/PushMessageController.cs

@@ -127,8 +127,8 @@ namespace Hotline.Api.Controllers
                          d.CreatorOrgName.Contains(pagedDto.Keyword!))
                 .WhereIF(pagedDto.StartTime.HasValue, d => d.SendTime >= pagedDto.StartTime)
                 .WhereIF(pagedDto.EndTime.HasValue, d => d.SendTime <= pagedDto.EndTime)
-                .WhereIF(!string.IsNullOrEmpty(pagedDto.UserName), d => d.Name == pagedDto.UserName)
-                 .WhereIF(!string.IsNullOrEmpty(pagedDto.TelNumber), d => d.TelNumber == pagedDto.TelNumber)
+                .WhereIF(!string.IsNullOrEmpty(pagedDto.UserName), d => d.Name.Contains(pagedDto.UserName))
+                 .WhereIF(!string.IsNullOrEmpty(pagedDto.TelNumber), d => d.TelNumber.Contains(pagedDto.TelNumber))
                 .OrderByDescending(it => it.CreationTime)
                 .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize, HttpContext.RequestAborted);
 

src/Hotline/Caching/Services/SysDicDataCacheManager.cs

@@ -21,7 +21,7 @@ namespace Hotline.Caching.Services
         {
             var sysDicDataList = _cacheSysDicData.GetOrSet(code, k =>
             {
-                return _sysDicDataRepository.Queryable().Where(x => x.DicTypeCode == code).OrderBy(x=>x.Sort).ToTreeAsync(x => x.Children, it => it.ParentId, "").GetAwaiter().GetResult();
+                return _sysDicDataRepository.Queryable().Where(x => x.DicTypeCode == code && x.IsShow == true).OrderBy(x=>x.Sort).ToTreeAsync(x => x.Children, it => it.ParentId, "").GetAwaiter().GetResult();
             });
             return sysDicDataList;
         }

src/Hotline/Settings/SystemDicData.cs

@@ -5,8 +5,8 @@ using XF.Domain.Repository;
 namespace Hotline.Settings
 {
     [Description("字典表")]
-    public class SystemDicData: CreationEntity
-    {
+    public class SystemDicData : FullStateEntity
+	{
         /// <summary>
         /// 字典类型Id
         /// </summary>
@@ -32,10 +32,17 @@ namespace Hotline.Settings
         /// </summary>
         [SugarColumn(DefaultValue = "0")]
         public int Sort { get; set; }
+
         /// <summary>
-        /// 上级ID
+        /// 是否显示
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(DefaultValue = "t")]
+		public bool IsShow { get; set; }
+
+		/// <summary>
+		/// 上级ID
+		/// </summary>
+		[SugarColumn(IsNullable = true)]
         public string? ParentId { get; set; }
 
         [SugarColumn(IsIgnore = true)]