1

Edu.Model/ViewModel/Reserve/RB_Visitor_Reserve_Extend.cs

@@ -125,5 +125,15 @@ namespace Edu.Model.ViewModel.Reserve
         /// 是否查询所有约课(1-是)
         /// </summary>
         public int IsQueryAll { get; set; }
+
+        /// <summary>
+        /// 创建时间字符串
+        /// </summary>
+        public string CreateTimeStr { get { return Common.ConvertHelper.FormatTimeStr(this.CreateTime); } }
+
+        /// <summary>
+        /// 创建时间字符串
+        /// </summary>
+        public string CreateTimeStr2 { get { return Common.ConvertHelper.FormatTimeStr2(this.CreateTime); } }
     }
 }

Edu.Model/ViewModel/User/RB_Student_ViewModel.cs

@@ -151,5 +151,15 @@ namespace Edu.Model.ViewModel.User
         /// 是否查询自己的客户（1-是）
         /// </summary>
         public int IsQueryMyStu { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string EndTime { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Customer/CustomerStudentModule.cs

@@ -137,7 +137,7 @@ namespace Edu.Module.Customer
             {
                 logContent += string.Format("反馈信息：由【{0}】=>【{1}】", oldModel.Feedback, Feedback);
             }
-            bool flag = student_VisitRepository.Update(fileds, new WhereHelper(nameof(RB_Student_Appointment_Extend.Id), Id));
+            bool flag = student_AppointmentRepository.Update(fileds, new WhereHelper(nameof(RB_Student_Appointment_Extend.Id), Id));
             student_LogRepository.AddStuLogRepository(oldModel.StuId, Common.Enum.Log.StudentLogTypeEnum.Appointment, logTitle, logContent, OperateId);
             return flag;
         }

Edu.Repository/Reserve/RB_Visitor_ReserveRepository.cs

@@ -84,6 +84,7 @@ WHERE 1=1
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Visitor_Reserve_Extend.Visitor_Id), query.Visitor_Id);
                 }
             }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Visitor_Reserve_Extend.Id));
             return GetPage<RB_Visitor_Reserve_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
 

Edu.Repository/User/RB_StudentRepository.cs

@@ -158,6 +158,18 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.CustomerId), query.CustomerId);
                 }
+                if (query.StuStage > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.StuStage), (int)query.StuStage);
+                }
+                if (!string.IsNullOrEmpty(query.StartTime))
+                {
+                    builder.AppendFormat(" AND t.{0}>='{1}' ", nameof(RB_Student_ViewModel.CreateTime),query.StartTime);
+                }
+                if (!string.IsNullOrEmpty(query.EndTime))
+                {
+                    builder.AppendFormat(" AND t.{0}<='{1} 23:59:59' ", nameof(RB_Student_ViewModel.CreateTime), query.EndTime);
+                }
             }
             builder.AppendFormat(" ORDER BY t.{0} DESC ", nameof(RB_Student_ViewModel.StuId));
             return GetPage<RB_Student_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();

Edu.WebApi/Controllers/User/UserController.cs

@@ -658,7 +658,9 @@ namespace Edu.WebApi.Controllers.User
                 CreateBy = base.ParmJObj.GetInt("CreateBy"),
                 IsQueryMyStu = base.ParmJObj.GetInt("IsQueryMyStu"),
                 CustomerId = base.ParmJObj.GetInt("CustomerId"),
-                StuStage = (StuStageEnum)base.ParmJObj.GetInt("StuStage", 0)
+                StuStage=(StuStageEnum)base.ParmJObj.GetInt("StuStage"),
+                StartTime=base.ParmJObj.GetStringValue("StartTime"),
+                EndTime=base.ParmJObj.GetStringValue("EndTime"),
             };
             if (query.IsQueryMyStu == 1)
             {