Commit 96ce4829 authored by 黄奎's avatar 黄奎

新增字段

parent 61b20c68
...@@ -133,5 +133,10 @@ namespace Edu.Model.Entity.Bonus ...@@ -133,5 +133,10 @@ namespace Edu.Model.Entity.Bonus
/// 线索条数 /// 线索条数
/// </summary> /// </summary>
public int ClueNum { get; set; } public int ClueNum { get; set; }
/// <summary>
/// 是否发放人头奖励[1-已发放,0-待发放]
/// </summary>
public int IsIssue { get; set; }
} }
} }
...@@ -381,8 +381,9 @@ namespace Edu.Module.Course ...@@ -381,8 +381,9 @@ namespace Edu.Module.Course
UpdateTime = DateTime.Now, UpdateTime = DateTime.Now,
DeductionMoney = DeductionMoney, DeductionMoney = DeductionMoney,
OpenBonus = curNum > 0 ? item.OpenBonus : 0, OpenBonus = curNum > 0 ? item.OpenBonus : 0,
ClueNum= stuModel?.ClueCount??0, ClueNum = stuModel?.ClueCount ?? 0,
ClueNumSalary = stuModel?.ClueCount > 5 ? item.ClueNumSalary : 0 ClueNumSalary = stuModel?.ClueCount > 5 ? item.ClueNumSalary : 0,
IsIssue = 0
}; };
pModel.IsReach = pModel.CurOrderMoney > item.MonthGoalMoney ? 1 : 0; pModel.IsReach = pModel.CurOrderMoney > item.MonthGoalMoney ? 1 : 0;
...@@ -712,7 +713,6 @@ namespace Edu.Module.Course ...@@ -712,7 +713,6 @@ namespace Edu.Module.Course
private EmpStaticItem GetYearDataModule(UserInfo user, int Year) private EmpStaticItem GetYearDataModule(UserInfo user, int Year)
{ {
int CurrentYear = DateTime.Now.Year; int CurrentYear = DateTime.Now.Year;
int CurrentMonth = DateTime.Now.Month;
EmpStaticItem yearData = new EmpStaticItem(); EmpStaticItem yearData = new EmpStaticItem();
var list = personnel_BonusRepository.GetPersonnelBonusListRepository(new RB_Personnel_Bonus_Extend() var list = personnel_BonusRepository.GetPersonnelBonusListRepository(new RB_Personnel_Bonus_Extend()
{ {
......
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