Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs

@@ -3,8 +3,10 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Uow;
+using Win.Sfs.SettleAccount.MaterialRelationships;
 
 namespace Win.Sfs.SettleAccount.Entities.TaskJobs;
 
@@ -24,13 +26,24 @@ public class JobAppService: ApplicationService
     /// </summary>
     /// <remarks>
     [HttpPost]
-    [Route("list")]
+    [Route("listold")]
     [UnitOfWork(false)]
-    public virtual async Task<List<JobDto>> GetListAsync(JobRequestDto input)
+    public virtual async Task<List<JobDto>> GetListOldAsync(JobRequestDto input)
     {
         return await _service.GetListAsync(input);
     }
 
+    /// <summary>
+    /// 根据筛选条件获取实体列表
+    /// </summary>
+    [HttpPost]
+    [Route("list")]
+    [UnitOfWork(false)]
+    public virtual async Task<PagedResultDto<JobDto>> GetListAsync(JobRequestDto input)
+    {
+        var lists = await _service.GetListAsync(input);
+        return new PagedResultDto<JobDto>(lists.Count, lists);
+    }
 
     [HttpGet]
     [Route("{id}")]