Commit 7289144a authored by 黄奎's avatar 黄奎

页面修改

parent 41e70a35
...@@ -13,6 +13,8 @@ using Edu.Repository.User; ...@@ -13,6 +13,8 @@ using Edu.Repository.User;
using Edu.Model.CacheModel; using Edu.Model.CacheModel;
using Edu.AOP.CustomerAttribute; using Edu.AOP.CustomerAttribute;
using Edu.Model.ViewModel.User; using Edu.Model.ViewModel.User;
using Edu.Repository.Finance;
using Edu.Model.ViewModel.Finance;
namespace Edu.Module.Course namespace Edu.Module.Course
{ {
...@@ -66,6 +68,11 @@ namespace Edu.Module.Course ...@@ -66,6 +68,11 @@ namespace Edu.Module.Course
/// </summary> /// </summary>
private readonly RB_AccountRepository accountRepository = new RB_AccountRepository(); private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
/// <summary>
/// 财务单据
/// </summary>
private readonly RB_FinanceRepository financeRepository = new RB_FinanceRepository();
/// <summary> /// <summary>
/// 获取人头奖金期数分页列表 /// 获取人头奖金期数分页列表
...@@ -94,8 +101,15 @@ namespace Edu.Module.Course ...@@ -94,8 +101,15 @@ namespace Edu.Module.Course
QIds = empIds QIds = empIds
}); });
} }
string periodsIds = string.Join(",", list.Select(x => x.Id));
var financeList = financeRepository.GetListSingle(new RB_Finance_Extend() { RB_Group_Id = query.Group_Id, FinanceType = 2, OtherType = 21, ReFinanceIds = ids, IsSelectNormal = 1 });
foreach (var item in list) foreach (var item in list)
{ {
var flist = financeList.Where(x => x.ReFinanceId == item.Id).Select(x => x.FrID);
if (flist.Any())
{
item.Financials = string.Join(",", flist);
}
var tempList = bonusList?.Where(qitem => qitem.PeriodId == item.Id)?.ToList(); var tempList = bonusList?.Where(qitem => qitem.PeriodId == item.Id)?.ToList();
if (tempList != null && tempList.Count > 0) if (tempList != null && tempList.Count > 0)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment