@@ -81,6 +81,12 @@ public class ExportDataController : BaseController
var returnType = method.ReturnType.GetGenericArguments()[0];
var description = method.GetCustomAttribute<DescriptionAttribute>()?.Description;
+ if (pageIndex == null || pageSize == null)
+ {
+ isExportAll = true;
+ pageIndex = 1;
+ pageSize = 20;
+ }
return _exportApplication.GetExcelFile(returnType, genericType, exportData, ConvertToList(result, (bool)isExportAll, (int)pageIndex, (int)pageSize), description);
@@ -89,7 +89,7 @@ public class InviteCodeController : BaseController
/// <returns></returns>
[HttpGet("statistic")]
public async Task<IList<InviteCodeStatisticOutDto>> GetInviteCodeStatisticAsync([FromQuery] GetInviteCodeStatisticInDto dto)
- => await _inviteCodeApplication.GetInviteCodeStatisticAsync(dto);
+ => await _inviteCodeApplication.GetInviteCodeStatisticAsync(dto).ToListAsync();
/// <summary>
/// 邀请码统计明细
@@ -26,7 +26,7 @@ public interface IInviteCodeApplication
/// </summary>
/// <param name="dto"></param>
- Task<IList<InviteCodeStatisticOutDto>> GetInviteCodeStatisticAsync(GetInviteCodeStatisticInDto dto);
+ ISugarQueryable<InviteCodeStatisticOutDto> GetInviteCodeStatisticAsync(GetInviteCodeStatisticInDto dto);
@@ -64,19 +64,18 @@ public class InviteCodeApplication : IInviteCodeApplication, IScopeDependency
return _inviteCodeRepository.Queryable();
}
- public async Task<IList<InviteCodeStatisticOutDto>> GetInviteCodeStatisticAsync(GetInviteCodeStatisticInDto dto)
+ public ISugarQueryable<InviteCodeStatisticOutDto> GetInviteCodeStatisticAsync(GetInviteCodeStatisticInDto dto)
{
dto.ValidateObject();
- var items = await _inviteCodeRecordRepository.Queryable()
+ var items = _inviteCodeRecordRepository.Queryable()
.Where(m => m.CreationTime >= dto.StartTime && m.CreationTime <= dto.EndTime)
.GroupBy(m => new { m.Id, m.OrgName })
.Select(m => new InviteCodeStatisticOutDto
- {
- Id = m.Id,
+ Id = m.Id,
OrgName = m.OrgName,
Count = SqlFunc.AggregateCount(m.OrgName)
- })
- .ToListAsync();
+ });
return items;