返回标记详情

src/Hotline.Api/Controllers/OrderController.cs

@@ -3609,6 +3609,9 @@ public class OrderController : BaseController
                 IndustryName = dto.IndustryName
             };
             await _orderSnapshotRepository.AddAsync(snapshot, HttpContext.RequestAborted);
+            order.Latitude = 29.33924;
+            order.Longitude = 104.779307;
+            await _orderRepository.UpdateAsync(order, HttpContext.RequestAborted);
         }
 
         //订阅此事件的内部处理工单数据只能更新各自业务的字段，不能全部更新

src/Hotline.Api/Controllers/Snapshot/SnapshotOrderController.cs

@@ -16,6 +16,7 @@ using Hotline.Share.Enums.FlowEngine;
 using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Snapshot;
 using Hotline.Share.Tools;
+using Hotline.Snapshot;
 using Hotline.Snapshot.Interfaces;
 using Mapster;
 using Microsoft.AspNetCore.Mvc;
@@ -137,10 +138,11 @@ public class SnapshotOrderController : BaseController
     public async Task<SignOrderSnapshotDetailOutDto> GetSignOrderSnapshotDetailAsync(string id)
     { 
         var order = await _orderRepository.Queryable()
-            .Where(m => m.Id == id)
-            .Select(m => new SignOrderSnapshotDetailOutDto { Id = m.Id, Title = m.Title})
+            .LeftJoin<OrderSnapshot>((order, snapshot) => order.Id == snapshot.Id)
+            .Where((order, snapshot) => order.Id == id)
+            .Select((order, snapshot) => new SignOrderSnapshotDetailOutDto { Id = order.Id, Title = order.Title, Lables =snapshot.Labels })
             .FirstAsync();
-        order.Lables = _systemDicDataCacheManager.SnapshotOrderLabel;
+        order.LabelsBaseData = _systemDicDataCacheManager.SnapshotOrderLabel;
         return order;
     }
 

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

@@ -1963,12 +1963,17 @@ public class SignOrderSnapshotDetailOutDto
     public string Id { get; set; }
 
     /// <summary>
-    /// 标签
+    /// 已选中的标签
     /// </summary>
-    public IReadOnlyCollection<SystemDicDataOutDto> Lables { get; set; }
+    public IList<Kv> Lables { get; set; }
 
     /// <summary>
     /// 标题
     /// </summary>
     public string Title { get; set; }
+
+    /// <summary>
+    /// 基础数据
+    /// </summary>
+    public IReadOnlyCollection<SystemDicDataOutDto> LabelsBaseData { get; set; }
 }