Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Cache/User/UserReidsCache.cs

@@ -79,6 +79,7 @@ namespace Edu.Cache.User
         }
  
 
+
         /// <summary>
         /// 获取缓存
         /// </summary>
@@ -139,13 +140,25 @@ namespace Edu.Cache.User
                                 Id = model.Id,
                                 Group_Id = model.Group_Id,
                                 School_Id = model.School_Id,
+                                AccountType=model.AccountType,
                                 AccountName = model.AccountName,
                                 GroupName = model.GroupName,
                                 SchoolName = model.SchoolName,
                                 Token = token,
                                 ApiRequestFromEnum = apiRequestFromEnum,
                                 DeptId = model.Dept_Id,
-                                PostId = model.Post_Id
+                                PostId = model.Post_Id,
+                                AccountId = model.AccountId,
+                                UserMobile = model.Account,
+                                ErpToken = "",
+                                MallToken = "",
+                                JHMallBaseId = "",
+                                JHTenantId = "",
+                                GroupLogo = model.GroupLogo,
+                                UserIcon = model.UserIcon,
+                                DeptName = model.DeptName,
+                                PostName = model.PostName,
+                                Email = model.Email,
                             };
                             UserInfoSet(Cache.CacheKey.User_Login_Key + Id.ToString(), userInfo, Common.Config.JwtExpirTime);
                         }
@@ -158,5 +171,15 @@ namespace Edu.Cache.User
             }
             return userInfo;
         }
+
+        /// <summary>
+        /// 清除用户缓存
+        /// </summary>
+        /// <param name="Id"></param>
+        public static void ClearUserLoginCache(object Id)
+        {
+            string cacheKey = Cache.CacheKey.User_Login_Key + Id.ToString();
+            redis.KeyDelete(cacheKey);
+        }
     }
 }
\ No newline at end of file

Edu.Model/Entity/Course/RB_Class_LessonPlan.cs

@@ -93,5 +93,16 @@ namespace Edu.Model.Entity.Course
         /// 删除状态(0-正常,1-禁用)
         /// </summary>
         public DateStateEnum Status { get; set; }
+
+
+        /// <summary>
+        /// 课后总结
+        /// </summary>
+        public string Summary { get; set; }
+
+        /// <summary>
+        /// 教案图片
+        /// </summary>
+        public string ProjectPic { get; set; }
     }
 }

Edu.Model/Entity/Course/RB_Class_LessonPlanDetails.cs

@@ -49,5 +49,10 @@ namespace Edu.Model.Entity.Course
         /// </summary>
         public int School_Id { get; set; }
 
+        /// <summary>
+        /// 教案图片
+        /// </summary>
+        public string ProjectPic { get; set; }
+
     }
 }

Edu.Model/ViewModel/Course/RB_Class_Check_ViewModel.cs

@@ -180,5 +180,9 @@ namespace Edu.Model.ViewModel.Course
                 return str;
             }
         }
+        /// <summary>
+        ///上课时间ids
+        /// </summary>
+        public string ClassTimeIds { get; set; }
     }
 }

Edu.Model/ViewModel/Course/RB_Class_LessonPlanDetails_ViewModel.cs

@@ -16,5 +16,11 @@ namespace Edu.Model.ViewModel.Course
         /// 结束时间
         /// </summary>
         public string DurationEndTime { get; set; }
+
+
+        /// <summary>
+        /// 教案图片
+        /// </summary>
+        public List<string> ProjectPicList { get; set; }
     }
 }

Edu.Model/ViewModel/Course/RB_Class_LessonPlan_ViewModel.cs

@@ -26,5 +26,10 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public int Rest { get; set; }
 
+        /// <summary>
+        /// 总结图片
+        /// </summary>
+        public List<string> ProjectPicList { get; set; }
+
     }
 }

Edu.Model/ViewModel/Course/RB_Class_Plan_ViewModel.cs

@@ -98,6 +98,12 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public int LessonPlanNum { get; set; }
 
+
+        /// <summary>
+        /// 反馈情况》0已反馈
+        /// </summary>
+        public int LessonPlanSummaryNum { get; set; }
+
         /// <summary>
         /// 学生id
         /// </summary>
@@ -117,5 +123,10 @@ namespace Edu.Model.ViewModel.Course
         /// 上课计划时间id
         /// </summary>
         public int ClassTimeId { get; set; }
+
+        /// <summary>
+        /// 第几次上课
+        /// </summary>
+       public object Ranks { get; set; }
     }
 }

Edu.Model/ViewModel/Course/RB_Class_Time_ViewModel.cs

@@ -51,6 +51,9 @@ namespace Edu.Model.ViewModel.Course
         public int ClassRoomId { get; set; }
 
         /// <summary>
+        ///班级学员
+        /// </summary>
+        public List<RB_Order_Guest_ViewModel> GuestList { get; set; }
         /// 上课分钟数
         /// </summary>
         public int TimeMinute { get; set; }

Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs

@@ -88,8 +88,6 @@ namespace Edu.Model.ViewModel.Course
             get; set;
         }
 
-
-
         /// <summary>
         /// 课程编号
         /// </summary>

Edu.Module.Course/SellCommissionModule.cs

@@ -286,6 +286,40 @@ namespace Edu.Module.Course
 
         }
 
+
+
+        /// <summary>
+        /// 确认销售提成
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool UpdateSureSellCommission(int UserId, int Id)
+        {
+            IDictionary<string, object> fileds = new Dictionary<string, object>
+                {
+                    { nameof(RB_Sell_Commission_Details_ViewModel.SureStatus), 1 },
+
+                };
+            IList<WhereHelper> auditrecordWhereHelpers = new List<WhereHelper>
+                    {
+                        new WhereHelper()
+                        {
+                            FiledName = nameof(RB_Sell_Commission_Details_ViewModel.Id),
+                            FiledValue = Id,
+                            OperatorEnum = OperatorEnum.Equal
+                        },
+                         new WhereHelper()
+                        {
+                            FiledName = nameof(RB_Sell_Commission_Details_ViewModel.UserId),
+                            FiledValue = UserId,
+                            OperatorEnum = OperatorEnum.Equal
+                        }
+                    };
+            return sell_Commission_DetailsRepository.Update(fileds, auditrecordWhereHelpers);
+
+        }
+
+
         /// <summary>
         /// 获取提成统计
         /// </summary>
@@ -1623,7 +1657,8 @@ namespace Edu.Module.Course
             var model = sell_Commission_PeriodsRepository.GetEntity(periodId);
             if (model == null) { return "周期不存在"; }
             List<int> EmpIdList = new List<int>();
-            if (!string.IsNullOrEmpty(model.EmpIds)) {
+            if (!string.IsNullOrEmpty(model.EmpIds))
+            {
                 EmpIdList = JsonHelper.DeserializeObject<List<int>>("[" + model.EmpIds + "]");
             }
             var list = GetSellCommissionUserList(new RB_Sell_Commission_Details_ViewModel() { Group_Id = userInfo.Group_Id, PeriodId = periodId });
@@ -1654,8 +1689,10 @@ namespace Edu.Module.Course
                 EmpIdList = JsonHelper.DeserializeObject<List<int>>("[" + model.EmpIds + "]");
             }
             List<int> NewIdList = JsonHelper.DeserializeObject<List<int>>("[" + empIds + "]");
-            foreach (var item in NewIdList) {
-                if (EmpIdList.Contains(item)) {
+            foreach (var item in NewIdList)
+            {
+                if (EmpIdList.Contains(item))
+                {
                     return "用户ID" + item + "已发放了提成，无法重复发放";
                 }
             }

Edu.Module.Course/TeachingRewardsModule.cs

@@ -871,6 +871,170 @@ namespace Edu.Module.Course
             return teaching_BonusDetailRepository.GetListByTeacherId(demodel);
         }
 
+
+
+
+        /// <summary>
+        /// 新增教师奖励
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <param name="userInfo"></param>
+        /// <returns></returns>
+        public List<RB_Teaching_BonusDetail_ViewModel> GetEstimateTeachingBonusAdd(RB_Teaching_Bonus_ViewModel dmodel, UserInfo userInfo)
+        {
+            //验证当月教师是否已存在奖励
+            var tlist = teaching_BonusRepository.GetList(new RB_Teaching_Bonus_ViewModel() { Group_Id = userInfo.Group_Id, Month = Convert.ToDateTime(dmodel.Month).ToString("yyyy-MM") }).Where(x => x.State != BonusStateEnum.Cancel).ToList();
+            if (tlist.Any())
+            {
+                string[] teacherArr = dmodel.TeacherIds.Split(',');
+                foreach (var item in tlist)
+                {
+                    foreach (var qitem in teacherArr)
+                    {
+                        if (("," + item.TeacherIds + ",").Contains("," + qitem + ","))
+                        {
+                            return new List<RB_Teaching_BonusDetail_ViewModel>();
+                        }
+                    }
+                }
+            }
+            //基础配置
+            var configModel = class_ConfigRepository.GetClassConfigRepository(new RB_Class_Config_ViewModel() { Group_Id = userInfo.Group_Id });
+            if (configModel == null || configModel.BasicHourFee <= 0 || configModel.BasicMinutes <= 0) { return new List<RB_Teaching_BonusDetail_ViewModel>(); }
+           
+
+            //查询当月 老师对应所有的课程
+            string StartTime = dmodel.Month + "-01";
+            string EndTime = Convert.ToDateTime(dmodel.Month + "-01").AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
+            var plist = class_PlanRepository.GetClassPlanList_V2(new RB_Class_Plan_ViewModel() { Group_Id = userInfo.Group_Id, Q_TeacherIds = dmodel.TeacherIds, StartTime = StartTime, EndTime = EndTime });
+            //查询所有课程的上课时间
+            List<RB_Class_Type_ViewModel> typeList = new List<RB_Class_Type_ViewModel>();
+            List<RB_Class_Check_ViewModel> checkList = new List<RB_Class_Check_ViewModel>();
+            List<RB_Teacher_ViewModel> teacherList = new List<RB_Teacher_ViewModel>();
+            List<RB_Teaching_BonusDetail_ViewModel> DateList = new List<RB_Teaching_BonusDetail_ViewModel>();
+            List<RB_Teaching_BonusDetail_ViewModel> resultdetailList = new List<RB_Teaching_BonusDetail_ViewModel>();
+            if (plist.Any())
+            {
+                string pids = string.Join(",", plist.Select(x => x.ClassPlanId));
+                string classTypeIds = string.Join(",", plist.Select(x => x.ClassType).Distinct());
+                typeList = class_TypeRepository.GetClassTypeListRepository(new RB_Class_Type_ViewModel() { Group_Id = userInfo.Group_Id, Q_CTypeIds = classTypeIds });
+                //查询签到数据
+                string classIds = string.Join(",", plist.Select(x => x.ClassId).Distinct());
+                checkList = class_CheckRepository.GetClassCheckStatistics(new RB_Class_Check_ViewModel() { Group_Id = userInfo.Group_Id, Q_ClassIds = classIds, StartDate = StartTime, EndDate = EndTime });
+                //查询教师列表
+                string teacherIds = string.Join(",", plist.Select(x => x.TeacherId).Distinct());
+                teacherList = teacherRepository.GetTeacherListRepository(new RB_Teacher_ViewModel() { QTIds = teacherIds });
+
+                //根据学生签到表  查询
+                var list = class_CheckRepository.GetTeacherConsumptionHoursDetialList(teacherIds, -1, 0, StartTime, EndTime, userInfo.Group_Id);
+                if (list.Any())
+                {
+                    foreach (var item in list)
+                    {
+                        //上课课时
+                        decimal KSNum = item.CurrentDeductionHours;//使用签到表的课时
+
+                        var typeModel = typeList.Where(x => x.CTypeId == item.ClassType).FirstOrDefault();
+
+                        decimal unitPrice = configModel.BasicHourFee + (typeModel?.AddHourFee ?? 0) + (item?.BaseHourFee ?? 0);
+                        //课时费  需要每个班级  单独计算  因为 班级有附加费用
+                        decimal KSMoney = KSNum * unitPrice;
+
+                        DateList.Add(new RB_Teaching_BonusDetail_ViewModel
+                        {
+                            Date = item.ClassDate,
+                            TimeBucket = item.StartDate + "~" + item.EndDate,
+                            TeacherId = item.TeacherId,
+                            TeacherName = item.TeacherName,
+                            ClassId = item.ClassId,
+                            ClassName = item.ClassName,
+                            CouseId = item.CouseId,
+                            CourseName = item.CourseName,
+                            KSNum = KSNum,
+                            UnitPrice = unitPrice,
+                            Money = KSMoney
+                        });
+                    }
+                }
+            }
+           
+            try
+            {
+                
+                foreach (var item in plist)
+                {
+                    var dateqList = DateList.Where(x => x.TeacherId == item.TeacherId && x.Date == item.ClassDate).ToList();
+                    //查询课时
+                    decimal ksNum = dateqList.Sum(x => x.KSNum);
+                    //查询课单价
+                    var typeModel = typeList.Where(x => x.CTypeId == item.ClassType).FirstOrDefault();
+                    var teacherModel = teacherList.Where(x => x.TId == item.TeacherId).FirstOrDefault();
+                    decimal unitPrice = configModel.BasicHourFee + (typeModel?.AddHourFee ?? 0) + (teacherModel?.BaseHourFee ?? 0);
+                    //签到人数
+                    var checkModel = checkList.Where(x => x.ClassId == item.ClassId && x.ClassDate == item.ClassDate).FirstOrDefault();
+
+                    resultdetailList.Add(new RB_Teaching_BonusDetail_ViewModel()
+                    {
+                        BonusId = 0,
+                        CheckInNum = checkModel?.CheckNum ?? 0,
+                        ClassId = item.ClassId,
+                        CourseHour = ksNum,
+                        CreateBy = dmodel.CreateBy,
+                        CreateTime = DateTime.Now,
+                        Date = item.ClassDate,
+                        Group_Id = dmodel.Group_Id,
+                        Id = 0,
+                        Money = ksNum * unitPrice,
+                        School_Id = dmodel.School_Id,
+                        Status = 0,
+                        TeacherId = item.TeacherId,
+                        Type = item.TeacherId == item.Teacher_Id ? 1 : 2,
+                        UnitPrice = unitPrice,
+                        UpdateBy = dmodel.UpdateBy,
+                        UpdateTime = DateTime.Now
+                    });
+                }
+                return resultdetailList;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "GetEstimateTeachingBonusAdd");
+                return new List<RB_Teaching_BonusDetail_ViewModel> ();
+            }
+        }
+
+
+
+        /// <summary>
+        /// 确认老师课时费
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool UpdateSureTeachingBonusDetail(int TeacherId, int Id)
+        {
+            IDictionary<string, object> fileds = new Dictionary<string, object>
+                {
+                    { nameof(RB_Teaching_BonusDetail_ViewModel.SureStatus), 1 },
+
+                };
+            IList<WhereHelper> auditrecordWhereHelpers = new List<WhereHelper>
+                    {
+                        new WhereHelper()
+                        {
+                            FiledName = nameof(RB_Teaching_BonusDetail_ViewModel.Id),
+                            FiledValue = Id,
+                            OperatorEnum = OperatorEnum.Equal
+                        },
+                         new WhereHelper()
+                        {
+                            FiledName = nameof(RB_Teaching_BonusDetail_ViewModel.TeacherId),
+                            FiledValue = TeacherId,
+                            OperatorEnum = OperatorEnum.Equal
+                        }
+                    };
+            return teaching_BonusDetailRepository.Update(fileds, auditrecordWhereHelpers);
+
+        }
         #endregion
 
         #region 教师绩效

Edu.Module.OKR/OKRPeriodModule.cs

@@ -4784,6 +4784,8 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
         /// <param name="userInfo"></param>
         /// <returns></returns>
         public object GetOKRMyEmployeeList(UserInfo userInfo)
+        {
+            try
             {
                 var deptModel = departmentRepository.GetEntity(userInfo.DeptId);
                 List<int> UserIdList = new List<int>();
@@ -5069,6 +5071,12 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
                     })
                 };
             }
+            catch (Exception ex)
+            {
+                Common.Plugin.LogHelper.Write(ex, "GetOKRMyEmployeeList:userInfo" + Common.Plugin.JsonHelper.Serialize(userInfo));
+            }
+            return new object();
+        }
 
         /// <summary>
         /// 根据部门获取部门下所有人员

Edu.Repository/Course/RB_Class_CheckRepository.cs

@@ -245,6 +245,10 @@ GROUP BY A.ClassId
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Check_ViewModel.ClassTimeId), query.ClassTimeId);
                 }
+                if (!string.IsNullOrWhiteSpace(query.ClassTimeIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in ({1}) ", nameof(RB_Class_Check_ViewModel.ClassTimeId), query.ClassTimeIds);
+                }
             }
 
             return Get<RB_Class_Check_ViewModel>(builder.ToString()).ToList();

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -369,15 +369,16 @@ WHERE p.`Status`=0 AND p.Group_Id={group_Id} AND p.ClassId ={classId}
         public List<RB_Class_Plan_ViewModel> GetTeacherPlanListRepository(RB_Class_Plan_ViewModel query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.AppendFormat(@"
-SELECT A.*,class.ClassName,lp.LessonPlanNum,IFNULL(B.RoomName,'') AS RoomName,IFNULL(T.TeacherName,'') AS TeacherName,IFNULL(T.TeacherHead,'') AS UserIcon
-FROM RB_Class_Plan AS A LEFT JOIN rb_class_room AS B ON A.ClassRoomId=B.RoomId
-LEFT JOIN rb_class as class on a.ClassId=class.ClassId
-     LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
-LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanNum from rb_class_lessonplan where `Status`=0  GROUP BY ClassPlanId)as lp on a.ClassPlanId=lp.ClassPlanId
-WHERE 1=1 and class.ClassStatus=2 and  t.`Status`=0
-");
-            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
+            //builder.AppendFormat(@"
+            //            SELECT A.*,class.ClassName,lp.LessonPlanNum,lps.LessonPlanSummaryNum,IFNULL(B.RoomName,'') AS RoomName,IFNULL(T.TeacherName,'') AS TeacherName,IFNULL(T.TeacherHead,'') AS UserIcon
+            //            FROM RB_Class_Plan AS A LEFT JOIN rb_class_room AS B ON A.ClassRoomId=B.RoomId
+            //            LEFT JOIN rb_class as class on a.ClassId=class.ClassId
+            //                 LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
+            //            LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanNum from rb_class_lessonplan where `Status`=0  GROUP BY ClassPlanId)as lp on a.ClassPlanId=lp.ClassPlanId
+            //LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanSummaryNum from rb_class_lessonplan where `Status`=0  and  ISNULL(Summary)=0 and LENGTH(trim(Summary))>0  GROUP BY ClassPlanId)as lps on a.ClassPlanId=lps.ClassPlanId                      
+            //WHERE 1=1 and class.ClassStatus=2 and  t.`Status`=0
+            //            ");
+            // builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
             if (query != null)
             {
                 if (query.ClassId > 0)
@@ -406,18 +407,42 @@ WHERE 1=1 and class.ClassStatus=2 and  t.`Status`=0
                 }
                 if (!string.IsNullOrEmpty(query.QMonth))
                 {
-                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%y/%m')= DATE_FORMAT('{1}-01','%y/%m') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.QMonth);
+                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},''%y/%m'')= DATE_FORMAT(''{1}-01'',''%y/%m'') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.QMonth);
                 }
                 if (!string.IsNullOrEmpty(query.StartTime))
                 {
-                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%y-%m-%d')>=DATE_FORMAT('{1}','%y-%m-%d') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.StartTime);
+                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},''%y-%m-%d'')>=DATE_FORMAT(''{1}'',''%y-%m-%d'') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.StartTime);
                 }
                 if (!string.IsNullOrEmpty(query.EndTime))
                 {
-                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%y-%m-%d')<=DATE_FORMAT('{1}','%y-%m-%d') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.EndTime);
+                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},''%y-%m-%d'')<=DATE_FORMAT(''{1}'',''%y-%m-%d'') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.EndTime);
                 }
             }
-            return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
+
+            //   return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
+
+            ////            string sql = $@"
+            ////SELECT * from (SELECT IF
+            ////	(
+            ////		@class = a.ClassId,
+            ////	IF
+            ////		( @score = a.ClassDate, @rank := @rank, @rank := @colum + 1 ),
+            ////		@rank := 1 
+            ////	) AS Ranks,
+            ////IF
+            ////	( @class = a.ClassId, @colum := @colum + 1, @colum := 1 ) AS colums,
+            //// 	(@class := a.ClassId) as rr,
+            //// (	@score := a.ClassDate) as yy ,
+            ////A.*,class.ClassName,lp.LessonPlanNum,IFNULL(B.RoomName,'') AS RoomName,IFNULL(T.TeacherName,'') AS TeacherName,IFNULL(T.TeacherHead,'') AS UserIcon
+            ////FROM RB_Class_Plan AS A LEFT JOIN rb_class_room AS B ON A.ClassRoomId=B.RoomId
+            ////LEFT JOIN rb_class as class on a.ClassId=class.ClassId
+            ////     LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
+            ////LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanNum from rb_class_lessonplan where `Status`=0  GROUP BY ClassPlanId)as lp on a.ClassPlanId=lp.ClassPlanId,
+            ////( SELECT @rank := 0, @class := 0, @score := '2020-01-01', @colum := 0 ) r
+            ////WHERE 1=1 and class.ClassStatus=2 and  t.`Status`=0 and  a.`Status`=0 ORDER BY a.ClassId,a.ClassDate) as a where 1=1 {builder.ToString()} ";
+
+            string sql = $@"CALL proc_GetClassPlanRank('{builder.ToString()}')";
+            return Get<RB_Class_Plan_ViewModel>(sql).ToList();
         }
 
 
@@ -550,9 +575,9 @@ GROUP BY A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassRoomId,A.CompleteProgress
     join rb_class_plan d on c.ClassPlanId = d.ClassPlanId
 
     where d.ClassDate < b.ClassDate and c.ClassId = b.ClassId)
-from rb_class_plan b where b.ClassPlanId = "+planId+" and b.`Status`= 0";
+from rb_class_plan b where b.ClassPlanId = " + planId + " and b.`Status`= 0";
             object obj = ExecuteScalar(sql);
-            return Convert.IsDBNull(obj)?-1:Convert.ToDouble(obj);
+            return Convert.IsDBNull(obj) ? -1 : Convert.ToDouble(obj);
         }
     }
 }
\ No newline at end of file

Edu.Repository/Course/RB_Student_MakeupRepository.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using VT.FW.DB;
 using VT.FW.DB.Dapper;
 
 namespace Edu.Repository.Course
@@ -73,5 +74,50 @@ WHERE 1=1
             builder.Append(" ORDER BY A.ClassId,A.ClassDate,A.OrderGuestId ");
             return GetPage<RB_Student_Makeup_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
+
+        /// <summary>
+        /// 新增修改学员补课信息
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetStudentMakeUpRepository(RB_Student_Makeup model)
+        {
+            bool flag = false;
+            var newModel = new RB_Student_Makeup()
+            {
+                Id = 0,
+                ClassCheckId = model.ClassCheckId,
+                ClassDate = model.ClassDate,
+                ClassId = model.ClassId,
+                CreateBy = model.CreateBy,
+                CreateTime = model.CreateTime,
+                Group_Id = model.Group_Id,
+                MakeUpStatus = 3,
+                OrderGuestId = model.OrderGuestId
+            };
+            newModel.Id = CheckStudentMakeUpExistsRepository(model);
+            if (newModel.Id > 0)
+            {
+                flag = base.Insert(newModel) > 0;
+            }
+            else
+            {
+                flag = base.Update(newModel);
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 检查数据是否存在
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int CheckStudentMakeUpExistsRepository(RB_Student_Makeup model)
+        {
+            List<WhereHelper> whereHelpers = new List<WhereHelper>();
+            whereHelpers.Add(new WhereHelper(nameof(RB_Student_Makeup.ClassCheckId), model.ClassCheckId));
+            whereHelpers.Add(new WhereHelper(nameof(RB_Student_Makeup.OrderGuestId), model.OrderGuestId));
+            return base.Exists("Id", whereHelpers);
+        }
     }
 }

Edu.Repository/Course/RB_Teaching_BonusDetailRepository.cs

@@ -341,7 +341,7 @@ where {where}";
             {
                 where += $@" and DATE_FORMAT(STR_TO_DATE(CONCAT(b.Month,'-01'),'%Y-%m-%d'),'%Y-%m-%d')>=DATE_FORMAT('{demodel.Month}','%Y-%m-%d')";
             }
-            string sql = $@" select A.*,,b.`Month` from RB_Teaching_BonusDetail   as A  LEFT JOIN rb_teaching_bonus as b on a.BonusId=b.Id   where {where} order by a.Id desc";
+            string sql = $@" select A.*,b.`Month` from RB_Teaching_BonusDetail   as A  LEFT JOIN rb_teaching_bonus as b on a.BonusId=b.Id   where {where} order by a.Id desc";
             return Get<RB_Teaching_BonusDetail_ViewModel>(sql).ToList();
         }
 

Edu.Repository/Question/RB_QuestionRepository.cs

@@ -74,7 +74,11 @@ WHERE 1=1 ");
                 }
                 if (!string.IsNullOrEmpty(query.Title))
                 {
-                    builder.AppendFormat(" AND A.{0} LIKE @Title ", nameof(RB_Question_ViewModel.Title));
+                    builder.AppendFormat(" AND (A.{0} LIKE @Title OR A.{1} LIKE @Title OR A.{2} LIKE @Title) "
+                        ,nameof(RB_Question_ViewModel.Title)
+                        ,nameof(RB_Question_ViewModel.QuestionContent)
+                        ,nameof(RB_Question_ViewModel.AnswerParse)
+                    );
                     parameters.Add("Title", "%" + query.Title.Trim() + "%");
                 }
                 if (!string.IsNullOrEmpty(query.PointName))

Edu.WebApi/Controllers/Course/ClassRoomController.cs

@@ -232,7 +232,7 @@ namespace Edu.WebApi.Controllers.Course
 
 
         /// <summary>
-        /// 老师上课计划统计
+        /// 教室使用记录
         /// </summary>
         /// <returns></returns>
         public ApiResult GetNewClassRoomTimeList()

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -519,7 +519,14 @@ namespace Edu.WebApi.Controllers.Course
         [HttpPost]
         public ApiResult GetChapterTree()
         {
-            var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Course_Chapter_ViewModel>(RequestParm.Msg.ToString());
+            var query = new RB_Course_Chapter_ViewModel()
+            {
+                CourseId = base.ParmJObj.GetInt("CourseId"),
+            };
+            if (query.CourseId <= 0)
+            {
+                return ApiResult.ParamIsNull(message: "请传递课程编号!");
+            }
             query.Group_Id = base.UserInfo.Group_Id;
             query.School_Id = base.UserInfo.School_Id;
             var list = courseModule.GetChapterTreeListModule(query);
@@ -556,7 +563,12 @@ namespace Edu.WebApi.Controllers.Course
         [HttpPost]
         public ApiResult BatchRemoveChapter()
         {
-            var extModel = Common.Plugin.JsonHelper.DeserializeObject<RB_Course_Chapter_ViewModel>(RequestParm.Msg.ToString());
+            var extModel = new RB_Course_Chapter_ViewModel()
+            {
+                CourseId=base.ParmJObj.GetInt("CourseId"),
+                ChapterNo=base.ParmJObj.GetStringValue("ChapterNo"),
+                ChapterId=base.ParmJObj.GetInt("ChapterId"),
+            };
             bool flag = courseModule.BatchRemoveChapterModule(extModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }

Edu.WebApi/Controllers/Duty/DutyPlanController.cs

@@ -357,7 +357,15 @@ namespace Edu.WebApi.Controllers.Duty
         public ApiResult DutyCheck()
         {
             var Id = base.ParmJObj.GetInt("Id");
+            if (Id <= 0)
+            {
+                return ApiResult.ParamIsNull(message: "请传递值班编号!");
+            }
             var Shift = base.ParmJObj.GetInt("Shift");
+            if (Shift <= 0)
+            {
+                return ApiResult.ParamIsNull(message: "请传递值班班次!");
+            }
             var Status = base.ParmJObj.GetInt("Status");
             //突发事件
             int IsBurst = base.ParmJObj.GetInt("IsBurst");

Edu.WebApi/Controllers/Finance/FinanceController.cs

@@ -1349,7 +1349,7 @@ namespace Edu.WebApi.Controllers.Finance
             }
             catch (Exception ex)
             {
-                LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList");
+                LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList:" + Common.Plugin.JsonHelper.Serialize(dmodel));
                 var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
                 return File(byteData1, "application/octet-stream", ExcelName);
             }
@@ -1545,7 +1545,7 @@ namespace Edu.WebApi.Controllers.Finance
             }
             catch (Exception ex)
             {
-                LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList");
+                LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList:" + string.Format("TeacherId:{0},SchoolId:{1},StartMonth:{2},EndMonth:{3},Group_Id:{4}", TeacherId, SchoolId, StartMonth, EndMonth, userInfo.Group_Id));
                 var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
                 return File(byteData1, "application/octet-stream", ExcelName);
             }

Edu.WebApi/Controllers/OKR/OKRPeriodController.cs

@@ -1014,7 +1014,6 @@ namespace Edu.WebApi.Controllers.OKR
         public ApiResult GetOKRMyEmployeeList()
         {
             var userInfo = base.UserInfo;
-
             var obj = okrPeriodModule.GetOKRMyEmployeeList(userInfo);
             return ApiResult.Success("", obj);
         }

Edu.WebApi/Controllers/User/UserInfoController.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Edu.AOP;
+using Edu.Cache.User;
 using Edu.Common.API;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;
@@ -23,16 +24,6 @@ namespace Edu.WebApi.Controllers.User
     [EnableCors("AllowCors")]
     public class UserInfoController : BaseController
     {
-
-        /// <summary>
-        /// 集团处理类对象
-        /// </summary>
-        private readonly GroupModule groupModule = AOPHelper.CreateAOPObject<GroupModule>();
-
-        /// <summary>
-        /// 学校处理类对象
-        /// </summary>
-        private readonly SchoolModule schoolModule = AOPHelper.CreateAOPObject<SchoolModule>();
         /// <summary>
         /// 账户相关处理类对象
         /// </summary>
@@ -47,14 +38,16 @@ namespace Edu.WebApi.Controllers.User
         /// </summary>
         private readonly SellCommissionModule sellCommissionModule = new SellCommissionModule();
 
-
         /// <summary>
         /// 教师奖励明细
         /// </summary>
         private readonly TeachingRewardsModule teachingRewardsModule = new TeachingRewardsModule();
 
-
+        /// <summary>
+        /// 订单处理类对象
+        /// </summary>
         private readonly OrderModule orderModule = new OrderModule();
+        
         #region 个人资料-密码修改
         /// <summary>
         /// 重置用户密码信息
@@ -96,14 +89,16 @@ namespace Edu.WebApi.Controllers.User
                 }
 
 
-                List<RB_Account_ViewModel> list = new List<RB_Account_ViewModel>();
-                list.Add(new RB_Account_ViewModel
+                List<RB_Account_ViewModel> list = new List<RB_Account_ViewModel>
+                {
+                    new RB_Account_ViewModel
                     {
                         Id = base.UserInfo.Id,
                         AccountId = base.UserInfo.AccountId,
                         AccountType = base.UserInfo.AccountType,
                         Group_Id = base.UserInfo.Group_Id
-                });
+                    }
+                };
                 bool result = accountModule.SetBatchResetPassword(list, NewPassWord);
                 if (result)
                 {
@@ -145,6 +140,10 @@ namespace Edu.WebApi.Controllers.User
             updateModel.UpdateBy = base.UserInfo.Id;
             updateModel.UpdateTime = DateTime.Now;
             bool flag = employeeModule.SetEmployeeModule(updateModel);
+            if (flag)
+            {
+                UserReidsCache.ClearUserLoginCache(base.UserInfo.Id);
+            }
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
@@ -243,12 +242,12 @@ namespace Edu.WebApi.Controllers.User
             }
             else
             {
-                //userList = sellCommissionModule.GetEstimateSellCommissionInfo(System.DateTime.Now.ToString("yyyy-MM-01"), base.UserInfo);
-                //if (userList != null && userList.Any())
-                //{
-                //    totalCommiommission = userList.Sum(x => x.CurrentPeriodMoney + x.CurrentExtraMoney + x.DeductionMoney + x.DeductionExtraMoney);
+                teacherList = teachingRewardsModule.GetEstimateTeachingBonusAdd(new RB_Teaching_Bonus_ViewModel { Month = System.DateTime.Now.ToString("yyyy-MM"), TeacherIds = base.UserInfo.Id.ToString() }, base.UserInfo);
+                if (teacherList != null && teacherList.Any())
+                {
+                    totalTCommiommission = teacherList.Sum(x => x.Money);
 
-                //}
+                }
             }
             #endregion
             #endregion
@@ -366,6 +365,32 @@ namespace Edu.WebApi.Controllers.User
             return ApiResult.Success("", commiommissionList);
         }
 
+
+        /// <summary>
+        /// 确认销售提成
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult UpdateSureTeachingBonusDetail()
+        {
+            int Id = base.ParmJObj.GetInt("Id");
+            int UserId = base.UserInfo.AccountId;
+            bool retult = teachingRewardsModule.UpdateSureTeachingBonusDetail(UserId, Id);
+            return retult ? ApiResult.Success("") : ApiResult.Failed("确认失败");
+        }
+
+        /// <summary>
+        /// 确认销售提成
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult UpdatSureSellCommission()
+        {
+            int Id = base.ParmJObj.GetInt("Id");
+            int UserId = base.UserInfo.Id;
+            bool retult = sellCommissionModule.UpdateSureSellCommission(UserId, Id);
+            return retult ? ApiResult.Success("") : ApiResult.Failed("确认失败");
+        }
+
+
         #endregion
     }
 }