页面修改

Edu.Model/ViewModel/Customer/RB_Student_Appointment_Extend.cs

@@ -34,5 +34,10 @@ namespace Edu.Model.ViewModel.Customer
         /// 学员姓名
         /// </summary>
         public string StuName { get; set; }
+
+        /// <summary>
+        /// 名称、微信、手机号搜索
+        /// </summary>
+        public string KeyWords { get; set; }
     }
 }

Edu.Module.User/StudentModule.cs

@@ -1254,16 +1254,11 @@ namespace Edu.Module.User
         /// <param name="pageIndex"></param>
         /// <param name="pageSize"></param>
         /// <param name="rowsCount"></param>
-        /// <param name="CreateBy"></param>
+        /// <param name="query"></param>
         /// <returns></returns>
-        public List<object> GetStudentAppointmentPageModule(int pageIndex, int pageSize, out long rowsCount, int CreateBy)
+        public List<object> GetStudentAppointmentPageModule(int pageIndex, int pageSize, out long rowsCount,  RB_Student_Appointment_Extend query)
         {
             List<object> result = new List<object>();
-            var query = new RB_Student_Appointment_Extend()
-            {
-                QueryDate = Common.ConvertHelper.FormatDate(DateTime.Now),
-                CreateBy = CreateBy
-            };
             var list = student_AppointmentRepository.GetStudentAppointmentPageRepository(pageIndex, pageSize, out rowsCount, query);
             if (list != null && list.Count > 0)
             {
@@ -1378,11 +1373,11 @@ namespace Edu.Module.User
         /// <param name="CreateBy"></param>
         /// <param name="UserType">1-课程顾问，2-老师</param>
         /// <returns></returns>
-        public List<object> GetTodayConnectPageModule(int pageIndex, int pageSize, out long rowsCount, int CreateBy,int UserType=0)
+        public List<object> GetTodayConnectPageModule(int pageIndex, int pageSize, out long rowsCount, int CreateBy,int UserType=0,string KeyWords="")
         {
             List<object> result = new List<object>();
 
-            var list = student_AppointmentRepository.GetTodayConnectPageRepository(pageIndex, pageSize, out rowsCount, Common.ConvertHelper.FormatDate(DateTime.Now), CreateBy, UserType: UserType);
+            var list = student_AppointmentRepository.GetTodayConnectPageRepository(pageIndex, pageSize, out rowsCount, Common.ConvertHelper.FormatDate(DateTime.Now), CreateBy, UserType: UserType,KeyWords:KeyWords);
             if (list != null && list.Count > 0)
             {
                 //客户阶段列表
@@ -1491,18 +1486,11 @@ namespace Edu.Module.User
         /// <param name="pageIndex"></param>
         /// <param name="pageSize"></param>
         /// <param name="rowsCount"></param>
-        /// <param name="UserId"></param>
+        /// <param name="query"></param>
         /// <returns></returns>
-        public List<object> GetMyClueModule(int pageIndex, int pageSize, out long rowsCount, int UserId)
+        public List<object> GetMyClueModule(int pageIndex, int pageSize, out long rowsCount, RB_Student_ViewModel query)
         {
             rowsCount = 0;
-            var query = new RB_Student_ViewModel()
-            {
-                IsQueryNotAppointment = 1,
-                BelongType = 1,
-                CreateBy = UserId,
-                QStudentStatus=1,
-            };
             List<object> result = new List<object>();
             var list = studentRepository.GetStudentPageListRepository(pageIndex, pageSize, out rowsCount, query);
             if (list != null && list.Count > 0)
@@ -1727,16 +1715,9 @@ namespace Edu.Module.User
         /// <param name="rowsCount"></param>
         /// <param name="UserId"></param>
         /// <returns></returns>
-        public List<object> GetMyStudentModule(int pageIndex, int pageSize, out long rowsCount, int UserId)
+        public List<object> GetMyStudentModule(int pageIndex, int pageSize, out long rowsCount, RB_Student_ViewModel query)
         {
             rowsCount = 0;
-            var query = new RB_Student_ViewModel()
-            {
-                IsQueryNotFollow = 1,
-                BelongType = 1,
-                CreateBy = UserId,
-                QStudentStatus = 1,
-            };
             List<object> result = new List<object>();
             var list = studentRepository.GetStudentPageListRepository(pageIndex, pageSize, out rowsCount, query);
             if (list != null && list.Count > 0)

Edu.Repository/Customer/RB_Student_AppointmentRepository.cs

@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using VT.FW.DB.Dapper;
 
 namespace Edu.Repository.Customer
 {
@@ -24,6 +25,7 @@ namespace Edu.Repository.Customer
         /// <returns></returns>
         public List<RB_Student_Appointment_Extend> GetStudentAppointmentPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Student_Appointment_Extend query)
         {
+            var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT A.*,B.StuName
@@ -54,10 +56,15 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND ( DATE_FORMAT(A.{0},'%y/%m/%d')= DATE_FORMAT('{2}','%y/%m/%d') OR DATE_FORMAT(A.{1},'%y/%m/%d')= DATE_FORMAT('{2}','%y/%m/%d')) ", nameof(RB_Student_Appointment_Extend.CreateTime), nameof(RB_Student_Appointment_Extend.AppointmentTime), Common.ConvertHelper.FormatDate(query.QueryDate));
                 }
+                if (!string.IsNullOrEmpty(query.KeyWords))
+                {
+                    builder.AppendFormat(" AND (B.{0} LIKE @KeyWords OR B.{1} LIKE @KeyWords OR B.{2} LIKE @KeyWords)", nameof(RB_Student_ViewModel.StuName), nameof(RB_Student_ViewModel.WeChatNo), nameof(RB_Student_ViewModel.StuRealMobile));
+                    parameters.Add("KeyWords", "%" + query.KeyWords.Trim() + "%");
+                }
             }
             builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Student_Appointment_Extend.Id));
 
-            return GetPage<RB_Student_Appointment_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
+            return GetPage<RB_Student_Appointment_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(),parameters).ToList();
         }
 
 
@@ -118,8 +125,9 @@ WHERE 1=1
         /// <param name="CreateBy">创建人</param>
         /// <param name="UserType">1-课程顾问，2-老师</param>
         /// <returns></returns>
-        public List<RB_Student_ViewModel> GetTodayConnectPageRepository(int pageIndex,int pageSize,out long rowsCount,string date,int CreateBy,int UserType=0)
+        public List<RB_Student_ViewModel> GetTodayConnectPageRepository(int pageIndex,int pageSize,out long rowsCount,string date,int CreateBy,int UserType=0,string KeyWords="")
         {
+            var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             string where1="", where2="",tempWhere="";
             if (!string.IsNullOrEmpty(date))
@@ -165,8 +173,14 @@ FROM
          LEFT JOIN (SELECT StuId,COUNT(1) AS FollowCount FROM rb_student_follow WHERE 1=1 {2} GROUP BY StuId ) AS B ON A.StuId=B.StuId
     WHERE 1=1 AND IFNULL(B.FollowCount,0)=0 {1}
 ) AS A WHERE A.School_Id NOT IN(1,6,9) AND A.`Status`=0 AND A.StuStage<>7 AND A.AdvisorStatus<>7
-", where1,where2,tempWhere);
-            return GetPage<RB_Student_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
+", where1, where2, tempWhere);
+
+            if (!string.IsNullOrEmpty(KeyWords))
+            {
+                builder.AppendFormat(" AND (A.{0} LIKE @KeyWords OR A.{1} LIKE @KeyWords OR A.{2} LIKE @KeyWords)", nameof(RB_Student_ViewModel.StuName), nameof(RB_Student_ViewModel.WeChatNo), nameof(RB_Student_ViewModel.StuRealMobile));
+                parameters.Add("KeyWords", "%" + KeyWords.Trim() + "%");
+            }
+            return GetPage<RB_Student_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
     }
 }

Edu.Repository/User/RB_StudentRepository.cs

@@ -321,7 +321,7 @@ WHERE 1=1
                 }
                 if (!string.IsNullOrWhiteSpace(query.KeyWords))
                 {
-                    builder.AppendFormat(" AND (t.{0} LIKE @KeyWords OR  t.{1} LIKE @KeyWords) ", nameof(RB_Student_ViewModel.StuName), nameof(RB_Student_ViewModel.StuTel));
+                    builder.AppendFormat(" AND (t.{0} LIKE @KeyWords OR  t.{1} LIKE @KeyWords  OR  t.{2} LIKE @KeyWords) ", nameof(RB_Student_ViewModel.StuName), nameof(RB_Student_ViewModel.WeChatNo), nameof(RB_Student_ViewModel.StuRealMobile));
                     parameters.Add("KeyWords", "%" + query.KeyWords.Trim() + "%");
                 }
                 if (query.StuType > 0)

Edu.WebApi/Controllers/User/UserCenterController.cs

@@ -14,6 +14,7 @@ using Edu.Common.Enum.User;
 using Edu.Common.Plugin;
 using Edu.Model.CacheModel;
 using Edu.Model.Public;
+using Edu.Model.ViewModel.Customer;
 using Edu.Model.ViewModel.DataStatistics;
 using Edu.Model.ViewModel.EduTask;
 using Edu.Model.ViewModel.User;
@@ -3327,7 +3328,13 @@ namespace Edu.WebApi.Controllers.User
             var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
             var userId = 0;
             //userId = base.UserInfo.Id;
-            var list = studentModule.GetStudentAppointmentPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, userId);
+            var query = new RB_Student_Appointment_Extend()
+            {
+                QueryDate = Common.ConvertHelper.FormatDate(DateTime.Now),
+                CreateBy = userId,
+                KeyWords=base.ParmJObj.GetStringValue("KeyWords"),
+            };
+            var list = studentModule.GetStudentAppointmentPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             pageModel.PageData = list;
             pageModel.Count = rowsCount;
             return ApiResult.Success(data: pageModel);
@@ -3349,8 +3356,9 @@ namespace Edu.WebApi.Controllers.User
             {
                 UserType = 2;
             }
+            string KeyWords = base.ParmJObj.GetStringValue("KeyWords");
             var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
-            var list = studentModule.GetTodayConnectPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, userId,UserType:UserType);
+            var list = studentModule.GetTodayConnectPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, userId,UserType:UserType,KeyWords:KeyWords);
             pageModel.PageData = list;
             pageModel.Count = rowsCount;
             return ApiResult.Success(data: pageModel);
@@ -3365,7 +3373,15 @@ namespace Edu.WebApi.Controllers.User
             var userId = 0;
             userId = base.UserInfo.Id;
             var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
-            var list = studentModule.GetMyClueModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, userId);
+            var query = new RB_Student_ViewModel()
+            {
+                IsQueryNotAppointment = 1,
+                BelongType = 1,
+                CreateBy = userId,
+                QStudentStatus = 1,
+                KeyWords=base.ParmJObj.GetStringValue("KeyWords")
+            };
+            var list = studentModule.GetMyClueModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             pageModel.PageData = list;
             pageModel.Count = rowsCount;
             return ApiResult.Success(data: pageModel);
@@ -3380,8 +3396,16 @@ namespace Edu.WebApi.Controllers.User
             var userId = 0;
             userId = 2855;
             //userId = base.UserInfo.Id;
+            var query = new RB_Student_ViewModel()
+            {
+                IsQueryNotFollow = 1,
+                BelongType = 1,
+                CreateBy = userId,
+                QStudentStatus = 1,
+                KeyWords=base.ParmJObj.GetStringValue("KeyWords")
+            };
             var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
-            var list = studentModule.GetMyStudentModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, userId);
+            var list = studentModule.GetMyStudentModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             pageModel.PageData = list;
             pageModel.Count = rowsCount;
             return ApiResult.Success(data: pageModel);