页面修改

Edu.Module.Customer/MarketConsultantModule.cs

@@ -843,7 +843,7 @@ namespace Edu.Module.Customer
 
 
             decimal CurWeekAgFollow = 0;
-            if (yesDataList != null && yesDataList.Where(qitem => qitem.CurWeekAgFollow > 0).Count() > 0)
+            if (curWeekList != null && curWeekList.Where(qitem => qitem.CurWeekAgFollow > 0).Count() > 0)
             {
                 CurWeekAgFollow= Math.Round(curWeekList?.Average(qitem => qitem.CurWeekAgFollow) ?? 0, 2);
             }

Edu.Module.User/StudentModule.cs

@@ -181,9 +181,11 @@ namespace Edu.Module.User
                     accountList = accountModule.GetAccountListExtModule(new RB_Account_ViewModel() { QIds = string.Join(",", empIdList) });
                 }
                 //学员到访统计
-                var visitList = student_VisitRepository.GetStudentVisitStaticRepository(new RB_Student_Visit_Extend()
+                var visitList = student_VisitRepository.GetStudentVisitStatic_V2Repository(new RB_Student_Visit_Extend()
                 {
-                    QStuIds = stuIds
+                    QStuIds = stuIds,
+                    StartDate=query.StartTime,
+                    EndDate=query.EndTime,
                 });
                 //学员试听统计
                 var stuReserveList = visitor_ReserveRepository.GetStuReserveStaticsListRepository(new Model.ViewModel.Reserve.RB_Visitor_Reserve_Extend()

Edu.Repository/Customer/RB_Student_VisitRepository.cs

@@ -134,6 +134,56 @@ WHERE 1=1
             return Get<RB_Student_Visit_Extend>(builder.ToString()).ToList();
         }
 
+        /// <summary>
+        /// 获取到访列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Student_Visit_Extend> GetStudentVisitStatic_V2Repository(RB_Student_Visit_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.StuId,Count(1) AS VisitCount
+FROM RB_Student_Visit AS A INNER  JOIN rb_student AS B ON A.StuId=B.StuId
+WHERE 1=1 
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Visit_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Visit_Extend.Group_Id), query.Group_Id);
+                }
+                if (query.StuId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Visit_Extend.StuId), query.StuId);
+                }
+                if (!string.IsNullOrEmpty(query.QStuIds))
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Student_Visit_Extend.StuId), query.QStuIds);
+                }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Visit_Extend.CreateBy), query.CreateBy);
+                }
+                if (!string.IsNullOrEmpty(query.QCreateByIds))
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Student_Visit_Extend.CreateBy), query.QCreateByIds);
+                }
+                if (!string.IsNullOrEmpty(query.StartDate))
+                {
+                    builder.AppendFormat(" AND A.{0}>='{1}' ", nameof(RB_Student_Visit_Extend.CreateTime), Common.ConvertHelper.FormatDate(query.StartDate));
+                }
+                if (!string.IsNullOrEmpty(query.EndDate))
+                {
+                    builder.AppendFormat(" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Student_Visit_Extend.CreateTime), Common.ConvertHelper.FormatDate(query.EndDate));
+                }
+            }
+            builder.AppendFormat(" GROUP BY A.StuId ");
+            builder.AppendFormat(" ORDER BY A.StuId ");
+            return Get<RB_Student_Visit_Extend>(builder.ToString()).ToList();
+        }
+
         /// <summary>
         /// 市场、课程顾问学员到访统计
         /// </summary>