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

src/Hotline.Api/Controllers/OrderController.cs

@@ -3737,11 +3737,15 @@ public class OrderController : BaseController
             order.PushType = string.Join(",", pushTypes);
         }
 
-        if (dto.OrderTags != null && dto.OrderTags.Any())
+        if (dto.Tags != null && dto.Tags.Any())
         {
-            var orderTags = _mapper.Map<List<SystemDicData>>(dto.OrderTags);
+            var orderTags = new List<SystemDicData>();
+            foreach (var item in dto.Tags)
+            {
+                orderTags.Add(new SystemDicData() { Id = item });
+			}
             order.OrderTags = orderTags;
-		}
+        }
 
         await _orderDomainService.AddAsync(order, true, HttpContext.RequestAborted);
 
@@ -3979,9 +3983,13 @@ public class OrderController : BaseController
             var pushTypes = dto.OrderPushTypes.Select(x => x.PushType);
             order.PushType = string.Join(",", pushTypes);
         }
-		if (dto.OrderTags != null && dto.OrderTags.Any())
+		if (dto.Tags != null && dto.Tags.Any())
 		{
-			var orderTags = _mapper.Map<List<SystemDicData>>(dto.OrderTags);
+			var orderTags = new List<SystemDicData>();
+			foreach (var item in dto.Tags)
+			{
+				orderTags.Add(new SystemDicData() { Id = item });
+			}
 			order.OrderTags = orderTags;
 		}
 

src/Hotline.Api/Controllers/WebPortalController.cs

@@ -594,6 +594,7 @@ namespace Hotline.Api.Controllers
                 Page = SqlFunc.RowNumber($"{it.CreationTime} desc "),// SqlFunc.MappingColumn(default(int), "  row_number()  over( order by 'NoticeCreateDate'  ) "),
                 NoticeID = it.Id,
                 NoticeTitle = it.Title,
+                NoticeTypeName = it.BulletinTypeName,
                 NoticeCreateDate = it.CreationTime
             });
 
@@ -611,6 +612,7 @@ namespace Hotline.Api.Controllers
                         Page = 0,
                         NoticeID = it.Id,
                         NoticeTitle = it.Title,
+                        NoticeTypeName = "知识库",
                         NoticeCreateDate = it.CreationTime
                     });
 
@@ -620,6 +622,7 @@ namespace Hotline.Api.Controllers
                         Page = SqlFunc.RowNumber($"{x.NoticeCreateDate} desc "),
                         NoticeID = x.NoticeID,
                         NoticeTitle = x.NoticeTitle,
+                        NoticeTypeName = x.NoticeTypeName,
                         NoticeCreateDate = x.NoticeCreateDate
                     })
                     .OrderByDescending(x => x.NoticeCreateDate)
@@ -647,6 +650,7 @@ namespace Hotline.Api.Controllers
                         {
                             NoticeID = pTemp.NoticeID,
                             NoticeTitle = pTemp.NoticeTitle,
+                            NoticeTypeName = pTemp.NoticeTypeName,
                             pntype = "p"
                         });
 
@@ -657,6 +661,7 @@ namespace Hotline.Api.Controllers
                         {
                             NoticeID = nTemp.NoticeID,
                             NoticeTitle = nTemp.NoticeTitle,
+                            NoticeTypeName = pTemp.NoticeTypeName,
                             pntype = "n"
                         });
                     return OpenResponse.Ok(WebPortalDeResponse<List<ArticlePreviousAndNextDataDto>>.Success(returnDto));

src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -89,19 +89,21 @@ namespace Hotline.Share.Dtos.Order
 
         public string? TagNames { get; set; }
 
-        ///// <summary>
-        ///// 工单标签（自贡）
-        ///// </summary>
-        //public string? OrderTag { get; set; }
+        /// <summary>
+        /// 工单标签（自贡）
+        /// </summary>
+        public string? OrderTag  => OrderTags != null && OrderTags.Any()? string.Join(",", OrderTags.Select(x => x.DicDataName)) : string.Empty;
 
-        //public string? OrderTagCode { get; set; }
+        public string? OrderTagCode { get; set; }
 
-        #region 流程信息
+        public List<SystemDicDataOutDto>? OrderTags { get; set; }
 
-        /// <summary>
-        /// 工单开始时间(受理/接办时间=流程开启时间)
-        /// </summary>
-        public DateTime? StartTime { get; set; }
+		#region 流程信息
+
+		/// <summary>
+		/// 工单开始时间(受理/接办时间=流程开启时间)
+		/// </summary>
+		public DateTime? StartTime { get; set; }
 
         /// <summary>
         /// 交办时间(中心交部门办理时间)
@@ -1151,13 +1153,13 @@ namespace Hotline.Share.Dtos.Order
 
         public string Title { get; set; }
 
-        /// <summary>
-        /// 工单标签（自贡）
-        /// </summary>
-        public string? OrderTag => OrderTags != null && OrderTags.Any() ? string.Join(",", OrderTags.Select(x => x.DicDataName)) : string.Empty;
+  //      /// <summary>
+  //      /// 工单标签（自贡）
+  //      /// </summary>
+  //      public string? OrderTag => OrderTags != null && OrderTags.Any() ? string.Join(",", OrderTags.Select(x => x.DicDataName)) : string.Empty;
 
 
-		public string? OrderTagCode { get; set; }
+		//public string? OrderTagCode { get; set; }
 
         #region 热点
 
@@ -1438,9 +1440,8 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 工单标签
         /// </summary>
-        public List<OrderRelationTagDto>?  Tags { get; set; }
+        public List<string>?  Tags { get; set; }
 
-        public List<SystemDicDataOutDto>? OrderTags { get; set; }
 	}
 
     public record CanLinkCallRecordOrderDto : PagedKeywordRequest

src/Hotline.Share/Dtos/WebPortal/ArticleDetailsDto.cs

@@ -126,6 +126,11 @@ namespace Hotline.Share.Dtos.WebPortal
         /// 公告标题
         /// </summary>
         public string NoticeTitle { get; set; }
+
+        /// <summary>
+        /// 分类
+        /// </summary>
+        public string NoticeTypeName { get; set; }
     }
 
     /// <summary>
@@ -207,6 +212,8 @@ namespace Hotline.Share.Dtos.WebPortal
         /// </summary>
         public string NoticeID { get; set; }
         public string NoticeTitle { get; set; }
+
+        public string NoticeTypeName { get; set; }
         public DateTime NoticeCreateDate { get; set; }
     }