Merge branch 'feature/snapshot' into dev

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

@@ -41,7 +41,7 @@ public class RedPackController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("special")]
-    public async Task<PagedDto<SnapshotOrderAuditItemsOutDto>> GetRedPackSpecialItems([FromQuery] SnapshotOrderAuditItemsInDto dto)
+    public async Task<PagedDto<SnapshotOrderAuditItemsOutDto>> GetRedPackSpecialAuditItems([FromQuery] SnapshotOrderAuditItemsInDto dto)
         => (await _redPackApplication.GetRedPackSpecialAuditItems(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>

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

@@ -45,7 +45,104 @@ public class SnapshotStatisticsOutDto
     /// <summary>
     /// 受理范围内派给网格员超过四小时回复件数
     /// </summary>
-    public int ShouLiFanWeiNeiPaiGeiWangGeYuanChaoGuoSiXiaoShiHuiFuJianShu { get; set; }
+    public int SLFWNPGWGYCGSXSHFJS { get; set; }
+
+    /// <summary>
+    /// 受理范围内派给网格员未回复件数
+    /// </summary>
+    public int SLFWNPGWGWHRJS { get; set; }
+
+    /// <summary>
+    /// 受理范围内按12345直派给各区县或部门件数
+    /// </summary>
+    public int SLFWNA12345ZPGGQXHBMJS { get; set; }
+
+    /// <summary>
+    /// 受理范围内按12345直派给各部门件数
+    /// </summary>
+    public int SLFWNA12345ZPGGBMJS { get; set; }
+
+    /// <summary>
+    /// 受理范围内按12345直派给各区县件数
+    /// </summary>
+    public int SLFWNA12345ZPGGQXJS { get; set; }
+
+    /// <summary>
+    /// 受理范围内已办信件
+    /// </summary>
+    public int SLFWNYBXJ { get; set; }
+
+    /// <summary>
+    /// 中心已办
+    /// </summary>
+    public int ZXYB { get; set; }
+
+    /// <summary>
+    /// 部门已办
+    /// </summary>
+    public int BMYB { get; set; }
+
+    /// <summary>
+    /// 受理范围满意度
+    /// </summary>
+    public double SLFWMYD { get; set; }
+
+    /// <summary>
+    /// 受理范围满意度
+    /// </summary>
+    public string SLFWMYDTxt { get; set; }
+
+    /// <summary>
+    /// 满意量
+    /// </summary>
+    public int MYL { get; set; }
+
+    /// <summary>
+    /// 不满意量
+    /// </summary>
+    public int BMYL { get; set; }
+
+    /// <summary>
+    /// 审核发放奖励个数
+    /// </summary>
+    public int SHFFJLGS { get; set; }
+
+    /// <summary>
+    /// 审批不同意红包个数
+    /// </summary>
+    public int SPBTYHBGS { get; set; }
+
+    /// <summary>
+    /// 审批同意红包个数
+    /// </summary>
+    public int SPTYHBGS { get; set; }
+
+    /// <summary>
+    /// 特殊红包审批统计
+    /// </summary>
+    public int TSHBSP { get; set; }
+
+    /// <summary>
+    /// 审批同意个数
+    /// </summary>
+    public int SPTYGS { get; set; }
+
+    /// <summary>
+    /// 已发金额
+    /// </summary>
+    public double YFJE { get; set; }
+
+    /// <summary>
+    /// 局审核发放网格员奖励个数
+    /// </summary>
+    public int JSHFFWGJLGS { get; set; }
+
+    /// <summary>
+    /// 审批同意（网格员）红包个数
+    /// </summary>
+    public float SPTYWGYHBGS { get; set; }
+
+
 }
 
 /// <summary>

test/Hotline.Tests/Mock/OrderServiceMock.cs

@@ -488,7 +488,7 @@ public class OrderServiceMock
     public OrderServiceMock 部门审核特殊红包(Action action, double? approvedAmount = 0)
     {
         action?.Invoke();
-        var baseData = _redPackController.GetRedPackSpecialItems(new SnapshotOrderAuditItemsInDto(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 0)).GetAwaiter().GetResult();
+        var baseData = _redPackController.GetRedPackSpecialAuditItems(new SnapshotOrderAuditItemsInDto(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 0)).GetAwaiter().GetResult();
         var item = baseData.Items.FirstOrDefault(m => m.No == CreateOrderOutDto.No);
         var basedata = _systemDicDataCacheManager.SnapshotRedPackSpecialType.First();
         if (item == null)