页面修改

Edu.Model/Entity/Bonus/RB_Personnel_Bonus.cs

@@ -128,5 +128,10 @@ namespace Edu.Model.Entity.Bonus
 		/// 当月人头奖励配置数据Json格式
 		/// </summary>
 		public string HisBonusData { get; set; }
+
+		/// <summary>
+		/// 线索条数
+		/// </summary>
+		public int ClueNum { get; set; }
 	}
 }

Edu.Module.Course/EmployeeBonusModule.cs

@@ -381,6 +381,7 @@ namespace Edu.Module.Course
                 UpdateTime = DateTime.Now,
                 DeductionMoney = DeductionMoney,
                 OpenBonus = curNum > 0 ? item.OpenBonus : 0,
+                ClueNum= stuModel?.ClueCount??0,
                 ClueNumSalary = stuModel?.ClueCount > 5 ? item.ClueNumSalary : 0
             };
             pModel.IsReach = pModel.CurOrderMoney > item.MonthGoalMoney ? 1 : 0;
@@ -624,14 +625,11 @@ namespace Edu.Module.Course
                 monthData.ClueNumSalary = list?.Sum(qitem => qitem.ClueNumSalary) ?? 0;
                 monthData.GuestNum = list?.Sum(qitem => qitem.CurGuestNum) ?? 0;
                 monthData.OrderCount = 0;
-                //线索奖励
-                var stuModel = studentRepository.GetStudentStaticRepository(user.Id.ToString(), startDate, endDate)?.FirstOrDefault();
-                monthData.ClueCount = stuModel?.ClueCount ?? 0;
+                monthData.ClueCount = list?.Sum(qitem=>qitem.ClueNum)??0;
                 foreach (var subItem in list)
                 {
                     monthData.OrderCount += subItem?.DetailList?.Count()??0;
                 }
-                    
                 monthData.ReachCount = list?.Where(qitem => qitem.IsReach > 0)?.Count() ?? 0;
                 if (list != null && list.Count > 0)
                 {
@@ -728,8 +726,9 @@ namespace Edu.Module.Course
                 yearData.ClueNumSalary = list?.Sum(qitem =>  qitem.ClueNumSalary)??0;
                 yearData.OpenBonus = list?.Sum(qitem => qitem.OpenBonus) ?? 0;
                 yearData.GuestNum = list?.Sum(qitem => qitem.CurGuestNum) ?? 0;
-                yearData.OrderCount = list?.Sum(qitem => qitem?.DeductionList?.Count) ?? 0;
+                yearData.OrderCount = list?.Sum(qitem => qitem?.DetailList?.Count) ?? 0;
                 yearData.ReachCount = list?.Where(qitem => qitem.IsReach == 1)?.Count() ?? 0;
+                yearData.ClueCount = list?.Sum(qitem => qitem.ClueNum) ?? 0;
             }
             if (Year == CurrentYear)
             {
@@ -741,6 +740,7 @@ namespace Edu.Module.Course
                 yearData.GuestNum += monData?.GuestNum ?? 0;
                 yearData.OrderCount += monData?.OrderCount ?? 0;
                 yearData.ReachCount += monData?.ReachCount ?? 0;
+                yearData.ClueCount += monData?.ClueCount ?? 0;
             }
             return yearData;
         }