Parcourir la source

Merge branch 'feature/snapshot' into dev

qinchaoyue il y a 2 mois
Parent
commit
87321928be

+ 14 - 1
src/Hotline.Api/Controllers/Snapshot/BiSnapshotController.cs

@@ -14,6 +14,7 @@ using Hotline.Caching.Interfaces;
 using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Snapshot;
 using XF.Utility.EnumExtensions;
+using Amazon.Runtime.Internal.Util;
 
 namespace Hotline.Api.Controllers.Snapshot;
 
@@ -160,7 +161,7 @@ public class BiSnapshotController : BaseController
     {
         return new Dictionary<string, object>
         {
-            { "orderStatus", EnumExts.GetDescriptions<EOrderStatus>()},
+            { "orderStatus", EnumExts.GetDescriptions<EGuiderSystemReplyType>()},
         };
     }
 
@@ -172,4 +173,16 @@ public class BiSnapshotController : BaseController
     [HttpGet("guider-work-log")]
     public async Task<PagedDto<GuiderWorkLogsOutDto>> GetGuiderWorkLogsAsync([FromQuery] GuiderWorkLogsInDto dto)
         => (await _biSnapshotApplication.GetGuiderWorkLogs(dto).ToPagedListAsync(dto)).ToPaged();
+
+    /// <summary>
+    /// 重复件-随手拍
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
+    [HttpGet("duplicate")]
+    public async Task<PagedDto<DuplicateItemsOutDto>> GetDuplicateItemsAsync([FromQuery] GuiderWorkLogsInDto dto)
+    {
+        throw new NotImplementedException(); 
+    }
+    //=> (await _biSnapshotApplication.GetGuiderWorkLogs(dto).ToPagedListAsync(dto)).ToPaged();
 }

+ 53 - 0
src/Hotline.Share/Dtos/Snapshot/StatisticsDto.cs

@@ -1689,6 +1689,58 @@ public class GuiderWorkLogsOutDto
 
 public record GuiderWorkLogsInDto : PagedRequest
 {
+    /// <summary>
+    /// Id
+    /// </summary>
+    public string Id { get; set; }
+
+    /// <summary>
+    /// No
+    /// </summary>
+    public string? No { get; set; }
+
+    /// <summary>
+    /// 标题
+    /// </summary>
+    public string? Title { get; set; }
+
+    /// <summary>
+    /// 网格员姓名
+    /// </summary>
+    public string? MemberName { get; set; }
+
+    /// <summary>
+    /// 网格员电话
+    /// </summary>
+    public string? MemberMobile { get; set; }
+
+    /// <summary>
+    /// 编号
+    /// </summary>
+    public string? NetworkENumber { get; set; }
+
+    /// <summary>
+    /// 状态
+    /// </summary>
+    public EOrderStatus? Status { get; set; }
+
+    /// <summary>
+    /// 受理时间开始
+    /// </summary>
+    public DateTime? BeginCreationTime { get; set; }
+
+    /// <summary>
+    /// 受理时间结束
+    /// </summary>
+    public DateTime? EndCreationTime { get; set; }
+}
+
+public class DuplicateItemsOutDto 
+{
+    /// <summary>
+    /// Id
+    /// </summary>
+    public string Id { get; set; }
 
     /// <summary>
     /// No
@@ -1729,4 +1781,5 @@ public record GuiderWorkLogsInDto : PagedRequest
     /// 受理时间结束
     /// </summary>
     public DateTime? EndCreationTime { get; set; }
+
 }