1

Edu.Repository/Reserve/RB_Visitor_ReserveRepository.cs

@@ -135,7 +135,7 @@ WHERE 1=1
             var parameters = new DynamicParameters();
             builder.Append(@"
 SELECT A.*,IFNULL(B.StuName,'') AS VisitorName,C.ClassDate,C.ClassTime,C.EndTime,C.ClassContent,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(E.RoomName,'') AS RoomName
-       ,IFNULL(B.StuTel,'') AS StuTel,IFNULL(F.LessonName,'') AS LessonName
+       ,IFNULL(B.StuTel,'') AS StuTel,IFNULL(F.LessonName,'') AS LessonName,C.TeacherId
 FROM RB_Visitor_Reserve AS A LEFT JOIN rb_student AS B ON A.Visitor_Id=B.StuId
      LEFT JOIN rb_reserve_class AS C ON A.ReserveClassId=C.ReserveClassId
      LEFT JOIN rb_teacher AS D ON C.TeacherId=D.TId
@@ -154,6 +154,14 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND C.{0}>='{1}' ", nameof(RB_Visitor_Reserve_Extend.ClassDate), query.StartClassDate);
                 }
+                if (query.Visitor_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Visitor_Reserve_Extend.Visitor_Id), query.Visitor_Id);
+                }
+                if (query.IsQNotReserveClassId == 2)
+                {
+                    builder.AppendFormat(" AND A.{0}>0 ", nameof(RB_Visitor_Reserve_Extend.ReserveClassId));
+                }
                 if (!string.IsNullOrEmpty(query.EndClassDate))
                 {
                     builder.AppendFormat(" AND C.{0}<='{1} 23:59:59' ", nameof(RB_Visitor_Reserve_Extend.ClassDate), query.EndClassDate);

Edu.WebApi/Controllers/Duty/VisitorReserveController.cs

@@ -2,6 +2,7 @@
 using Edu.Common.API;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Reserve;
+using Edu.Module.Customer;
 using Edu.Module.Duty;
 using Edu.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;
@@ -194,6 +195,29 @@ namespace Edu.WebApi.Controllers.Duty
             return retult ? ApiResult.Success() : ApiResult.Failed(message: "反馈信息更新失败");
         }
 
+        /// <summary>
+        ///  获取协助人员列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetVisitorReserveTeacherList()
+        {
+            var StuId = base.ParmJObj.GetInt("StuId");
+            var data = visitorReserveModule.GetVisitorReserveListModule(new RB_Visitor_Reserve_Extend { IsQNotReserveClassId = 2, Visitor_Id = StuId });
+            List<object> list = new List<object>();
+            foreach (var item in data)
+            {
+                list.Add(new
+                {
+                    item.Id,
+                    item.TeacherId,
+                    item.TeacherName,
+                    CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime)
+                });
+            }
+            return ApiResult.Success(data: list.Distinct());
+        }
+
         /// <summary>
         /// 新增修改访客约课
         /// </summary>