Compare commits
2 Commits
0f559b3fb7
...
1243493abe
| Author | SHA1 | Date |
|---|---|---|
|
|
1243493abe | |
|
|
88e124ac2d |
|
|
@ -1,6 +1,7 @@
|
||||||
using DocumentFormat.OpenXml.EMMA;
|
using DocumentFormat.OpenXml.EMMA;
|
||||||
using Infrastructure;
|
using Infrastructure;
|
||||||
using Infrastructure.CloudSdk.minio;
|
using Infrastructure.CloudSdk.minio;
|
||||||
|
using Infrastructure.Extensions;
|
||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
using OpenAuth.App.BaseApp.Base;
|
using OpenAuth.App.BaseApp.Base;
|
||||||
using OpenAuth.App.Interface;
|
using OpenAuth.App.Interface;
|
||||||
|
|
@ -165,13 +166,14 @@ namespace OpenAuth.App.ServiceApp
|
||||||
/// <param name="pageSize"></param>
|
/// <param name="pageSize"></param>
|
||||||
/// <param name="key"></param>
|
/// <param name="key"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public async Task<Response<PageInfo<List<Lasa_ChangeDetection>>>> GetChangeDetectionPageList(int page, int limit, string key)
|
public async Task<Response<PageInfo<List<Lasa_ChangeDetection>>>> GetChangeDetectionPageList(int page, int limit, string key, DateTime startTime, DateTime endTime)
|
||||||
{
|
{
|
||||||
RefAsync<int> totalCount = 0;
|
RefAsync<int> totalCount = 0;
|
||||||
using (var db = UnitWork.CreateContext())
|
using (var db = UnitWork.CreateContext())
|
||||||
{
|
{
|
||||||
var list = await db.Lasa_ChangeDetection.AsQueryable()
|
var list = await db.Lasa_ChangeDetection.AsQueryable()
|
||||||
.WhereIF(!string.IsNullOrEmpty(key), a => a.Title.Contains(key))
|
.WhereIF(!string.IsNullOrEmpty(key), a => a.Title.Contains(key))
|
||||||
|
.WhereIF(!"0001/1/1 0:00:00".Equal(startTime.ToString()), a => a.CreateTime >= startTime && a.CreateTime <= endTime)
|
||||||
.OrderByDescending(a => a.CreateTime)
|
.OrderByDescending(a => a.CreateTime)
|
||||||
.ToPageListAsync(page, limit, totalCount);
|
.ToPageListAsync(page, limit, totalCount);
|
||||||
return new Response<PageInfo<List<Lasa_ChangeDetection>>>
|
return new Response<PageInfo<List<Lasa_ChangeDetection>>>
|
||||||
|
|
|
||||||
|
|
@ -113,12 +113,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
|
||||||
/// <param name="key"></param>
|
/// <param name="key"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
public async Task<Response<PageInfo<List<Lasa_ChangeDetection>>>> GetChangeDetectionPageList(int page, int limit, string key)
|
public async Task<Response<PageInfo<List<Lasa_ChangeDetection>>>> GetChangeDetectionPageList(int page, int limit, string key, DateTime startTime, DateTime endTime)
|
||||||
{
|
{
|
||||||
var result = new Response<PageInfo<List<Lasa_ChangeDetection>>>();
|
var result = new Response<PageInfo<List<Lasa_ChangeDetection>>>();
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
result = await _app.GetChangeDetectionPageList(page, limit, key);
|
result = await _app.GetChangeDetectionPageList(page, limit, key, startTime, endTime);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue