页面修改

Edu.Model/ViewModel/User/RB_Student_ViewModel.cs

@@ -269,6 +269,11 @@ namespace Edu.Model.ViewModel.User
         /// </summary>
         public int ConsultantId { get; set; }
 
+        /// <summary>
+        /// 课程顾问编号【逗号分隔】
+        /// </summary>
+        public string ConsultantIds { get; set; }
+
         /// <summary>
         /// 渠道名称
         /// </summary>
@@ -431,6 +436,11 @@ namespace Edu.Model.ViewModel.User
         /// </summary>
         public int HeadTeacherId { get; set; }
 
+        /// <summary>
+        /// 班主任【逗号分隔】
+        /// </summary>
+        public string HeadTeacherIds { get; set; }
+
         /// <summary>
         /// 查询类型(1-课程顾问，2-老师,3-市场)
         /// </summary>

Edu.Repository/User/RB_Student_OrderGuestRepository.cs

@@ -399,14 +399,17 @@ where sog.Status =0 and o.Group_Id ={group_Id} and o.OrderState <>3 and IFNULL(o
         {
             DynamicParameters parameters = new DynamicParameters();
             string where = " 1=1 and s.Status =0 and c.CourseId <>1";//排除内部班课程
-            if (demodel.Group_Id > 0) {
+            if (demodel.Group_Id > 0) 
+            {
                 where += $" and s.{nameof(RB_Student_ViewModel.Group_Id)} ={demodel.Group_Id}";
             }
-            if (!string.IsNullOrEmpty(demodel.StuName)) {
+            if (!string.IsNullOrEmpty(demodel.StuName)) 
+            {
                 where += $" and s.{nameof(RB_Student_ViewModel.StuName)} like @StuName";
                 parameters.Add("StuName", "%" + demodel.StuName + "%");
             }
-            if (!string.IsNullOrEmpty(demodel.StuRealMobile)) {
+            if (!string.IsNullOrEmpty(demodel.StuRealMobile)) 
+            {
                 where += $" and s.{nameof(RB_Student_ViewModel.StuRealMobile)} like @StuRealMobile";
                 parameters.Add("StuRealMobile", "%" + demodel.StuRealMobile + "%");
             }
@@ -460,10 +463,18 @@ where sog.Status =0 and o.Group_Id ={group_Id} and o.OrderState <>3 and IFNULL(o
             {
                 where += $@" AND s.StuId IN (SELECT StuId FROM rb_student_assist WHERE AssistId ={demodel.ConsultantId} AND `Status`=0)";
             }
+            if (!string.IsNullOrEmpty(demodel.ConsultantIds))
+            {
+                where += $@" AND s.StuId IN (SELECT StuId FROM rb_student_assist WHERE AssistId IN({demodel.ConsultantIds}) AND `Status`=0)";
+            }
             if (demodel.HeadTeacherId > 0)
             {
                 where += $@" AND s.StuId IN (SELECT StuId FROM rb_student_assist WHERE AssistId ={demodel.HeadTeacherId} AND `Status`=0 AND AssistType=4)";
             }
+            if (!string.IsNullOrEmpty(demodel.HeadTeacherIds))
+            {
+                where += $@" AND s.StuId IN (SELECT StuId FROM rb_student_assist WHERE AssistId IN({demodel.HeadTeacherIds}) AND `Status`=0 AND AssistType=4)";
+            }
             if (demodel.CourseId > 0)
             {
                 where += $" and o.CourseId ={demodel.CourseId}";