页面修改

Edu.Module.Course/EmployeeBonusModule.cs

@@ -637,8 +637,10 @@ namespace Edu.Module.Course
                 {
                     //历史人头提成方案
                     var hisModel = JsonHelper.DeserializeObject<CurrentMonthBonusData>(list?.FirstOrDefault()?.HisBonusData);
-                    GetNextGoal(monthData.GuestNum, hisModel, out int CurrentStep, out string NextGoal, out decimal NextBonus);
+                    GetNextGoal(monthData.GuestNum, hisModel, out int CurrentStep,out decimal StartNum,out decimal EndNum, out string NextGoal, out decimal NextBonus);
                     monthData.CurrentStep = CurrentStep;
+                    monthData.StartNum = StartNum;
+                    monthData.EndNum = EndNum;
                     monthData.NextGoal = NextGoal;
                     monthData.NextBonus = NextBonus;
                 }
@@ -647,7 +649,7 @@ namespace Edu.Module.Course
         }
 
         /// <summary>
-        /// 获取当月数据
+        /// 计算当月人头奖励数据
         /// </summary>
         /// <param name="user"></param>
         private EmpStaticItem GetCurrentMonthData(UserInfo user)
@@ -684,8 +686,10 @@ namespace Edu.Module.Course
                             var stuModel = studentRepository.GetStudentStaticRepository(saleId.ToString(), startDate, endDate)?.FirstOrDefault();
                             decimal ClueNumSalary = stuModel?.ClueCount > 5 ? item.ClueNumSalary : 0;
 
-                            GetCurrentGoal(monthData.GuestNum, item, out int CurrentStep, out string NextGoal, out decimal awardAmount);
+                            GetCurrentGoal(monthData.GuestNum, item, out int CurrentStep,out decimal StartNum,out decimal EndNum, out string NextGoal, out decimal awardAmount);
                             monthData.CurrentStep = CurrentStep;
+                            monthData.StartNum = StartNum;
+                            monthData.EndNum = EndNum;
                             monthData.NextGoal = NextGoal;
                             monthData.NextBonus = awardAmount;
                             monthData.CurRewardMoney = CurRewardMoney;
@@ -749,11 +753,13 @@ namespace Edu.Module.Course
         /// <param name="CurrentStep"></param>
         /// <param name="NextGoal"></param>
         /// <param name="awardAmount"></param>
-        public void GetNextGoal(int GuestNum, CurrentMonthBonusData hisData, out int CurrentStep, out string NextGoal, out decimal awardAmount)
+        public void GetNextGoal(int GuestNum, CurrentMonthBonusData hisData, out int CurrentStep,out decimal StartNum,out decimal EndNum, out string NextGoal, out decimal awardAmount)
         {
             awardAmount = 0;
             NextGoal = "";
             CurrentStep = 1;
+            StartNum = 0;
+            EndNum = 0;
             if (hisData != null && hisData.DetailList != null && hisData.DetailList.Count > 0)
             {
                 var firstStep = hisData.DetailList[0];
@@ -762,6 +768,8 @@ namespace Edu.Module.Course
                     CurrentStep = 1;
                     NextGoal = string.Format("距{0}档还差{1}个", 1, firstStep.StartNum - GuestNum);
                     awardAmount = firstStep.Money;
+                    StartNum = firstStep.StartNum;
+                    EndNum = firstStep.EndNum;
                 }
                 else
                 {
@@ -770,10 +778,13 @@ namespace Edu.Module.Course
                         var tempNum = hisData.DetailList[i];
                         if (tempNum.StartNum <= GuestNum && GuestNum <= tempNum.EndNum)
                         {
+                            StartNum = tempNum.StartNum;
+                            EndNum = tempNum.EndNum;
                             if ((i + 1) < hisData.DetailList.Count)
                             {
                                 CurrentStep = (i + 1);
                                 awardAmount = hisData.DetailList[i + 1].Money;
+                                
                                 NextGoal = string.Format("距{0}档还差{1}个", (i + 1 + 1), hisData.DetailList[i + 1].StartNum - GuestNum);
                             }
                             else
@@ -796,11 +807,13 @@ namespace Edu.Module.Course
         /// <param name="CurrentStep"></param>
         /// <param name="NextGoal"></param>
         /// <param name="awardAmount"></param>
-        public void GetCurrentGoal(int GuestNum, RB_Bonus_PlanExtend hisData, out int CurrentStep, out string NextGoal, out decimal awardAmount)
+        public void GetCurrentGoal(int GuestNum, RB_Bonus_PlanExtend hisData, out int CurrentStep,out decimal StartNum,out decimal EndNum, out string NextGoal, out decimal awardAmount)
         {
             awardAmount = 0;
             NextGoal = "";
             CurrentStep = 1;
+            StartNum = 0;
+            EndNum = 0;
             if (hisData != null && hisData.DetailList != null && hisData.DetailList.Count > 0)
             {
                 var firstStep = hisData.DetailList[0];
@@ -809,6 +822,8 @@ namespace Edu.Module.Course
                     CurrentStep = 1;
                     NextGoal = string.Format("距{0}档还差{1}个", 1, firstStep.StartNum - GuestNum);
                     awardAmount = firstStep.Money;
+                    StartNum = firstStep.StartNum;
+                    EndNum = firstStep.EndNum;
                 }
                 else
                 {
@@ -817,6 +832,8 @@ namespace Edu.Module.Course
                         var tempNum = hisData.DetailList[i];
                         if (tempNum.StartNum <= GuestNum && GuestNum <= tempNum.EndNum)
                         {
+                            StartNum = tempNum.StartNum;
+                            EndNum = tempNum.EndNum;
                             if ((i + 1) < hisData.DetailList.Count)
                             {
                                 CurrentStep = (i + 1);
@@ -871,6 +888,16 @@ namespace Edu.Module.Course
         /// </summary>
         public int GuestNum { get; set; }
 
+        /// <summary>
+        /// 开始人数
+        /// </summary>
+        public decimal StartNum { get; set; }
+
+        /// <summary>
+        /// 结束人数
+        /// </summary>
+        public decimal EndNum { get; set; }
+
         /// <summary>
         /// 是否达到月度业绩目标
         /// </summary>