|
|
|
|
@ -922,9 +922,11 @@ namespace ATS.NonCustodial.Application.Impl.Business
|
|
|
|
|
var caseIds = await (await base.GetCurrentUserCaseListAsync()).Select(w => w.AppCaseManagement.Id).ToListAsync(); |
|
|
|
|
|
|
|
|
|
// 5. 构建查询表达式 |
|
|
|
|
var beginTime = input.TimeSearch.BeginTime.Value; |
|
|
|
|
var endTime = input.TimeSearch.EndTime.Value; |
|
|
|
|
var query = _appEarlyWarningRepository.AsQueryable(false, true) |
|
|
|
|
.Where(w => caseIds.Contains(w.CaseId)) |
|
|
|
|
.Where(w => w.CreatedTime >= input.TimeSearch.BeginTime && w.CreatedTime <= input.TimeSearch.EndTime); |
|
|
|
|
.Where(w => w.CreatedTime >= beginTime && w.CreatedTime <= endTime); |
|
|
|
|
|
|
|
|
|
// 6. 获取总数 |
|
|
|
|
var total = query.Count(); |
|
|
|
|
@ -983,7 +985,8 @@ namespace ATS.NonCustodial.Application.Impl.Business
|
|
|
|
|
// 填充监管人字段 |
|
|
|
|
newItem.SupervisorName = supervisor.SupervisorName; |
|
|
|
|
newItem.SupervisorId = supervisor.SupervisorId; |
|
|
|
|
|
|
|
|
|
newItem.BeginTime = beginTime; |
|
|
|
|
newItem.EndTime = endTime; |
|
|
|
|
// 从电话映射中获取监管人电话(处理空值) |
|
|
|
|
newItem.Phone = supervisorPhoneMap.TryGetValue(supervisor.SupervisorId, out var phone) |
|
|
|
|
? phone |
|
|
|
|
@ -1046,7 +1049,8 @@ namespace ATS.NonCustodial.Application.Impl.Business
|
|
|
|
|
// 填充监管人字段 |
|
|
|
|
newItem.SupervisorName = supervisor.SupervisorName; |
|
|
|
|
newItem.SupervisorId = supervisor.SupervisorId; |
|
|
|
|
|
|
|
|
|
newItem.BeginTime = beginTime; |
|
|
|
|
newItem.EndTime = endTime; |
|
|
|
|
// 从电话映射中获取监管人电话(处理空值) |
|
|
|
|
newItem.Phone = supervisorPhoneMap.TryGetValue(supervisor.SupervisorId, out var phone) |
|
|
|
|
? phone |
|
|
|
|
|