Merge branch 'feature/snapshot' into dev

src/Hotline.Application/Snapshot/RedPackApplication.cs

@@ -258,7 +258,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
     {
         var beginTime = new DateTime(2024, 8, 1);
         var endTime = new DateTime(2024, 9, 30, 23, 59, 59);
-        var query = _redPackAuditRepository.Queryable()
+        var query = _redPackAuditRepository.Queryable(includeDeleted: true)
             .LeftJoin<OrderSnapshot>((redPackAudit, snapshot) => redPackAudit.OrderId == snapshot.Id)
             .LeftJoin<Order>((redPackAudit, snapshot, order) => redPackAudit.OrderId == order.Id)
             .LeftJoin<SpecialRedPackAudit>((redPackAudit, snapshot, order, special) => redPackAudit.OrderId == special.OrderId)
@@ -384,6 +384,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
                 BankCardNo = record.BankCardNo,
                 AwardName = record.Name,
                 OpenBank = record.OpenBank,
+                AwardName = record.Name,
                 AuditStatus = redPackAudit.Status,
             });
         return query;

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

@@ -15,32 +15,32 @@ public class SnapshotStatisticsOutDto
     /// <summary>
     /// 随手拍来件数
     /// </summary>
-    public int SuiShouPaiLaiJianShu { get; set; }
+    public int SSPLJS { get; set; }
 
     /// <summary>
     /// 未在受理范围内件数
     /// </summary>
-    public int WeiZaiShouLiFanWeiNeiJianShu { get; set; }
+    public int WZSLFWNJS { get; set; }
 
     /// <summary>
     /// 随手拍转12345件数
     /// </summary>
-    public int SuiShouPaiZhuan12345JianShu { get; set; }
+    public int SSPZ12345JS { get; set; }
 
     /// <summary>
     /// 受理范围内总件数
     /// </summary>
-    public int ShouLiFanWeiNeiZongJianShu { get; set; }
+    public int SLFWNZJS { get; set; }
 
     /// <summary>
     /// 受理范围内派给各网格员件数
     /// </summary>
-    public int ShouLiFanWeiNeiPaiGeiGeWangGeYuanJianShu { get; set; }
+    public int SLFWNPGGWGYJS { get; set; }
 
     /// <summary>
     /// 受理范围内派给网格员四小时内回复件数
     /// </summary>
-    public int ShouLiFanWeiNeiPaiGeiWangGeYuanSiXiaoShiNeiHuiFuJianShu { get; set; }
+    public int SLFWNPGWGYSXSNHFJS { get; set; }
 
     /// <summary>
     /// 受理范围内派给网格员超过四小时回复件数
@@ -141,8 +141,6 @@ public class SnapshotStatisticsOutDto
     /// 审批同意（网格员）红包个数
     /// </summary>
     public float SPTYWGYHBGS { get; set; }
-
-
 }
 
 /// <summary>

test/Hotline.Tests/Application/RedPackApplicationTest.cs

@@ -64,7 +64,7 @@ public class RedPackApplicationTest : TestBase
             .办理到归档(Set一级部门)
             .发布工单(SetZuoXi, _systemDicDataCacheManager.SnapshotOrderLabel.Where(m => m.DicDataValue == "bss").Select(m => new Kv(m.DicDataName, m.DicDataName)).ToList())
             .部门审核市民红包(Set应急管理局)
-            .StepHandle(async order => 
+            .StepHandle(async order =>
             {
                 var items = await _redPackApplication.GetRedPackSpecialAuditItems(new SnapshotOrderAuditItemsInDto(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 0)).ToListAsync();
                 items.Where(m => m.No == order.No).Count().ShouldBe(1);
@@ -75,26 +75,26 @@ public class RedPackApplicationTest : TestBase
                 items = await _redPackApplication.GetRedPackSpecialAuditItems(new SnapshotOrderAuditItemsInDto(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 2)).ToListAsync();
                 items.Where(m => m.No == order.No).Count().ShouldBe(0);
             })
-            .部门审核特殊红包(Set应急管理局, 29)
-            .StepHandle(async order =>
-            {
-                var special = await _specialRedPackAuditRepository.Queryable().Where(m => m.OrderId == order.Id).FirstAsync();
-                special.ApprovedAmount.ShouldBe(29);
-                special.Status.ShouldBe(ERedPackAuditStatus.Agree);
-                special.AuditRemark.ShouldBe("红包审核通过");
-                var redPackAudit = await _redPackApplication.GetRedPackSpecialAuditBaseDataAsync(order.Id);
-                redPackAudit.AuditDetail.AuditId.ShouldNotBeNull();
-                redPackAudit.AuditDetail.AuditName.ShouldNotBeNull();
-                redPackAudit.AuditDetail.AuditOrgId.ShouldNotBeNull();
-                redPackAudit.AuditDetail.AuditOrgName.ShouldNotBeNull();
-                redPackAudit.AuditDetail.AuditRemark.ShouldNotBeNull("审核意见不能为空");
-                redPackAudit.AuditDetail.AuditRemark.ShouldBe("红包审核通过");
+            //.部门审核特殊红包(Set应急管理局, 29)
+            //.StepHandle(async order =>
+            //{
+            //    var special = await _specialRedPackAuditRepository.Queryable().Where(m => m.OrderId == order.Id).FirstAsync();
+            //    special.ApprovedAmount.ShouldBe(29);
+            //    special.Status.ShouldBe(ERedPackAuditStatus.Agree);
+            //    special.AuditRemark.ShouldBe("红包审核通过");
+            //    var redPackAudit = await _redPackApplication.GetRedPackSpecialAuditBaseDataAsync(order.Id);
+            //    redPackAudit.AuditDetail.AuditId.ShouldNotBeNull();
+            //    redPackAudit.AuditDetail.AuditName.ShouldNotBeNull();
+            //    redPackAudit.AuditDetail.AuditOrgId.ShouldNotBeNull();
+            //    redPackAudit.AuditDetail.AuditOrgName.ShouldNotBeNull();
+            //    redPackAudit.AuditDetail.AuditRemark.ShouldNotBeNull("审核意见不能为空");
+            //    redPackAudit.AuditDetail.AuditRemark.ShouldBe("红包审核通过");
 
-                var items = await _redPackApplication.GetRedPackSpecialAuditItems(new SnapshotOrderAuditItemsInDto(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 1)).ToListAsync();
-                items.Count.ShouldNotBe(0, $"工单No: {order.No}");
-            })
+            //    var items = await _redPackApplication.GetRedPackSpecialAuditItems(new SnapshotOrderAuditItemsInDto(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 1)).ToListAsync();
+            //    items.Count.ShouldNotBe(0, $"工单No: {order.No}");
+            //})
             .GetCreateResult();
-
+        order.Id.ShouldBeNull();
     }
 
     /// <summary>