页面修改

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -27,5 +27,40 @@ namespace Edu.Model.ViewModel.Course
         /// 更新时间
         /// </summary>
         public string UpdateTimeStr { get { return Common.ConvertHelper.FormatTime(this.UpdateTime); } }
+
+        /// <summary>
+        /// 课程名称
+        /// </summary>
+        public string CourseName { get; set; }
+
+        /// <summary>
+        /// 助教名称
+        /// </summary>
+        public string AssistName { get; set; }
+
+        /// <summary>
+        /// 助教头像
+        /// </summary>
+        public string AssistIcon { get; set; }
+
+        /// <summary>
+        /// 讲师名称
+        /// </summary>
+        public string TeacherName { get; set; }
+
+        /// <summary>
+        /// 讲师头像
+        /// </summary>
+        public string TeacherHead { get; set; }
+
+        /// <summary>
+        /// 学员数量
+        /// </summary>
+        public int StudentCount { get; set; }
+
+        /// <summary>
+        /// 作业数量
+        /// </summary>
+        public int JobCount { get; set; }
     }
 }
\ No newline at end of file

Edu.Repository/Course/RB_ClassRepository.cs

@@ -4,6 +4,7 @@ using Edu.Model.ViewModel.Course;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using VT.FW.DB.Dapper;
 
 namespace Edu.Repository.Course
 {
@@ -46,10 +47,13 @@ WHERE 1=1
         /// <returns></returns>
         public List<RB_Class_ViewModel> GetClassPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Class_ViewModel query)
         {
+            var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.* 
-FROM rb_class AS A
+SELECT A.*,B.CourseName,C.AssistName,IFNULL(C.AssistIcon,'') AS AssistIcon,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead
+FROM rb_class AS A LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId
+     LEFT JOIN rb_assist AS C ON A.Assist_Id=C.AId
+     LEFT JOIN rb_teacher AS D ON A.Teacher_Id=D.TId
 WHERE 1=1 
 ");
             if (query != null)
@@ -58,10 +62,29 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Status), (int)query.Status);
                 }
+                if (!string.IsNullOrWhiteSpace(query.ClassName))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @ClassName ", nameof(RB_Class_ViewModel.ClassName));
+                    parameters.Add("ClassName", "%" + query.ClassName.Trim() + "%");
+                }
+                if (!string.IsNullOrWhiteSpace(query.CourseName))
+                {
+                    builder.AppendFormat(" AND B.{0} LIKE @CourseName ", nameof(RB_Class_ViewModel.CourseName));
+                    parameters.Add("CourseName", "%" + query.CourseName.Trim() + "%");
+                }
+                if (!string.IsNullOrWhiteSpace(query.AssistName))
+                {
+                    builder.AppendFormat(" AND C.{0} LIKE @AssistName ", nameof(RB_Class_ViewModel.AssistName));
+                    parameters.Add("AssistName", "%" + query.AssistName.Trim() + "%");
+                }
+                if (!string.IsNullOrWhiteSpace(query.TeacherName))
+                {
+                    builder.AppendFormat(" AND D.{0} LIKE @TeacherName ", nameof(RB_Class_ViewModel.TeacherName));
+                    parameters.Add("TeacherName", "%" + query.TeacherName.Trim() + "%");
+                }
             }
-            return GetPage<RB_Class_ViewModel>(pageIndex,pageSize,out rowsCount,builder.ToString()).ToList();
+            return GetPage<RB_Class_ViewModel>(pageIndex,pageSize,out rowsCount,builder.ToString(),parameters).ToList();
         }
 
-  
     }
 }

Edu.WebApi/Controllers/Course/ClassController.cs

 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Edu.Cache.User;
 using Edu.Common.API;
 using Edu.Common.Plugin;
@@ -9,7 +6,6 @@ using Edu.Model.ViewModel.Course;
 using Edu.Module.Course;
 using Edu.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Edu.WebApi.Controllers.Course
@@ -91,7 +87,7 @@ namespace Edu.WebApi.Controllers.Course
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetCourseCategory()
+        public ApiResult GetClass()
         {
             var ClassId = base.ParmJObj.GetInt("ClassId", 0);
             var extModel = classModule.GetClassModule(ClassId);