课消统计

Edu.Model/ViewModel/Query/StuCourseQuery.cs

+using Edu.Common.Enum.Course;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Query
+{
+    /// <summary>
+    /// 学员课消统计查询条件
+    /// </summary>
+    public class StuCourseQuery
+    {
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// rb_account表Id(老师编号)
+        /// </summary>
+        public int TeacherAccountId { get; set; }
+
+        /// <summary>
+        /// 课程编号
+        /// </summary>
+        public int CourseId { get; set; }
+
+        /// <summary>
+        /// 对应专业
+        /// </summary>
+        public CourseRateEnum CourseRate { get; set; }
+    }
+}

Edu.Model/ViewModel/User/RB_Student_OrderGuest_ViewModel.cs

@@ -12,6 +12,11 @@ namespace Edu.Model.ViewModel.User
     /// </summary>
     public class RB_Student_OrderGuest_ViewModel: RB_Student_OrderGuest
     {
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
         /// <summary>
         /// 学员表编号【查询使用】
         /// </summary>
@@ -158,5 +163,15 @@ namespace Edu.Model.ViewModel.User
         /// 订单号，学员名称、微信、电话
         /// </summary>
         public string KeyWords { get; set; }
+
+        /// <summary>
+        /// 老师编号
+        /// </summary>
+        public int AssistId { get; set; }
+
+        /// <summary>
+        /// 对应专业
+        /// </summary>
+        public CourseRateEnum CourseRate { get; set; }
     }
 }

Edu.Repository/Customer/RB_Student_AssistRepository.cs

@@ -22,8 +22,8 @@ namespace Edu.Repository.Customer
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.*
-FROM RB_Student_Assist AS A
+SELECT A.*,IFNULL(B.EmName,'') AS AssistName
+FROM RB_Student_Assist AS A LEFT JOIN rb_employee AS B ON A.AssistId=B.EmployeeId
 WHERE 1=1 
 ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Assist_Extend.Status), (int)DateStateEnum.Normal);

Edu.Repository/User/RB_Student_OrderGuestRepository.cs

 using Edu.Common.Enum;
 using Edu.Model.Entity.User;
+using Edu.Model.ViewModel.Sell;
 using Edu.Model.ViewModel.User;
 using System.Collections.Generic;
 using System.Linq;
@@ -24,14 +25,20 @@ namespace Edu.Repository.User
             builder.AppendFormat(@" 
 SELECT A.*,IFNULL(B.ClassName,'') AS ClassName,IFNULL(B.ClassNo,'') AS ClassNo,IFNULL(C.JoinType,0) AS StuJoinType,IFNULL(D.GuestState,0) AS StuGuestState
        ,C.OrderState,IFNULL(D.TotalHours,0) AS TotalHours,IFNULL(D.CompleteHours,0) AS CompleteHours,IFNULL(B.ClassStatus,0) AS ClassStatus,IFNULL(D.RenewState,0) AS RenewState
+	   ,IFNULL(E.CourseName,'') AS CourseName,IFNULL(B.CouseId,0) AS CourseId 
 FROM RB_Student_OrderGuest AS A INNER JOIN rb_class AS B ON A.ClassId=B.ClassId
      INNER JOIN rb_order AS C  ON A.OrderId=C.OrderId
 	 INNER JOIN rb_order_guest AS D ON A.GuestId=D.Id
+     LEFT JOIN rb_course AS E ON B.CouseId=E.CourseId
 WHERE 1=1 AND C.OrderState IN(1) AND D.Status=0
 ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Status), (int)DateStateEnum.Normal);
             if (query != null)
             {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND C.{0}={1} ", nameof(RB_Order_ViewModel.Group_Id), query.Group_Id);
+                }
                 if (query.ClassId > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.ClassId), query.ClassId);
@@ -60,6 +67,19 @@ WHERE 1=1 AND C.OrderState IN(1) AND D.Status=0
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Account_Id), query.Account_Id);
                 }
+                if (query.AssistId > 0)
+                {
+                    builder.AppendFormat(" AND EXISTS(SELECT 1 FROM rb_student_assist WHERE `Status`=0 AND AssistType=4 AND StuId=A.Student_Id AND AssistId={0} ) ", query.AssistId);
+                }
+                if (query.CourseId > 0)
+                {
+                    builder.AppendFormat(" AND C.{0}={1} ", nameof(RB_Order_ViewModel.CourseId), query.CourseId);
+                }
+                //课程等级
+                if (query.CourseRate > 0)
+                {
+                    builder.AppendFormat(" AND EXISTS(SELECT 1 FROM rb_course_chapter WHERE `Status`=0  AND CourseId=C.CourseId AND CourseRate IN({0}))",(int)query.CourseRate);
+                }
             }
             return Get<RB_Student_OrderGuest_ViewModel>(builder.ToString()).ToList();
         }

Edu.WebApi/Controllers/Course/ScrollController.cs

@@ -9,6 +9,7 @@ using Edu.Common.Enum.Course;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.Grade;
+using Edu.Model.ViewModel.Query;
 using Edu.Model.ViewModel.Scroll;
 using Edu.Model.ViewModel.Sell;
 using Edu.Module.Course;
@@ -1067,18 +1068,41 @@ namespace Edu.WebApi.Controllers.Course
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetStuLearnChapterList() {
+        public ApiResult GetStuLearnChapterList()
+        {
             var userInfo = base.UserInfo;
             RB_Scroll_Appointment_ViewModel demodel = JsonHelper.DeserializeObject<RB_Scroll_Appointment_ViewModel>(base.RequestParm.Msg.ToString());
-            if (demodel.StuId <= 0) {
-                return ApiResult.ParamIsNull("请传递学生ID");
-            }
+             
             demodel.Group_Id = userInfo.Group_Id;
 
             var list = scrollClassModule.GetStuLearnChapterList(demodel);
             return ApiResult.Success("", list);
         }
 
+
+        /// <summary>
+        /// 获取学员课消统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetStuLearnChapterStatic()
+        {
+            var userInfo = base.UserInfo;
+            StuCourseQuery demodel = new StuCourseQuery()
+            {
+                TeacherAccountId=base.ParmJObj.GetInt("TeacherAccountId"),
+                CourseId=base.ParmJObj.GetInt("CourseId"),
+                CourseRate=(CourseRateEnum)base.ParmJObj.GetInt("CourseRate")
+            };
+            //if (demodel.StuId <= 0)
+            //{
+            //    return ApiResult.ParamIsNull("请传递学生ID");
+            //}
+            demodel.Group_Id = userInfo.Group_Id;
+
+            var list = scrollClassModule.GetStuLearnChapterStaticModule(demodel);
+            return ApiResult.Success("", list);
+        }
         #endregion
     }
 }