|
@@ -5807,23 +5807,24 @@ Where dfp.IsDel = 0 And dfp.IsPay = 1
|
|
|
{
|
|
|
RefAsync<int> total = 0;
|
|
|
var _view = await _sqlSugar.SqlQueryable<DailyFeePaymentRangeView>(sql)
|
|
|
- .Where(x => x.ApplicantDt >= _beginDt && x.ApplicantDt <= _endDt)
|
|
|
- .WhereIF(dailypaymentTypeData.Count > 0,
|
|
|
- x => dailypaymentTypeData.Contains(x.PriceTypeId))
|
|
|
- .WhereIF(_dto.CompanyIds.Count > 0, x => _dto.CompanyIds.Contains(x.CompanyId))
|
|
|
- .WhereIF(!string.IsNullOrEmpty(_dto.Filter), x => x.ViewStr.Contains(_dto.Filter))
|
|
|
- .OrderByDescending(x => x.ApplicantDt)
|
|
|
- .ToPageListAsync(
|
|
|
- pageNumber: _dto.PageIndex,
|
|
|
- pageSize: _dto.PageSize,
|
|
|
- totalNumber: total
|
|
|
- );
|
|
|
+ .Where(x => x.ApplicantDt >= _beginDt && x.ApplicantDt <= _endDt)
|
|
|
+ .WhereIF(dailypaymentTypeData.Count > 0,
|
|
|
+ x => dailypaymentTypeData.Contains(x.PriceTypeId))
|
|
|
+ .WhereIF(_dto.CompanyIds.Count > 0, x => _dto.CompanyIds.Contains(x.CompanyId))
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(_dto.Filter), x => x.ViewStr.Contains(_dto.Filter))
|
|
|
+ .OrderByDescending(x => x.ApplicantDt)
|
|
|
+ .ToPageListAsync(
|
|
|
+ pageNumber: _dto.PageIndex,
|
|
|
+ pageSize: _dto.PageSize,
|
|
|
+ totalNumber: total
|
|
|
+ );
|
|
|
|
|
|
_sqlSugar.ThenMapper(_view, x =>
|
|
|
{
|
|
|
x.Contents = _sqlSugar.Queryable<DailyFeePaymentContentView>()
|
|
|
- .SetContext(x1 => x1.DFPId, () => x.Id, x)
|
|
|
- .ToList();
|
|
|
+ .SetContext(x1 => x1.DFPId, () => x.Id, x)
|
|
|
+ .Where(x => x.IsDel == 0)
|
|
|
+ .ToList();
|
|
|
});
|
|
|
|
|
|
//单独处理
|