[MODIFY]20251016提出的bug修改提交

src/1.datas/ATS.NonCustodial.Domain/Entities/Business/AppBusinessApplication.cs

@@ -92,6 +92,11 @@ namespace ATS.NonCustodial.Domain.Entities.Business
         /// </summary>
         public DateTime ActiveTimePeriodEnd { get; set; }
 
+        /// <summary>
+        /// 结束监管日期
+        /// </summary>
+        public DateTime? EndSupervisionDate { get; set; }
+
         /// <summary>
         /// 申请描述
         /// </summary>

src/2.services/ATS.NonCustodial.Application/Impl/Business/AppBusinessApplicationService.cs

@@ -7,7 +7,6 @@ using ATS.NonCustodial.Application.Contracts.Interfaces.Business.AppBusinessAppl
 using ATS.NonCustodial.Application.Contracts.Interfaces.Business.AppBusinessApplications.Output;
 using ATS.NonCustodial.Application.Contracts.Interfaces.Business.AppCaseManagements.AppCaseManagement;
 using ATS.NonCustodial.Application.Contracts.Interfaces.Business.Apps.Output;
-using ATS.NonCustodial.Application.Impl.Admins;
 using ATS.NonCustodial.Application.Impl.Business.IM;
 using ATS.NonCustodial.Domain.Entities.Admins;
 using ATS.NonCustodial.Domain.Entities.Business;
@@ -26,8 +25,6 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
-using NPOI.SS.Formula.Functions;
-using System.Linq;
 using Yitter.IdGenerator;
 
 namespace ATS.NonCustodial.Application.Impl.Business
@@ -117,8 +114,17 @@ namespace ATS.NonCustodial.Application.Impl.Business
             var caseIdList = selectLimits.Select(w => w.CaseId).Distinct().ToList();
 
             var express = await GetExpression(input, _appBusinessApplicationRepository.AsQueryable(false, true));
+            express = express.Where(w => caseIdList.Contains(w.CaseId));
             var rtn = await base.GetPageAsync<AppBusinessApplication, AppBusinessApplicationGetPageInput, AppBusinessApplicationListDto>(input, express);
-            rtn.Data = rtn.Data.Where(w => caseIdList.Contains(w.CaseId)).ToList();
+            //rtn.Data = rtn.Data.Where(w => caseIdList.Contains(w.CaseId)).ToList();
+            foreach (var item in rtn.Data)
+            {
+                if (item.EndSupervisionDate.HasValue)
+                {
+                    item.ActiveTimePeriodBegin = null;
+                    item.ActiveTimePeriodEnd = null;
+                }
+            }
             return ResultOutput.Ok(rtn);
         }
 
@@ -143,12 +149,12 @@ namespace ATS.NonCustodial.Application.Impl.Business
             var grudlist = express
                 .WhereIf(input.supname.NotNull(), q => q.SupervisedPersonName.Contains(input.supname))
                 .GroupBy(q => new { q.CaseId, q.SupervisedPersonId, q.SupervisedPersonName }).Select(q => new { q.Key.SupervisedPersonName, q.Key.CaseId, Count = q.ToList().Count }).ToList();
-            var grulist =from a in grudlist.ToList()
+            var grulist = from a in grudlist.ToList()
                           join b in spList.Select(q => q.AppCaseManagement).ToList() on a.CaseId equals b.Id
                           select new { a.SupervisedPersonName, a.Count, a.CaseId, b.Name };
             var resultList = grulist.Distinct().Where(p => caseIds.Contains(p.CaseId));
             var pagegrulist = resultList.Skip((input.PageIndex - 1) * input.PageSize).Take(input.PageSize).ToList();
-            return ResultOutput.Ok(new { TotalCount = resultList.Count(), grudlist= pagegrulist });
+            return ResultOutput.Ok(new { TotalCount = resultList.Count(), grudlist = pagegrulist });
         }
 
         /// <summary>
@@ -352,7 +358,7 @@ namespace ATS.NonCustodial.Application.Impl.Business
             //根据当前登录人查看其手里的案件被监管人
             var spList = await base.GetCurrentUserCaseListAsync();
 
-            var spIds = await spList.Where(q=>q.AppCaseSupervisedPerson!=null).Select(w => w.AppCaseSupervisedPerson!.SupervisedPersonId).ToListAsync();
+            var spIds = await spList.Where(q => q.AppCaseSupervisedPerson != null).Select(w => w.AppCaseSupervisedPerson!.SupervisedPersonId).ToListAsync();
 
             query = query
                 .Where(w => spIds.Contains(w.SupervisedPersonId))

src/2.services/ATS.NonCustodial.Application/Impl/Business/AppManagementService.cs

@@ -439,9 +439,16 @@ namespace ATS.NonCustodial.Application.Impl.Business
         [HttpPost]
         public async Task<IResultOutput<PagedList<AppBusinessApplicationListDto>>> GetAppBusinessByStatusListAsync(GetAppBusinessByStatusListPageInput input)
         {
+            //获取当前用户权限下的案件ids
+            var limits = User.limits;
+            var selectLimits = await _appCaseSupervisorRepository.AsQueryable(false, true)
+                .Where(w => limits.Contains(w.UnitId.ToString()))
+                .ToListAsync();
+            var caseIdList = selectLimits.Select(w => w.CaseId).Distinct().ToList();
+
             var data = await _appCaseManagementService.GetCaseSuperviseList();
 
-            var caseIds = data.Select(w => w.CaseId).ToList();
+            var caseIds = data.Where(w=> caseIdList.Contains(w.CaseId)).Select(w => w.CaseId).ToList();
 
             //业务申请列表
             var businessList = await _appBusinessApplicationRepository
@@ -1182,9 +1189,11 @@ namespace ATS.NonCustodial.Application.Impl.Business
                                        CreatedTime = e.CreatedTime,
                                        SupervisedPersonId = e.SupervisedPersonId,
                                        SupervisedPersonName = e.SupervisedPersonName,
-                                       CaseId = e.CaseId
+                                       CaseId = e.CaseId,
+                                       EarlyWarningTypeId = e.EarlyWarningTypeId
                                    })
                 .WhereIf(input.CheckStatus.HasValue, w => w.CheckStatus == input.CheckStatus)
+                .WhereIf(input.EarlyWarningTypeId.HasValue,w=>w.EarlyWarningTypeId == input.EarlyWarningTypeId)
                 .ToListAsync();
             earlyList = earlyList.Distinct((x, y) => x.CaseId == y.CaseId && x.SupervisedPersonId == y.SupervisedPersonId && x.CreatedTime == y.CreatedTime).OrderByDescending(q => q.CreatedTime).ToList();
             if (!input.CheckStatus.HasValue)

src/2.services/ATS.NonCustodial.Application/Impl/Business/AppViolationStatisticsService.cs

@@ -25,6 +25,7 @@ using AutoMapper.QueryableExtensions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using NPOI.SS.Formula.Functions;
+using StackExchange.Profiling.Internal;
 using System.Collections.Generic;
 using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
@@ -120,6 +121,7 @@ namespace ATS.NonCustodial.Application.Impl.Business
                 .AsQueryable(false, true).Where(q=> spIds.Contains(q.SupervisedPersonId))
                 .WhereIf(input.CaseId != default, a => a.CaseId == input.CaseId)
                 .WhereIf(input.SupervisedPersonId != default, w => w.SupervisedPersonId == input.SupervisedPersonId)
+                .WhereIf(input.SupervisedPersonName.HasValue(),w=>w.SupervisedPersonName.Contains(input.SupervisedPersonName))
                 .WhereIf(input.TimeSearch?.BeginTime != null && input.TimeSearch?.EndTime != null, q => q.CreatedTime >= input.TimeSearch.BeginTime && q.CreatedTime <= $"{input.TimeSearch.EndTime.Value.ToString("yyyy-MM-dd")} 23:59:59".ToDateTime())
                 .ToListAsync();
 

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

@@ -1538,6 +1538,8 @@ namespace ATS.NonCustodial.Application.Impl.Business.CaseManagements
                 .WhereIf(pageInput.CaseTypeId != null, a => a.CaseTypeId == pageInput.CaseTypeId)
                 .WhereIf(pageInput.JudgmentStatusIds.IsNotNullOrEmpty(), w => pageInput.JudgmentStatusIds.Contains(w.JudgmentStatusId))
                 .WhereIf(pageInput.CaseProgresses.IsNotNullOrEmpty(), w => pageInput.CaseProgresses.Contains(w.CaseProgress))
+                 .WhereIf(pageInput.TimeArraySearch.BeginTime.Length == 2, w => w.CreatedTime > pageInput.TimeArraySearch.BeginTime[0] && w.CreatedTime < pageInput.TimeArraySearch.BeginTime[1].AddDays(1))
+                .WhereIf(pageInput.TimeArraySearch.EndTime.Length == 2, w => w.CaseClosedTime > pageInput.TimeArraySearch.EndTime[0] && w.CaseClosedTime < pageInput.TimeArraySearch.EndTime[1].AddDays(1))
                 .WhereIf(pageInput.TimeSearch != null && pageInput.TimeSearch.BeginTime != null && pageInput.TimeSearch.EndTime != null, q => q.CreatedTime >= pageInput.TimeSearch.BeginTime && q.CreatedTime <= $"{pageInput.TimeSearch.EndTime.Value.ToString("yyyy-MM-dd")} 23:59:59".ToDateTime());
 
             var express = base.GetWithOutStatusExpression<AppCaseManagement, AppCaseManagementGetPageInput, long>(pageInput, query);

src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Business/AppBusinessApplications/Input/AppBusinessApplicationCreateOrModifyInput.cs

@@ -43,7 +43,10 @@ namespace ATS.NonCustodial.Application.Contracts.Interfaces.Business.AppBusiness
         /// 活动时间段（年月日时分）
         /// </summary>
         public DateTime ActiveTimePeriodEnd { get; set; }
-
+        /// <summary>
+        /// 申请结束监管日期
+        /// </summary>
+        public DateTime EndSupervisionDate { get; set; }
         /// <summary>
         /// 申请描述
         /// </summary>

src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Business/AppBusinessApplications/Output/AppBusinessApplicationListDto.cs

@@ -75,16 +75,21 @@ namespace ATS.NonCustodial.Application.Contracts.Interfaces.Business.AppBusiness
         /// <summary>
         /// 活动开始时间段（年月日时分）
         /// </summary>
-        public DateTime ActiveTimePeriodBegin { get; set; }
+        public DateTime? ActiveTimePeriodBegin { get; set; }
 
         /// <summary>
         /// 活动结束时间段（年月日时分）
         /// </summary>
-        public DateTime ActiveTimePeriodEnd { get; set; }
-
+        public DateTime? ActiveTimePeriodEnd { get; set; }
+        /// <summary>
+        /// 结束监管日期
+        /// </summary>
+        public DateTime? EndSupervisionDate { get; set; }
         /// <summary>
         /// 申请描述
         /// </summary>
         public string? ApplicationDescription { get; set; }
+
+
     }
 }

src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Business/AppCaseManagements/AppCaseManagement/Input/AppCaseManagementGetPageInput.cs

@@ -1,5 +1,7 @@
 using ATS.NonCustodial.Domain.Shared.Enums;
 using ATS.NonCustodial.Shared.Common.Dtos;
+using ATS.NonCustodial.Shared.Common.Dtos.Query;
+using ATS.NonCustodial.Shared.Common.Enums;
 
 namespace ATS.NonCustodial.Application.Contracts.Interfaces.Business.AppCaseManagements.AppCaseManagement.Input
 {
@@ -31,5 +33,8 @@ namespace ATS.NonCustodial.Application.Contracts.Interfaces.Business.AppCaseMana
         public long? CaseTypeId { get; set; }
 
         public List<long>? CaseIds { get; set; }
+
+        public CmShopTimeArraySearchDto<SearchTimeTypeEnums>? TimeArraySearch { get; set; } = new CmShopTimeArraySearchDto<SearchTimeTypeEnums>();
+
     }
 }

src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Business/Apps/Input/AppRemindPageInput.cs

@@ -18,5 +18,10 @@ namespace ATS.NonCustodial.Application.Contracts.Interfaces.Business.Apps.Input
         /// <see cref="CheckStatusEnum"/>
         /// </summary>
         public CheckStatusEnum? CheckStatus { get; set; }
+        /// <summary>
+        /// 提醒类型
+        /// </summary>
+        public long? EarlyWarningTypeId { get; set; }
+
     }
 }

src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Business/Apps/Output/AppRemindListDto.cs

@@ -60,6 +60,11 @@ namespace ATS.NonCustodial.Application.Contracts.Interfaces.Business.Apps.Output
         /// 案件名称
         /// </summary>
         public string? CaseName { get; set; }
+        /// <summary>
+        /// 案件名称
+        /// </summary>
+        public long? EarlyWarningTypeId { get; set; }
+
     }
 
 

src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Business/ViolationStatistics/Input/ViolationStatisticsPageInput.cs

@@ -14,7 +14,10 @@ namespace ATS.NonCustodial.Application.Contracts.Interfaces.Business.ViolationSt
         /// 被监管人Id
         /// </summary>
         public long? SupervisedPersonId { get; set; }
-
+        /// <summary>
+        /// 被监管人Id
+        /// </summary>
+        public string? SupervisedPersonName { get; set; }
         /// <summary>
         /// 案件Id
         /// </summary>