Merge branch 'test' into lib/test

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -1935,7 +1935,7 @@ namespace Hotline.Api.Controllers
             var approves = await _knowledgeApproRepository.Queryable()
                 .Includes(d => d.Approver)
                 .Where(d => d.KnowledgeId == knowledgeId)
-                .OrderBy(d => d.CreationTime)
+                .OrderByDescending(d => d.CreationTime)
                 .ToListAsync(HttpContext.RequestAborted);
 
             return _mapper.Map<IReadOnlyList<KnowledgeApproveDto>>(approves);

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.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