合并

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

@@ -112,13 +112,13 @@ public class SnapshotOrderController : BaseController
         => (await _orderSnapshotApplication.GetGuiderReplyItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>
-    /// 获取工单标签集合
+    /// 获取工单标注集合
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("label")]
-    public async Task<PagedDto<LabelOrderSnapshotItemsOutDto>> GetLabelOrderSnapshotItemsAsync([FromQuery] LabelOrderSnapshotItemsInDto dto)
-        => (await _orderSnapshotApplication.GetLabelOrderSnapshotItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
+    public async Task<PagedDto<SignOrderSnapshotItemsOutDto>> GetSignOrderSnapshotItemsAsync([FromQuery] SignOrderSnapshotItemsInDto dto)
+        => (await _orderSnapshotApplication.GetSignOrderSnapshotItemsAsync(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>
     /// 获取工单已经标签集合

src/Hotline.Application/Snapshot/IOrderSnapshotApplication.cs

@@ -61,7 +61,7 @@ public interface IOrderSnapshotApplication
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    ISugarQueryable<LabelOrderSnapshotItemsOutDto> GetLabelOrderSnapshotItemsAsync(LabelOrderSnapshotItemsInDto dto);
+    ISugarQueryable<SignOrderSnapshotItemsOutDto> GetSignOrderSnapshotItemsAsync(SignOrderSnapshotItemsInDto dto);
 
     /// <summary>
     /// 批量设置随手拍公开申请不通过

src/Hotline.Application/Snapshot/OrderSnapshotApplication.cs

@@ -200,7 +200,7 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    public ISugarQueryable<LabelOrderSnapshotItemsOutDto> GetLabelOrderSnapshotItemsAsync(LabelOrderSnapshotItemsInDto dto)
+    public ISugarQueryable<SignOrderSnapshotItemsOutDto> GetSignOrderSnapshotItemsAsync(SignOrderSnapshotItemsInDto dto)
     {
         var query = _orderSnapshotRepository.Queryable()
             .LeftJoin<Order>((snapshot, order) => snapshot.Id == order.Id)
@@ -211,7 +211,7 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
             .WhereIF(dto.No.NotNullOrEmpty(), (snapshot, order, step) => order.No.Contains(dto.No))
             .WhereIF(dto.Title.NotNullOrEmpty(), (snapshot, order, step) => order.Title.Contains(dto.Title))
             .OrderByDescending((snapshot, order, step) => snapshot.CreationTime)
-            .Select((snapshot, order) => new LabelOrderSnapshotItemsOutDto
+            .Select((snapshot, order) => new SignOrderSnapshotItemsOutDto
             {
                 OrderId = snapshot.Id,
                 No = order.No,
@@ -224,8 +224,8 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
                 NetworkENumber = snapshot.NetworkENumber,
                 NetworkRemark = snapshot.NetworkRemark,
                 ReplyDate = snapshot.ReplyDate,
-                LabelTime = snapshot.LabelTime,
-                LabelUserName = snapshot.LabelUserName
+                LabelTime = snapshot.SignTime,
+                LabelUserName = snapshot.SignUserName
             });
         return query;
     }

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

@@ -1103,7 +1103,7 @@ public class LabeledOrderSnapshotItemsOutDto
     public DateTime? LabelTime { get; set; }
 }
 
-public record LabelOrderSnapshotItemsInDto : PagedRequest
+public record SignOrderSnapshotItemsInDto : PagedRequest
 {
     /// <summary>
     /// No
@@ -1124,7 +1124,7 @@ public record LabelOrderSnapshotItemsInDto : PagedRequest
     public int Status { get; set; }
 }
 
-public class LabelOrderSnapshotItemsOutDto
+public class SignOrderSnapshotItemsOutDto
 {
     /// <summary>
     /// Id