Commit af1a99b8 authored by 黄奎's avatar 黄奎

页面修改

parent 793c4472
...@@ -34,5 +34,10 @@ namespace Edu.Model.ViewModel.Bonus ...@@ -34,5 +34,10 @@ namespace Edu.Model.ViewModel.Bonus
/// 查询员工编号 /// 查询员工编号
/// </summary> /// </summary>
public string QEmployeeIds { get; set; } public string QEmployeeIds { get; set; }
/// <summary>
/// 期数编号【查询使用】
/// </summary>
public string QPeriodIds { get; set; }
} }
} }
...@@ -72,6 +72,18 @@ namespace Edu.Module.Course ...@@ -72,6 +72,18 @@ namespace Edu.Module.Course
public List<RB_Personnel_Period_Extend> GetPersonnelPeriodPageModule(int pageIdex, int pageSize, out long rowsCount, RB_Personnel_Period_Extend query) public List<RB_Personnel_Period_Extend> GetPersonnelPeriodPageModule(int pageIdex, int pageSize, out long rowsCount, RB_Personnel_Period_Extend query)
{ {
var list = personnel_PeriodRepository.GetPersonnelPeriodPageRepository(pageIdex, pageSize, out rowsCount, query); var list = personnel_PeriodRepository.GetPersonnelPeriodPageRepository(pageIdex, pageSize, out rowsCount, query);
if (list != null)
{
string ids = string.Join(",", list.Select(qitem => qitem.Id));
var bonusList = personnel_BonusRepository.GetPersonnelBonusListRepository(new RB_Personnel_Bonus_Extend()
{
QPeriodIds = ids
});
foreach (var item in list)
{
item.SumPrice = bonusList?.Where(qitem => qitem.PeriodId == item.Id)?.Sum(qitem => qitem.CurRewardMoney)??0;
}
}
return list; return list;
} }
......
...@@ -102,6 +102,14 @@ WHERE 1=1 ...@@ -102,6 +102,14 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND A.DeductionMoney<>A.FinishDeductionMoney "); builder.AppendFormat(" AND A.DeductionMoney<>A.FinishDeductionMoney ");
} }
if (query.PeriodId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Personnel_Bonus_Extend.PeriodId), query.PeriodId);
}
if (!string.IsNullOrEmpty(query.QPeriodIds))
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Personnel_Bonus_Extend.PeriodId), query.QPeriodIds);
}
} }
var list= Get<RB_Personnel_Bonus_Extend>(builder.ToString()).ToList(); var list= Get<RB_Personnel_Bonus_Extend>(builder.ToString()).ToList();
if (list != null && list.Count > 0) if (list != null && list.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