页面修改

Edu.Model/ViewModel/User/RB_Student_ViewModel.cs

@@ -430,5 +430,10 @@ namespace Edu.Model.ViewModel.User
         /// 班主任
         /// </summary>
         public int HeadTeacherId { get; set; }
+
+        /// <summary>
+        /// 查询类型(1-课程顾问，2-老师,3-市场)
+        /// </summary>
+        public int QueryTpye { get; set; }
     }
 }
\ No newline at end of file

Edu.Repository/User/RB_Student_OrderGuestRepository.cs

@@ -525,18 +525,22 @@ where sog.Status =0 and o.Group_Id ={group_Id} and o.OrderState <>3 and IFNULL(o
                     where += $" AND s.{nameof(RB_Student_ViewModel.CreateBy)} ={demodel.CreateBy} ";
                 }
             }
-
+            string joinType = "INNER JOIN";
+            if (demodel.QueryTpye == 3)
+            {
+                joinType= "LEFT JOIN";
+            }
             string sql = $@"
 SELECT s.StuId,s.StuName,s.StuTel,s.FirstEnrollDate,s.StuRealMobile,s.StuPurpose,s.QQ,DATE_FORMAT(ec.CreateTime,'%Y-%m-%d') as followUpTime
 	   ,c.CourseId,c.CourseName,s.JapanBaseInfo,s.StuBirth,org.GuestState as StuGuestState,s.StuChannel,s.CreateType,s.StuSourceId,s.CreateBy
        ,s.AdvisorStatus,s.AdvisorWinRate,s.AdvisorExpectDate,IFNULL(B.Name,'') AS AdvisorStatusName,org.GraduationTime,clcheck.ClassDate AS BeginClassDate
 FROM rb_student s
-		INNER JOIN rb_student_orderguest og on og.Student_Id = s.StuId
-		INNER JOIN (SELECT og.Student_Id,MAX(og.Id) as Id FROM rb_student_orderguest og INNER JOIN rb_order o on og.OrderId = o.OrderId	WHERE o.OrderState <>3 GROUP BY og.Student_Id) stu on og.Id = stu.Id and og.Student_Id = s.StuId
-		INNER JOIN rb_order_guest org on org.Id = og.GuestId
-		INNER JOIN rb_order o on og.OrderId = o.OrderId
-		INNER JOIN rb_class cl on cl.ClassId = o.ClassId
-		INNER JOIN rb_course c on o.CourseId = c.CourseId
+		{joinType} rb_student_orderguest og on og.Student_Id = s.StuId
+		{joinType} (SELECT og.Student_Id,MAX(og.Id) as Id FROM rb_student_orderguest og INNER JOIN rb_order o on og.OrderId = o.OrderId	WHERE o.OrderState <>3 GROUP BY og.Student_Id) stu on og.Id = stu.Id and og.Student_Id = s.StuId
+		{joinType} rb_order_guest org on org.Id = og.GuestId
+		{joinType} rb_order o on og.OrderId = o.OrderId
+		{joinType} rb_class cl on cl.ClassId = o.ClassId
+		{joinType} rb_course c on o.CourseId = c.CourseId
 		LEFT JOIN rb_education_contract ec on ec.GuestId = og.GuestId
 		LEFT JOIN rb_student_advisorconfig AS b ON s.AdvisorStatus=B.Id
 		LEFT JOIN (

Edu.WebApi/Controllers/User/StudentStatController.cs

@@ -73,6 +73,7 @@ namespace Edu.WebApi.Controllers.User
                 WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
                 StuPurpose = base.ParmJObj.GetInt("StuPurpose"),
                 HeadTeacherId=base.ParmJObj.GetInt("HeadTeacherId"),
+                QueryTpye=base.ParmJObj.GetInt("QueryTpye"),
             };
             string schoolId = base.ParmJObj.GetStringValue("School_Id");
             if (schoolId != "-1")
@@ -161,6 +162,7 @@ namespace Edu.WebApi.Controllers.User
                 WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
                 StuPurpose = base.ParmJObj.GetInt("StuPurpose"),
                 HeadTeacherId = base.ParmJObj.GetInt("HeadTeacherId"),
+                QueryTpye=base.ParmJObj.GetInt("QueryTpye"),
             };
             string schoolId = base.ParmJObj.GetStringValue("School_Id");
             if (schoolId != "-1")