|
@@ -5834,22 +5834,23 @@ Where dfp.IsDel = 0 And dfp.IsPay = 1
|
|
|
else if (_dto.Type == 2) //view
|
|
|
{
|
|
|
var _view = await _sqlSugar.SqlQueryable<ExcelView>(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: 1,
|
|
|
- pageSize: 99999
|
|
|
- );
|
|
|
+ .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: 1,
|
|
|
+ pageSize: 99999
|
|
|
+ );
|
|
|
|
|
|
_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();
|
|
|
|
|
|
string str = "";
|
|
|
int index = 1;
|