页面修改

Edu.Module.Course/EmployeeBonusModule.cs

@@ -118,7 +118,7 @@ namespace Edu.Module.Course
                             subItem.EmployeeName = empList?.Where(qitem => qitem.Id == subItem.EmployeeId)?.FirstOrDefault()?.EmployeeName ?? "";
                         }
                     }
-                    item.SumPrice = tempList?.Sum(qitem => qitem.CurRewardMoney+qitem.ClueNumSalary+qitem.OpenBonus-qitem.BeforeMoney)??0;
+                    item.SumPrice = tempList?.Sum(qitem => qitem.CurRewardMoney + qitem.ClueNumSalary + qitem.OpenBonus - qitem.BeforeMoney) ?? 0;
                     item.BonusList = tempList;
                 }
             }
@@ -136,10 +136,10 @@ namespace Edu.Module.Course
         public List<RB_Personnel_Bonus_Extend> GetPersonnelBonusPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Personnel_Bonus_Extend query)
         {
             var list = personnel_BonusRepository.GetPersonnelBonusPageRepository(pageIndex, pageSize, out rowsCount, query);
-            if (list != null&&list.Count>0)
+            if (list != null && list.Count > 0)
             {
                 string Ids = string.Join(",", list.Select(qitem => qitem.Id));
-                var detailList=  personnel_BonusDetailRepository.GetPersonnelBonusDetailListRepository(new RB_Personnel_BonusDetail_Extend()
+                var detailList = personnel_BonusDetailRepository.GetPersonnelBonusDetailListRepository(new RB_Personnel_BonusDetail_Extend()
                 {
                     QBonusIds = Ids
                 });
@@ -403,9 +403,9 @@ namespace Edu.Module.Course
                 });
             }
             pModel.HisBonusData = Common.Plugin.JsonHelper.Serialize(CurrentMonthBonusData);
-            
+
             //当月总业绩
-            var totalMoney = (pModel.CurRewardMoney + pModel.OpenBonus  + pModel.ClueNumSalary);
+            var totalMoney = (pModel.CurRewardMoney + pModel.OpenBonus + pModel.ClueNumSalary);
             if (totalMoney >= chaE)
             {
                 pModel.BeforeMoney = chaE;
@@ -445,7 +445,7 @@ namespace Edu.Module.Course
                             personnel_BonusLogRepository.AddPersonnelBonusLogRepository(sItem.Id, 1, 0, logContent);
 
                             //添加本月的日志
-                            string logContent2= "抵扣"+sItem.YearNum + "年" + sItem.MonthNum + "月, 人头奖励" + sItem.DeductionMoney;
+                            string logContent2 = "抵扣" + sItem.YearNum + "年" + sItem.MonthNum + "月, 人头奖励" + sItem.DeductionMoney;
                             personnel_BonusLogRepository.AddPersonnelBonusLogRepository(pModel.Id, 1, 0, logContent2);
                             tempChaE -= sItem.DeductionMoney;
                         }
@@ -476,7 +476,7 @@ namespace Edu.Module.Course
                     }
                 }
             }
-           
+
             foreach (var oItem in allOrderList)
             {
                 var detailModel = new RB_Personnel_BonusDetail()
@@ -572,7 +572,7 @@ namespace Edu.Module.Course
         /// <param name="Year">年份</param>
         /// <param name="Month">月份</param>
         /// <returns></returns>
-        public EmpStaticItem GetEmpBonusStaticModule(int EmpId,int Type, int Year, int Month)
+        public EmpStaticItem GetEmpBonusStaticModule(UserInfo user, int Type, int Year, int Month)
         {
             EmpStaticItem empItem = new EmpStaticItem();
             int CurrentYear = DateTime.Now.Year;
@@ -583,13 +583,38 @@ namespace Edu.Module.Course
                 //当月
                 if (Year == CurrentYear && Month == CurrentMonth)
                 {
-
+                    DateTime d1 = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
+                    string startDate = Common.ConvertHelper.FormatDate(d1);
+                    DateTime endTime = d1.AddMonths(1).AddDays(-1);
+                    //人头配置列表
+                    var planList = bonus_PlanRepository.GetBounsPlanListRepository(new RB_Bonus_PlanExtend()
+                    {
+                        Group_Id = user.Group_Id
+                    }, isGetDetail: true);
+                    if (planList != null && planList.Count > 0)
+                    {
+                        foreach (var item in planList)
+                        {
+                            var saleList = Common.ConvertHelper.StringToList(item.SaleIds);
+                            foreach (var saleId in saleList)
+                            {
+                                if (saleId == user.Id)
+                                {
+                                    string endDate = Common.ConvertHelper.FormatDate(endTime);
+                                    var orderList = GetSaleOrderList(item, user.Group_Id, endDate, saleId, out List<RB_Order_ViewModel> allOrderList);
+                                    empItem.GuestNum = orderList?.Sum(qitem => qitem.GuestNum) ?? 0;
+                                    empItem.OrderCount = allOrderList?.Count() ?? 0;
+                                    empItem.ReachCount = item.MonthGoalMoney > (orderList?.Sum(qitem => qitem.OrderMoney) ?? 0) ? 1 : 0,
+                                }
+                            }
+                        }
+                    }
                 }
                 else
                 {
                     var list = personnel_BonusRepository.GetPersonnelBonusListRepository(new RB_Personnel_Bonus_Extend()
                     {
-                        EmployeeId = EmpId,
+                        EmployeeId = user.Id,
                         YearNum = Year,
                         MonthNum = Month
                     }, isGetDetail: true);
@@ -604,29 +629,20 @@ namespace Edu.Module.Course
                         empItem.NextGoal = "";
                         empItem.NextBonus = 0;
                     }
-    
                 }
             }
             //年度统计
             else
             {
-                //当年
-                if (Year == CurrentYear && Month == CurrentMonth)
-                {
-
-                }
-                else
+                var list = personnel_BonusRepository.GetPersonnelBonusListRepository(new RB_Personnel_Bonus_Extend()
                 {
-                    var list = personnel_BonusRepository.GetPersonnelBonusListRepository(new RB_Personnel_Bonus_Extend()
-                    {
-                        EmployeeId = EmpId,
-                        YearNum = Year,
-                    }, isGetDetail: true);
-                    empItem.BonusMoney = list?.Sum(qitem => qitem.CurRewardMoney + qitem.ClueNumSalary + qitem.OpenBonus - qitem.BeforeMoney) ?? 0;
-                    empItem.GuestNum = list?.Sum(qitem => qitem.CurGuestNum) ?? 0;
-                    empItem.OrderCount = list?.Sum(qitem => qitem?.DeductionList?.Count) ?? 0;
-                    empItem.ReachCount = list?.Where(qitem => qitem.IsReach == 1)?.Count() ?? 0;
-                }
+                    EmployeeId = user.Id,
+                    YearNum = Year,
+                }, isGetDetail: true);
+                empItem.BonusMoney = list?.Sum(qitem => qitem.CurRewardMoney + qitem.ClueNumSalary + qitem.OpenBonus - qitem.BeforeMoney) ?? 0;
+                empItem.GuestNum = list?.Sum(qitem => qitem.CurGuestNum) ?? 0;
+                empItem.OrderCount = list?.Sum(qitem => qitem?.DeductionList?.Count) ?? 0;
+                empItem.ReachCount = list?.Where(qitem => qitem.IsReach == 1)?.Count() ?? 0;
             }
 
             return empItem;
@@ -636,8 +652,8 @@ namespace Edu.Module.Course
         /// 获取下一个目标
         /// </summary>
         public void GetNextGoal()
-        { 
-        
+        {
+
         }
     }
 
@@ -645,11 +661,11 @@ namespace Edu.Module.Course
     /// 员工人头奖励统计
     /// </summary>
     public class EmpStaticItem
-    { 
+    {
         /// <summary>
         /// 奖金
         /// </summary>
-       public decimal BonusMoney { get; set; }
+        public decimal BonusMoney { get; set; }
 
         /// <summary>
         /// 开单数量

Edu.WebApi/Controllers/User/UserCenterController.cs

@@ -2509,7 +2509,7 @@ namespace Edu.WebApi.Controllers.User
             int Type = base.ParmJObj.GetInt("Type");
             int Year = base.ParmJObj.GetInt("Year");
             int Month = base.ParmJObj.GetInt("Month");
-            var obj = employeeBonusModule.GetEmpBonusStaticModule(base.UserInfo.Id, Type,Year, Month);
+            var obj = employeeBonusModule.GetEmpBonusStaticModule(base.UserInfo, Type,Year, Month);
             return ApiResult.Success(data: obj);
         }