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

Edu.Module.Course/TeachingRewardsModule.cs

@@ -668,14 +668,14 @@ namespace Edu.Module.Course
                     {
                         CostTypeId = Config.ReadConfigKey("BonusCostTypeId"),
                         Number = (qitem.CourseHour + qitem.DCourseHour),
-                        OriginalMoney = qitem.UnitPrice,
+                        OriginalMoney = qitem.Money,
                         qitem.UnitPrice,
                         Remark = "带班" + qitem.CourseHour + "课时，代课" + qitem.DCourseHour + "课程"
                     });
                     TotalMoney += qitem.Money;
                 }
 
-                string Remark = tmodel.Month + "月，" + teacherModel.TeacherName + "教师奖励";
+                string Remark = tmodel.Month + "月，" + teacherModel.TeacherName + "教师课时费";
                 var financeObj = new
                 {
                     IsPublic,
@@ -1282,7 +1282,7 @@ namespace Edu.Module.Course
                 {
                     CostTypeId = Config.ReadConfigKey("PerfCostTypeId"),
                     Number = tmodel.ClassHours,
-                    OriginalMoney = tmodel.UnitPrice,
+                    OriginalMoney = tmodel.Money,
                     tmodel.UnitPrice,
                     Remark = "满班率：" + tmodel.FullClassRate + "%，平均上课率：" + tmodel.AvgCheckRate + "%，累计课时：" + tmodel.ClassHours
                 }
@@ -1455,8 +1455,8 @@ namespace Edu.Module.Course
             string monthStr = "'" + string.Join("','", MList) + "'";
             var LastlyChart = teaching_BonusRepository.GetTeachingBonusLastlyChart(teacherModel.TId, userInfo.Group_Id, monthStr);
             //获取当月趋势
-            string StartTime = DateTime.Now.ToString("yyyy-MM-dd");
-            string EndTime = DateTime.Now.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
+            string StartTime = DateTime.Now.ToString("yyyy-MM") + "-01";
+            string EndTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM") + "-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 = teacherModel.TId.ToString(), StartTime = StartTime, EndTime = EndTime });
             //查询所有课程的上课时间
             List<RB_Class_Time_ViewModel> timeList = new List<RB_Class_Time_ViewModel>();

Edu.Repository/Course/RB_Teaching_BonusDetailRepository.cs

@@ -52,7 +52,7 @@ namespace Edu.Repository.Course
                 where += $@" and  A.{nameof(RB_Teaching_BonusDetail.Type)} ={demodel.Type}";
             }
 
-            string sql = $@" select * from RB_Teaching_BonusDetail   as A  LEFT JOIN rb_teaching_bonus as b on a.BonusId=b.Id  and b.State=2 where {where} order by a.Id desc";
+            string sql = $@" select A.* from RB_Teaching_BonusDetail   as A  LEFT JOIN rb_teaching_bonus as b on a.BonusId=b.Id  and b.State=2 where {where} order by a.Id desc";
             return Get<RB_Teaching_BonusDetail_ViewModel>(sql).ToList();
         }
 
@@ -237,7 +237,7 @@ where bd.Status=0 and bd.Group_Id ={group_Id} AND b.State=2 AND bd.TeacherId ={i
 from RB_Teaching_BonusDetail bd
 INNER JOIN rb_teaching_bonus b on bd.BonusId = b.Id
 where bd.Status=0 and bd.Group_Id ={group_Id} AND b.State=2 AND bd.TeacherId ={id}
-ORDER BY bd.CreateTime DESC LIMIT 1";
+ORDER BY b.`Month` DESC LIMIT 1";
             var obj = ExecuteScalar(sql);
             return obj == null ? "" : obj.ToString();
         }