xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

分页参数时间范围处理

Browse Source
This commit is contained in:
陈淳
2022-09-09 15:53:11 +08:00
parent 43120b0017
commit 5d738d99fe
27 changed files with 326 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/LogController.cs
View File

@@ -35,10 +35,10 @@ namespace Yi.Framework.ApiMicroservice.Controllers
{
Random random = new Random();
var logList = new List<LogEntity>() {
new LogEntity() { LogCreateTime = Convert.ToDateTime("2019-12-1"), Message = "jack"+random.Next() } ,
new LogEntity() { LogCreateTime = Convert.ToDateTime("2022-02-1"), Message = "jack"+random.Next() },
new LogEntity() { LogCreateTime = Convert.ToDateTime("2020-02-1"), Message = "jack"+random.Next() },
new LogEntity() { LogCreateTime = Convert.ToDateTime("2021-12-1"), Message = "jack"+random.Next() } };
new LogEntity() { CreateTime = Convert.ToDateTime("2019-12-1"), Message = "jack"+random.Next() } ,
new LogEntity() { CreateTime = Convert.ToDateTime("2022-02-1"), Message = "jack"+random.Next() },
new LogEntity() { CreateTime = Convert.ToDateTime("2020-02-1"), Message = "jack"+random.Next() },
new LogEntity() { CreateTime = Convert.ToDateTime("2021-12-1"), Message = "jack"+random.Next() } };
return Result.Success().SetData(await _iLogService.AddListTest(logList));
}

16
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
View File

@@ -29,10 +29,16 @@ namespace Yi.Framework.ApiMicroservice.Controllers
_iUserService = iUserService;
}
/// <summary>
/// 动态条件分页查询
/// </summary>
/// <param name="user"></param>
/// <param name="page"></param>
/// <returns></returns>
[HttpGet]
public async Task<Result> PageList([FromQuery]UserEntity user, [FromQuery] PageParModel page)
public async Task<Result> PageList([FromQuery] UserEntity user, [FromQuery] PageParModel page)
{
return Result.Success().SetData(new PageModel(await _iUserService._repository.GetListAsync(),100) );
return Result.Success().SetData(await _iUserService.SelctPageList(user, page));
}
/// <summary>
@@ -42,10 +48,10 @@ namespace Yi.Framework.ApiMicroservice.Controllers
/// <param name="isDel"></param>
/// <returns></returns>
[HttpPut]
public async Task<Result> UpdateStatus(long userId,bool isDel)
public async Task<Result> UpdateStatus(long userId, bool isDel)
{
return Result.Success().SetData(await _iUserService._repository.UpdateIgnoreNullAsync(new UserEntity() { Id = userId, IsDeleted = isDel }));
}
@@ -56,7 +62,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
/// <returns></returns>
[Permission($"{nameof(UserEntity)}:add")]
[HttpPost]
public override async Task<Result> Add(UserEntity entity)
public override async Task<Result> Add(UserEntity entity)
{
if (!await _iUserService.Exist(entity.UserName))
{