页面修改

Edu.Repository/User/RB_StudentRepository.cs

@@ -941,6 +941,7 @@ WHERE 1=1
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT A.StuId,A.CreateBy,A.StuChannel,A.CreateType,IFNULL(B.VisitCount,0) AS VisitCount,IFNULL(C.CourseOrderCount,0) AS OrderCount,IFNULL(c.Income,0) AS OrderInCome
+      ,A.CustomerId,A.StuSourceId
 FROM RB_Student AS A 
      LEFT JOIN(SELECT StuId,Count(1) AS VisitCount FROM rb_student_visit WHERE Status=0 GROUP BY StuId) AS B ON A.StuId=B.StuId
      LEFT JOIN(SELECT og.Student_Id,COUNT(1) AS CourseOrderCount,SUM(o.Income) AS Income FROM  rb_student_orderguest AS og INNER JOIN rb_order AS o ON og.OrderId=o.OrderId WHERE O.OrderState NOT IN(3,4) GROUP BY og.Student_Id ) AS C ON A.StuId=C.Student_Id
@@ -964,6 +965,5 @@ WHERE A.Status=0
             var list = Get<RB_Student_ViewModel>(builder.ToString()).ToList();
             return list;
         }
-
     }
 }
\ No newline at end of file

Edu.WebApi/Controllers/User/UserCenterController.cs

@@ -2762,7 +2762,7 @@ namespace Edu.WebApi.Controllers.User
 
 
         /// <summary>
-        /// 市场渠道统计
+        /// 市场渠道月薪统计
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -2790,7 +2790,40 @@ namespace Edu.WebApi.Controllers.User
             {
                 qEmpIds = string.Join(",", empList);
             }
-            var data = marketConsultantModule.MarketChannelStaticModule(startTime, endTime);
+            var data = marketConsultantModule.MarketChannelStudentStaticModule(startTime, endTime);
+            return ApiResult.Success(data: data);
+        }
+
+        /// <summary>
+        /// 市场渠道统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowRepeatAttribute]
+        public ApiResult MarketCreateType()
+        {
+            string startTime = base.ParmJObj.GetStringValue("startTime");
+            if (string.IsNullOrEmpty(startTime))
+            {
+                startTime = "2022-01-01";
+            }
+            string endTime = base.ParmJObj.GetStringValue("endTime");
+            if (string.IsNullOrEmpty(endTime))
+            {
+                endTime = Common.ConvertHelper.FormatDate(DateTime.Now);
+            }
+            string empIds = base.ParmJObj.GetStringValue("empList");
+            List<int> empList = new List<int>();
+            if (!string.IsNullOrEmpty(empIds))
+            {
+                empList = JsonHelper.DeserializeObject<List<int>>(empIds);
+            }
+            string qEmpIds = "";
+            if (empList != null && empList.Count > 0)
+            {
+                qEmpIds = string.Join(",", empList);
+            }
+            var data = marketConsultantModule.MarketCreateTypeStaticModule(startTime, endTime);
             return ApiResult.Success(data: data);
         }