页面修改

Edu.Model/ViewModel/User/RB_Student_OrderGuest_ViewModel.cs

@@ -148,5 +148,10 @@ namespace Edu.Model.ViewModel.User
         /// 订单创建时间
         /// </summary>
         public DateTime OrderCreateTime { get; set; }
+
+        /// <summary>
+        /// 查询未领取合同学员
+        /// </summary>
+        public int IsNotContract { get; set; }
     }
 }

Edu.Model/ViewModel/User/RB_Student_ViewModel.cs

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

Edu.Repository/Sell/RB_OrderRepository.cs

@@ -1376,25 +1376,6 @@ WHERE 1=1 AND A.OrderState IN(1,2) {0}
             return dicList;
         }
 
-        /// <summary>
-        /// 获取未领取合同的订单
-        /// </summary>
-        /// <param name="pageIndex"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="rowsCount"></param>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        public List<RB_Order_ViewModel> GetNotContractPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Order_ViewModel query)
-        {
-            StringBuilder builder = new StringBuilder();
-            builder.AppendFormat(@"
-SELECT A.*
-FROM rb_order AS A
-WHERE 1=1
-");
-            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Order_ViewModel.OrderState), (int)OrderStateEnum.Normal);
-            builder.AppendFormat(" ");
-            return GetPage<RB_Order_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
-        }
+
     }
 }

Edu.Repository/User/RB_StudentRepository.cs

@@ -458,6 +458,12 @@ WHERE 1=1
                         nameof(RB_Student_ViewModel.StuSourceId),
                         query.StuSourceId);
                 }
+
+                //查询未跟进学员
+                if (query.IsQueryNotFollow == 1)
+                {
+                    builder.AppendFormat(" AND  NOT Exists (SELECT StuId FROM rb_student_follow WHERE  `Status`=0 AND t.StuId=StuId) ");
+                }
             }
             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.Repository/User/RB_Student_OrderGuestRepository.cs

 using Edu.Common.Enum;
 using Edu.Model.Entity.User;
 using Edu.Model.ViewModel.User;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -57,7 +56,6 @@ WHERE 1=1 AND C.OrderState IN(1) AND D.Status=0
                 {
                     builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Student_OrderGuest_ViewModel.Student_Id), query.QStudentIds);
                 }
-
                 if (query.Account_Id > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Account_Id), query.Account_Id);
@@ -84,7 +82,7 @@ FROM RB_Student_OrderGuest AS A INNER JOIN rb_order AS C  ON A.OrderId=C.OrderId
 WHERE 1=1 AND C.OrderState<>3 AND D.Status=0
 ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Status), (int)DateStateEnum.Normal);
-            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Status), (int)DateStateEnum.Normal);
+            
             if (query != null)
             {
                 if (query.ClassId > 0)
@@ -174,6 +172,15 @@ WHERE 1=1 AND C.OrderState<>3 AND D.Status=0
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Account_Id), query.Account_Id);
                 }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND (C.CreateBy={0} OR C.EnterID={0} OR C.CourseConsultantId={0}) ", query.CreateBy);
+                }
+                if (query.IsNotContract == 1)
+                {
+                    builder.AppendFormat(" AND C.OrderType=1 and C.CourseId<>1 ");
+                    builder.AppendFormat(@" AND NOT EXISTS(SELECT 1 FROM rb_education_contract WHERE A.OrderId=OrderId AND A.GuestId=GuestId AND `Status` NOT IN(4)) ");
+                }
             }
             return GetPage<RB_Student_OrderGuest_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }

Edu.Repository/User/RB_Teacher_StaticRepository.cs

@@ -77,7 +77,7 @@ WHERE 1=1
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_Teacher_Static_Extend> GetTeacherStaticMonthExtListRepository(RB_Teacher_Static_Extend query, bool isYear = false)
+        public List<RB_Teacher_Static_Extend> GetTeacherStaticMonthExtListRepository(RB_Teacher_Static_Extend query)
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"

Edu.WebApi/Controllers/User/UserCenterController.cs

@@ -2675,12 +2675,12 @@ namespace Edu.WebApi.Controllers.User
             }
             var list = marketConsultantModule.DownLoadConsultantStaticModule(qEmpIds, startTime, endTime);
             string excelName = "课程顾问部数据统计.xls";
-             
+
             ExcelDataSource header = new ExcelDataSource() { ExcelRows = new List<ExcelColumn>() };
             ExcelDataSource subHeader = new ExcelDataSource() { ExcelRows = new List<ExcelColumn>() };
             header.ExcelRows.Add(new ExcelColumn("员工") { Rowspan = 2, CellWidth = 15 });
             subHeader.ExcelRows.Add(new ExcelColumn());
-            header.ExcelRows.Add(new ExcelColumn("名单") { CellWidth = 25,Colspan=2 });
+            header.ExcelRows.Add(new ExcelColumn("名单") { CellWidth = 25, Colspan = 2 });
             subHeader.ExcelRows.Add(new ExcelColumn("本周"));
             subHeader.ExcelRows.Add(new ExcelColumn("本月"));
 
@@ -3319,21 +3319,28 @@ namespace Edu.WebApi.Controllers.User
         #region  首页待办工作视图统计
 
         /// <summary>
-        /// 今日需联系线索
+        /// 今日需联系线索（之前预约或者24小时内收到的新线索）
         /// </summary>
         /// <returns></returns>
         public ApiResult GetTodayClue()
         {
-            var list = studentModule.GetTodayVisitModule(base.UserInfo.Id);
-            return ApiResult.Success(data: list);
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var list = studentModule.GetTodayVisitModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, base.UserInfo.Id);
+            pageModel.PageData = list;
+            pageModel.Count = rowsCount;
+            return ApiResult.Success(data: pageModel);
         }
 
         /// <summary>
         /// 今日需联系学员（之前预约的跟进学员或本周期内需要跟进的学员）
         /// </summary>
-        public ApiResult Get()
+        public ApiResult GetTodayContractStudent()
         {
-            return ApiResult.Failed();
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var list = studentModule.GetTodayContractStudentModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, base.UserInfo.Id);
+            pageModel.PageData = list;
+            pageModel.Count = rowsCount;
+            return ApiResult.Success(data: pageModel);
         }
 
         /// <summary>
@@ -3342,7 +3349,11 @@ namespace Edu.WebApi.Controllers.User
         /// <returns></returns>
         public ApiResult MyClue()
         {
-            return ApiResult.Failed();
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var list = studentModule.GetMyClueModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, base.UserInfo.Id);
+            pageModel.PageData = list;
+            pageModel.Count = rowsCount;
+            return ApiResult.Success(data: pageModel);
         }
 
         /// <summary>
@@ -3351,7 +3362,11 @@ namespace Edu.WebApi.Controllers.User
         /// <returns></returns>
         public ApiResult MyStudent()
         {
-            return ApiResult.Failed();
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var list = studentModule.GetMyStudentModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, base.UserInfo.Id);
+            pageModel.PageData = list;
+            pageModel.Count = rowsCount;
+            return ApiResult.Success(data: pageModel);
         }
 
         /// <summary>
@@ -3378,7 +3393,7 @@ namespace Edu.WebApi.Controllers.User
             pageModel.PageData = list;
             pageModel.Count = rowsCount;
             return ApiResult.Success(data: pageModel);
-          
+
         }
 
         /// <summary>
@@ -3401,7 +3416,7 @@ namespace Edu.WebApi.Controllers.User
         public ApiResult GraduateStudent()
         {
             var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
-            var list= studentModule.GetStraightwayGraduateStudentModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, base.UserInfo.Id);
+            var list = studentModule.GetStraightwayGraduateStudentModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, base.UserInfo.Id);
             pageModel.PageData = list;
             pageModel.Count = rowsCount;
             return ApiResult.Success(data: pageModel);