|
@@ -24,11 +24,12 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
|
|
|
|
|
|
public ISugarQueryable<SnapshotOrderAuditItemsOutDto> GetRedPackAuditItemsAsync(SnapshotOrderAuditItemsInDto dto)
|
|
|
{
|
|
|
- var query = _orderSnapshotRepository.Queryable()
|
|
|
+ var query = _orderSnapshotRepository.Queryable(includeDeleted: true)
|
|
|
.LeftJoin<Order>((s, o) => s.Id == o.Id)
|
|
|
.LeftJoin<RedPackAudit>((s, o, r) => s.Id == r.OrderId)
|
|
|
.LeftJoin<RedPackRecord>((s, o, r, j) => s.Id == j.OrderId)
|
|
|
.LeftJoin<Industry>((s, o, r, j, i) => s.IndustryId == i.Id)
|
|
|
+ .Where((s, o, r, j, i) => o.Status == EOrderStatus.Filed)
|
|
|
.WhereIF(dto.No.NotNullOrEmpty(), (s, o, r, j) => o.No.Contains(dto.No))
|
|
|
.WhereIF(dto.Title.NotNullOrEmpty(), (s, o, r, j) => o.Title.Contains(dto.Title))
|
|
|
.WhereIF(dto.FromPhone.NotNullOrEmpty(), (s, o, r, j) => o.FromPhone.Contains(dto.FromPhone))
|