随手拍工单增加字段

src/Hotline.Application/Snapshot/OrderSnapshotApplication.cs

@@ -281,12 +281,16 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
             snapshot.IsTruthDepartment = true;
         if (labels.Any(m => m.Key == "bss"))
             snapshot.IsTruthDepartment = false;
+        snapshot.LabelTime = DateTime.Now;
+        snapshot.LabelUserName = _sessionContext.UserName;
+        snapshot.LabelUserId = _sessionContext.UserId;
         await _orderSnapshotRepository.UpdateAsync(snapshot);
 
-        var entity = new SnapshotLabelLog { 
-        OrderId = snapshot.Id,
-        LabelName = snapshot.LabelName,
-        Labels = labels
+        var entity = new SnapshotLabelLog
+        {
+            OrderId = snapshot.Id,
+            LabelName = snapshot.LabelName,
+            Labels = labels
         };
         await _snapshotLabelLogRepository.AddAsync(entity);
     }
@@ -353,9 +357,9 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
             .LeftJoin<OrderSnapshot>((log, order, snapshot) => log.OrderId == snapshot.Id)
             .WhereIF(dto.No.NotNullOrEmpty(), (log, order) => order.No.Contains(dto.No))
             .WhereIF(dto.Title.NotNullOrEmpty(), (log, order) => order.Title.Contains(dto.Title))
-            .WhereIF(dto.Contact.NotNullOrEmpty(), (log, order)=> order.Contact.Contains(dto.Contact))
-            .WhereIF(dto.FromName.NotNullOrEmpty(), (log, order)=> order.FromName.Contains(dto.FromName))
-            .WhereIF(dto.Label.NotNullOrEmpty(), (log, order)=> log.LabelName.Contains(dto.Label))
+            .WhereIF(dto.Contact.NotNullOrEmpty(), (log, order) => order.Contact.Contains(dto.Contact))
+            .WhereIF(dto.FromName.NotNullOrEmpty(), (log, order) => order.FromName.Contains(dto.FromName))
+            .WhereIF(dto.Label.NotNullOrEmpty(), (log, order) => log.LabelName.Contains(dto.Label))
             .WhereIF(dto.SignName.NotNullOrEmpty(), (log, order) => log.CreatorName.Contains(dto.SignName))
             .WhereIF(dto.BeginSignTime.HasValue && dto.EndSignTime.HasValue, (log, order) => log.CreationTime >= dto.BeginSignTime && log.CreationTime <= dto.EndSignTime)
             .Select((log, order, snapshot) => new SignOrderSnapshotLogItemsOutDto
@@ -425,7 +429,7 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
             .WhereIF(dto.No.NotNullOrEmpty(), (snapshot, order) => order.No.Contains(dto.No))
             .WhereIF(dto.Title.NotNullOrEmpty(), (snapshot, order) => order.Title.Contains(dto.Title))
             .WhereIF(dto.ActualHandleOrgName.NotNullOrEmpty(), (snapshot, order) => order.ActualHandleOrgName.Contains(dto.ActualHandleOrgName))
-            .Select((snapshot, order) => new OrderSnapshotItemsOutDto 
+            .Select((snapshot, order) => new OrderSnapshotItemsOutDto
             {
                 CreationTime = order.CreationTime
             }
@@ -451,7 +455,7 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
             .WhereIF(dto.BeginSignTime.HasValue && dto.EndSignTime.HasValue, (snapshot, order) => snapshot.SignTime >= dto.BeginSignTime && snapshot.SignTime <= dto.EndSignTime)
             .OrderByDescending((snapshot, order) => snapshot.CreationTime)
             .Select((snapshot, order) => new SignedOrderSnapshotItemsOutDto
-            { 
+            {
                 LabelName = snapshot.LabelName,
                 OrderId = order.Id,
                 SignTime = snapshot.SignTime,

src/Hotline/Snapshot/OrderSnapshot.cs

@@ -155,6 +155,24 @@ public class OrderSnapshot : CreationSoftDeleteEntity
     [SugarColumn(ColumnDescription = "工单标签")]
     public string? LabelName { get; set; }
 
+    /// <summary>
+    /// 标签用户
+    /// </summary>
+    [SugarColumn(ColumnDescription = "标签用户")]
+    public string? LabelUserName { get; set; }
+
+    /// <summary>
+    /// 标签用户Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "标签用户Id")]
+    public string? LabelUserId { get; set; }
+
+    /// <summary>
+    /// 标签时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "标签时间")]
+    public DateTime? LabelTime { get; set; }
+
     /// <summary>
     /// 工单办理:
     /// 是否申请追加奖励
@@ -303,4 +321,5 @@ public class OrderSnapshot : CreationSoftDeleteEntity
     /// </summary>
     [SugarColumn(ColumnDescription = "购气单位/个人名称")]
     public string? CompanyName { get; set; }
+
 }