页面修改

Edu.Model/ViewModel/Sell/RB_Order_Guest_ViewModel.cs

@@ -33,6 +33,11 @@ namespace Edu.Model.ViewModel.Sell
         /// </summary>
         public int EnterID { get; set; }
 
+        /// <summary>
+        /// 协助老师
+        /// </summary>
+        public int HelpEnterId { get; set; }
+
         /// <summary>
         /// 业务员
         /// </summary>

Edu.Module.User/StudentStatModule.cs

@@ -3208,7 +3208,7 @@ namespace Edu.Module.User
 
         #region 市场部客户数据统计
         /// <summary>
-        /// 生成每天数据
+        /// 生成市场部每天数据
         /// </summary>
         /// <param name="user">当前操作用户</param>
         /// <param name="StartTime">开始时间</param>
@@ -3217,7 +3217,6 @@ namespace Edu.Module.User
         public bool CreateStudentMarketModule(UserInfo user, string StartTime, string EndTime, bool isInit = true)
         {
             bool flag = true;
-            string empIds = "";
             if (isInit)
             {
                 student_MarketRepository.DeleteStudentMarketByProcRepository();
@@ -3228,7 +3227,7 @@ namespace Edu.Module.User
             for (int i = 0; i < Days; i++)
             {
                 var newDate = date.AddDays(i);
-                var procModel = student_MarketRepository.GetStudentMarketByProcRepository(Common.ConvertHelper.FormatDate(newDate), empIds);
+                var procModel = student_MarketRepository.GetStudentMarketByProcRepository(Common.ConvertHelper.FormatDate(newDate));
                 var newModel = new RB_Student_Market()
                 {
                     Id = 0,

Edu.Repository/Sell/RB_Order_GuestRepository.cs

@@ -365,9 +365,9 @@ WHERE  1=1 and A.Status=0 and class.Status=0   and b.OrderState<>3
             {
                 builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}");
             }
-            if (demodel.Teacher_Id > 0)
+            if (demodel.Teacher_Id > 0 || demodel.HelpEnterId>0)
             {
-                builder.AppendFormat($@" and class.Teacher_Id ={demodel.Teacher_Id}");
+                builder.AppendFormat($@" and (class.Teacher_Id ={demodel.Teacher_Id} OR B.HelpEnterId ={demodel.HelpEnterId} )");
             }
             if (!string.IsNullOrEmpty(demodel.GuestName))
             {

Edu.Repository/User/RB_Student_MarketRepository.cs

@@ -128,7 +128,7 @@ WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
         /// </summary>
         /// <param name="DateStr"></param>
         /// <returns></returns>
-        public RB_Student_Market_Extend GetStudentMarketByProcRepository(string DateStr, string empIds)
+        public RB_Student_Market_Extend GetStudentMarketByProcRepository(string DateStr)
         {
             string sql = string.Format("call proc_student_market('{0}') ", DateStr);
             var list = Get<RB_Student_Market_Extend>(sql);

Edu.WebApi/Controllers/Course/TeacherClassController.cs

@@ -234,6 +234,10 @@ namespace Edu.WebApi.Controllers.Course
                 CourseId = base.ParmJObj.GetInt("CourseId", 0),
                 EnterID = base.ParmJObj.GetInt("EnterID", 0),
             };
+            if (model.Teacher_Id > 0)
+            {
+                model.HelpEnterId = base.UserInfo.Id;
+            }
             model.Group_Id = base.UserInfo.Group_Id;
             var list = classModule.GetTeacherStudentPage(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, model);
             List<object> result = new List<object>();

Edu.WebApi/Timers/TimerJobj.cs

@@ -232,6 +232,7 @@ namespace Edu.WebApi.Timers
 
                     UserInfo user = UserReidsCache.GetUserLoginInfo("1");
                     studentStatModule.CreateStudentStaticModule(user, Common.ConvertHelper.FormatDate(currentDate.AddDays(-1)), Common.ConvertHelper.FormatDate(currentDate), isInit: false);
+                    studentStatModule.CreateStudentMarketModule(user, Common.ConvertHelper.FormatDate(currentDate.AddDays(-1)), Common.ConvertHelper.FormatDate(currentDate), isInit: false);
                 }
                 Interlocked.Exchange(ref marketconsultant_Timer, 0);
             }