|
|
@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; |
|
|
using Microsoft.EntityFrameworkCore; |
|
|
using Microsoft.EntityFrameworkCore; |
|
|
using Shentun.Peis.Enums; |
|
|
using Shentun.Peis.Enums; |
|
|
using Shentun.Peis.Models; |
|
|
using Shentun.Peis.Models; |
|
|
|
|
|
using SqlSugar; |
|
|
using System; |
|
|
using System; |
|
|
using System.Collections.Generic; |
|
|
using System.Collections.Generic; |
|
|
using System.Linq; |
|
|
using System.Linq; |
|
|
@ -114,6 +115,11 @@ namespace Shentun.Peis.CardBills |
|
|
queryable = queryable.Where(m => input.PayModeIds.Contains(m.PayModeId)); |
|
|
queryable = queryable.Where(m => input.PayModeIds.Contains(m.PayModeId)); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (input.OperateUserIds.Any()) |
|
|
|
|
|
{ |
|
|
|
|
|
queryable = queryable.Where(m => input.OperateUserIds.Contains(m.CreatorId.Value)); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
var userlist = await _userRepository.GetListAsync(); |
|
|
var userlist = await _userRepository.GetListAsync(); |
|
|
|
|
|
|
|
|
var entlist = queryable.Select(s => new CardBillDto |
|
|
var entlist = queryable.Select(s => new CardBillDto |
|
|
@ -415,6 +421,11 @@ namespace Shentun.Peis.CardBills |
|
|
query = query.Where(m => input.PayModeIds.Contains(m.cardBill.PayModeId)); |
|
|
query = query.Where(m => input.PayModeIds.Contains(m.cardBill.PayModeId)); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (input.OperateUserIds.Any()) |
|
|
|
|
|
{ |
|
|
|
|
|
query = query.Where(m => input.OperateUserIds.Contains(m.cardBill.CreatorId.Value)); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var queryList = query.ToList().GroupBy(g => g.cardRegister); |
|
|
var queryList = query.ToList().GroupBy(g => g.cardRegister); |
|
|
|
|
|
|
|
|
|