|
|
@ -77,19 +77,9 @@ public class ThirdLocationJobController : AbpController |
|
|
|
/// <param name="pageIndex"></param>
|
|
|
|
/// <returns></returns>
|
|
|
|
[HttpGet("list")] |
|
|
|
public virtual async Task<PagedResultDto<ThirdLocationJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isFinished) |
|
|
|
public virtual async Task<PagedResultDto<ThirdLocationJobDTO>> GetListAsync(int pageSize, int pageIndex) |
|
|
|
{ |
|
|
|
var dtos = await _dictApp.GetByCodeAsync("ContainerSpecificationsType").ConfigureAwait(false); |
|
|
|
|
|
|
|
var status = new List<int>(); |
|
|
|
if (isFinished == true) |
|
|
|
{ |
|
|
|
status.Add((int)EnumJobStatus.Done); |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
status.Add((int)EnumJobStatus.Open); |
|
|
|
} |
|
|
|
var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing }; |
|
|
|
var jsonStatus = JsonSerializer.Serialize(status); |
|
|
|
|
|
|
|
var request = new SfsJobRequestInputBase |
|
|
@ -100,10 +90,11 @@ public class ThirdLocationJobController : AbpController |
|
|
|
Condition = new Condition |
|
|
|
{ |
|
|
|
Filters = new List<Filter> |
|
|
|
{ |
|
|
|
new(nameof(ThirdLocationJobDTO.JobStatus),jsonStatus,"In") |
|
|
|
{ |
|
|
|
new(nameof(IssueJobDTO.JobStatus),jsonStatus,"In") |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
var list = await _thirdLocationJobAppService.GetPagedListByFilterAsync(request, true).ConfigureAwait(false); |
|
|
|