合并

src/2.services/ATS.NonCustodial.Application/Impl/Business/CaseManagements/AppCaseManagementService.cs

@@ -1537,10 +1537,19 @@ namespace ATS.NonCustodial.Application.Impl.Business.CaseManagements
         [HttpPost]
         public async Task<IResultOutput> GetSupervisedPersonAsync(GetSupervisedPersonPage input)
         {
-            var caseIds = await (await base.GetCurrentUserCaseListAsync()).Select(w => w.AppCaseManagement.Id).ToListAsync();
+            var limits = User.limits;
+            var selectLimits = await _appCaseSupervisorRepository.AsQueryable(false, true)
+                .Where(w => limits.Contains(w.UnitId.ToString()))
+                .ToListAsync();
+            var caseIds = selectLimits.Select(w => w.CaseId).Distinct().ToList();
+
+            //var caseIds = await (await base.GetCurrentUserCaseListAsync()).Select(w => w.AppCaseManagement.Id).ToListAsync();
             var caselist = await (await base.GetCurrentUserCaseListAsync()).Select(w => new { w.AppCaseManagement.Id, w.AppCaseManagement.Name }).ToListAsync();
-            //查询待执行，执行种案件涉嫌人员
+            //查询待执行，执行种案件涉嫌人员 去除状态筛选，与导出接口一致
-            var appSupervisedlist = from a in base._appCaseManagementRepository.AsQueryable(false, true).Where(q => q.CaseProgress != CaseProgressEnum.Closed)
+            //var appSupervisedlist = from a in base._appCaseManagementRepository.AsQueryable(false, true).Where(q => q.CaseProgress != CaseProgressEnum.Closed)
+            //                        join b in _appSupervisedPersonRepository.AsQueryable(false, true) on a.Id equals b.CaseId
+            //                        select b;
+            var appSupervisedlist = from a in base._appCaseManagementRepository.AsQueryable(false, true)
                                     join b in _appSupervisedPersonRepository.AsQueryable(false, true) on a.Id equals b.CaseId
                                     select b;
             var data = await appSupervisedlist
@@ -1853,7 +1862,15 @@ namespace ATS.NonCustodial.Application.Impl.Business.CaseManagements
         /// <returns></returns>
         public async Task<IActionResult> Getuserexport(GetSupervisedPersonPage input)
         {
-            var caseIds = await (await base.GetCurrentUserCaseListAsync()).Select(w => w.AppCaseManagement.Id).ToListAsync();
+            input.PageIndex = 1;
+            input.PageSize = 999999;
+            var limits = User.limits;
+            var selectLimits = await _appCaseSupervisorRepository.AsQueryable(false, true)
+                .Where(w => limits.Contains(w.UnitId.ToString()))
+                .ToListAsync();
+            var caseIds = selectLimits.Select(w => w.CaseId).Distinct().ToList();
+
+            //var caseIds = await (await base.GetCurrentUserCaseListAsync()).Select(w => w.AppCaseManagement.Id).ToListAsync();
             var caselist = await (await base.GetCurrentUserCaseListAsync()).Select(w => new { w.AppCaseManagement.Id, w.AppCaseManagement.Name }).ToListAsync();
             var data = await _appSupervisedPersonRepository.AsQueryable(false, true)
                 .Where(q => caseIds.Contains(q.CaseId))
@@ -1865,8 +1882,8 @@ namespace ATS.NonCustodial.Application.Impl.Business.CaseManagements
 
             foreach (var listDto in data.Data)
             {
-                var judgmentlist = await base.GetDictionariesOutput1("judgment", "");
+                //var judgmentlist = await base.GetDictionariesOutput1("judgment", "");
-                var type_caselist = await base.GetDictionariesOutput1("type_case", "");
+                //var type_caselist = await base.GetDictionariesOutput1("type_case", "");
                 listDto.Casename = caselist.Where(q => q.Id == listDto.CaseId).Select(q => q.Name).JoinAsString(",");
                 //listDto.CaseTypename = type_caselist.Where(w => w.Id == listDto.CaseTypeId).Select(w => w.Name).JoinAsString(",");
                 //listDto.JudgmentStatusname = judgmentlist.Where(w => w.Id == listDto.JudgmentStatusId).Select(w => w.Name).JoinAsString(",");

src/5.shared/ATS.NonCustodial.Shared/Extensions/Collection/PaginationExtensions.cs

@@ -40,7 +40,7 @@ namespace ATS.NonCustodial.Shared.Extensions.Collection
         /// <returns></returns>
         public static async Task<PagedList<TEntity>> PagedAsync<TEntity>(this IQueryable<TEntity> queryable, PageRequestBaseInput pageDto) where TEntity : class
         {
-            if (pageDto.PageSize > 25) pageDto.PageSize = 25;
+            if (pageDto.PageSize > 500) pageDto.PageSize = 500;
 
             var pagedQuery = GetPagedQuery(queryable, pageDto.PageIndex, pageDto.PageSize);
             var totalCount = await queryable.CountAsync().ConfigureAwait(false);
@@ -62,7 +62,7 @@ namespace ATS.NonCustodial.Shared.Extensions.Collection
             where TEntity : class
             where TPageInput : BasePageInput
         {
-            if (pageDto.PageSize > 25) pageDto.PageSize = 25;
+            if (pageDto.PageSize > 500) pageDto.PageSize = 500;
 
             var pagedQuery = GetPagedQuery(queryable, pageDto.PageIndex, pageDto.PageSize);
             var totalCount = await queryable.CountAsync().ConfigureAwait(false);