wyk/juipnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

账号导出

Browse Source
This commit is contained in:
“wanyongkang”
2021-02-05 11:09:03 +08:00
parent cdd1d6d4cc
commit 06b6946720
1 changed files with 57 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs
View File

@@ -351,26 +351,38 @@ namespace Hncore.Pass.Vpn.Controllers
{
Expression<Func<ProductAccountEntity, bool>> expr = m => 1 == 1;
if (request.UserId > 0)
{
expr = expr.And(m => m.UserId == request.UserId);
}
if (request.KeyWord.Has())
{
expr = expr.And(m => m.Account.Contains(request.KeyWord));
expr = expr.And(m => m.UserCode.Contains(request.KeyWord)
|| m.ProductName.Contains(request.KeyWord)
|| m.PackageName.Contains(request.KeyWord)
|| m.Account.Contains(request.KeyWord));
}
if (request.ProductId.HasValue)
if (request.ProductIds != null && request.ProductIds.Count > 0)
{
expr = expr.And(m => m.ProductId == request.ProductId);
expr = expr.And(m =>request.ProductIds.Contains((int)m.ProductId));
}
if (request.PackageId.HasValue)
if (request.PackageNames != null && request.PackageNames.Count > 0)
{
expr = expr.And(m => m.PackageId == request.PackageId);
expr = expr.And(m =>request.PackageNames.Contains((string)m.PackageName));
}
if (request.AccountTypes != null && request.AccountTypes.Count > 0)
if (request.AccountTypes!=null&&request.AccountTypes.Count>0)
{
expr = expr.And(m => request.AccountTypes.Contains(m.AccountType));
}
if (request.BTime.HasValue && request.ETime.HasValue)
{
expr = expr.And(m => m.EndTime>=request.BTime&&m.EndTime<=request.ETime);
}
if (request.BkTime.HasValue && request.EkTime.HasValue)
{
expr = expr.And(m => m.StartTime>=request.BkTime&&m.StartTime<=request.EkTime);
}
if (request.ExpirdDay > -1)
{
if (request.ExpirdDay == 0)
@@ -383,9 +395,46 @@ namespace Hncore.Pass.Vpn.Controllers
startTime = startTime < DateTime.Now ? DateTime.Now : startTime;
var EndTime = DateTime.Now.End().AddDays(request.ExpirdDay);
expr = expr.And(m => m.EndTime >= startTime && m.EndTime <= EndTime);
}
// expr = expr.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) == request.ExpirdDay);
}
// expr = expr.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) == request.ExpirdDay);
}
// if (request.UserId > 0)
// {
// expr = expr.And(m => m.UserId == request.UserId);
// }
// if (request.KeyWord.Has())
// {
// expr = expr.And(m => m.Account.Contains(request.KeyWord));
// }
// if (request.ProductId.HasValue)
// {
// expr = expr.And(m => m.ProductId == request.ProductId);
// }
// if (request.PackageId.HasValue)
// {
// expr = expr.And(m => m.PackageId == request.PackageId);
// }
// if (request.AccountTypes != null && request.AccountTypes.Count > 0)
// {
// expr = expr.And(m => request.AccountTypes.Contains(m.AccountType));
// }
// if (request.ExpirdDay > -1)
// {
// if (request.ExpirdDay == 0)
// {
// expr = expr.And(m => m.EndTime.Value < DateTime.Now);
// }
// else
// {
// var startTime = DateTime.Now.Begin().AddDays(request.ExpirdDay);
// startTime = startTime < DateTime.Now ? DateTime.Now : startTime;
// var EndTime = DateTime.Now.End().AddDays(request.ExpirdDay);
// expr = expr.And(m => m.EndTime >= startTime && m.EndTime <= EndTime);
// }
// // expr = expr.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) == request.ExpirdDay);
// }
var ret = await m_AccountService.PageDesc(request.PageIndex,10000, expr, true, m => m.Id);
var data = new ExcelData<ProductAccountEntity>