Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Model/Entity/User/RB_Student_Market.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+    /// <summary>
+    /// 市场部客户数据统计实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Student_Market
+    {
+        /// <summary>
+        /// 主键编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public DateTime Date { get; set; }
+
+        /// <summary>
+        /// 进单人数
+        /// </summary>
+        public decimal PushCount { get; set; }
+
+        /// <summary>
+        /// 语培需求
+        /// </summary>
+        public decimal TrainCount { get; set; }
+
+        /// <summary>
+        /// 留学需求
+        /// </summary>
+        public decimal StudyCount { get; set; }
+
+        /// <summary>
+        /// 美团点评
+        /// </summary>
+        public decimal MeiTuanCount { get; set; }
+
+        /// <summary>
+        /// 教育同行(签约)
+        /// </summary>
+        public decimal EduCustomerSign { get; set; }
+
+        /// <summary>
+        /// 教育同行(未签约)
+        /// </summary>
+        public decimal EduCustomerNotSign { get; set; }
+
+        /// <summary>
+        /// 过路客(直客)
+        /// </summary>
+        public decimal PassBy { get; set; }
+
+        /// <summary>
+        /// 朋友圈
+        /// </summary>
+        public decimal WeChatFriend { get; set; }
+
+        /// <summary>
+        /// 学员转介绍
+        /// </summary>
+        public decimal TransCount { get; set; }
+
+        /// <summary>
+        /// 校园推广
+        /// </summary>
+        public decimal SchoolPromote { get; set; }
+
+        /// <summary>
+        /// 校园代理
+        /// </summary>
+        public decimal SchoolAgent { get; set; }
+
+        /// <summary>
+        /// 线下活动
+        /// </summary>
+        public decimal OfflineActivity { get; set; }
+
+        /// <summary>
+        /// 公众号
+        /// </summary>
+        public decimal OfficialAccount { get; set; }
+
+        /// <summary>
+        /// 教师推荐
+        /// </summary>
+        public decimal TeacherRecommend { get; set; }
+
+        /// <summary>
+        /// 字节跳动
+        /// </summary>
+        public decimal ByteDance { get; set; }
+
+        /// <summary>
+        /// 第三方平台
+        /// </summary>
+        public decimal ThirdPartyPlatform { get; set; }
+
+        /// <summary>
+        /// 其他
+        /// </summary>
+        public decimal Other { get; set; }
+
+        /// <summary>
+        /// A类客户
+        /// </summary>
+        public decimal ClassACount { get; set; }
+
+        /// <summary>
+        /// B类客户
+        /// </summary>
+        public decimal ClassBCount { get; set; }
+
+        /// <summary>
+        /// C类客户
+        /// </summary>
+        public decimal ClassCCount { get; set; }
+
+        /// <summary>
+        /// D类客户
+        /// </summary>
+        public decimal ClassDCount { get; set; }
+
+        /// <summary>
+        /// 无效
+        /// </summary>
+        public decimal InvalidCount { get; set; }
+
+        /// <summary>
+        /// 签约(成交、续费)
+        /// </summary>
+        public decimal ContractCount { get; set; }
+
+        /// <summary>
+        /// 语培签约金额
+        /// </summary>
+        public decimal OrderMoney { get; set; }
+
+        /// <summary>
+        /// 留学签约金额
+        /// </summary>
+        public decimal StudyOrderMoney { get; set; }
+
+        /// <summary>
+        /// 年
+        /// </summary>
+        public int YearStr { get; set; }
+
+        /// <summary>
+        /// 月
+        /// </summary>
+        public int MonthStr { get; set; }
+
+        /// <summary>
+        /// 次
+        /// </summary>
+        public int Times { get; set; }
+
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+        public int School_Id { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+    }
+}

Edu.Model/Entity/User/RB_Student_Static.cs

@@ -6,7 +6,7 @@ using VT.FW.DB;
 namespace Edu.Model.Entity.User
 {
     /// <summary>
-    /// 客户数据统计实体类
+    /// 课程顾问部客户数据统计实体类
     /// </summary>
     [Serializable]
     [DB(ConnectionName = "DefaultConnection")]

Edu.Model/ViewModel/Sell/RB_Order_Guest_ViewModel.cs

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

Edu.Model/ViewModel/User/RB_Student_Market_Extend.cs

+using Edu.Model.Entity.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.User
+{
+    /// <summary>
+    /// 市场部客户数据统计扩展实体类
+    /// </summary>
+    public class RB_Student_Market_Extend: RB_Student_Market
+    {
+        /// <summary>
+        /// 月份
+        /// </summary>
+        public string ShowMonthStr { get; set; }
+
+        /// <summary>
+        /// 日期字符串
+        /// </summary>
+        public string DateStr
+        {
+            get
+            {
+                return Common.ConvertHelper.FormatDate2(this.Date);
+            }
+        }
+    }
+}

Edu.Module.Customer/CustomerModule.cs

@@ -622,7 +622,7 @@ namespace Edu.Module.Customer
         {
             List<WhereHelper> list = new List<WhereHelper>
             {
-                new WhereHelper(nameof(RB_Customer_Category_Extend.CategoryName), model.CategoryName),
+                new WhereHelper(nameof(RB_Customer_Category_Extend.CategoryName), model.CategoryName.Trim()),
                 new WhereHelper(nameof(RB_Customer_Category_Extend.Status), 0),
                 new WhereHelper(nameof(RB_Customer_Category_Extend.Group_Id), model.Group_Id)
             };
@@ -666,6 +666,37 @@ namespace Edu.Module.Customer
             return flag;
         }
 
+        /// <summary>
+        /// 同行合并
+        /// </summary>
+        /// <param name="CategoryId"></param>
+        /// <param name="NewCategoryId"></param>
+        /// <returns></returns>
+        public bool ReplaceCustomerCategoryModule(int CategoryId, int NewCategoryId)
+        {
+            bool flag = false;
+            var list = customerRepository.GetCustomerListRepository(new RB_Customer_Extend() { CategoryId = CategoryId });
+            var cateModel = GetCustomerCategoryModule(NewCategoryId);
+            if (list != null && list.Count > 0)
+            {
+                foreach (var item in list)
+                {
+                    Dictionary<string, object> fileds = new Dictionary<string, object>()
+                    {
+                       {nameof(RB_Customer_Extend.CategoryId),NewCategoryId},
+                       {nameof(RB_Customer_Extend.CustomerType),(int)cateModel.CatetoryType},
+                    };
+                    customerRepository.Update(fileds, new WhereHelper(nameof(RB_Customer_Extend.CustomerId), item.CustomerId));
+                }
+            }
+            Dictionary<string, object> cateFileds = new Dictionary<string, object>()
+            {
+              {nameof(RB_Customer_Category_Extend.Status),(int)DateStateEnum.Delete}
+            };
+            flag = customer_CategoryRepository.Update(cateFileds, new WhereHelper(nameof(RB_Customer_Category_Extend.CategoryId), CategoryId));
+            return flag;
+        }
+
         /// <summary>
         /// 根据编号获取同行信息
         /// </summary>

Edu.Repository/Sell/RB_Order_GuestRepository.cs

@@ -342,7 +342,7 @@ WHERE {where}";
             builder.AppendFormat(@"
 SELECT A.*,IFNULL(B.JoinType,0) AS JoinType,IFNULL(B.TargetJoinType,0) AS TargetJoinType,IFNULL(B.StartClassHours,0) AS StartClassHours,IFNULL(C.CourseName,'') AS CourseName
        ,class.ClassName,b.EnterID,plan.TotalPlanNum,planr.Ranks ,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId
-       ,sc.StopClassEffectTime,B.SourceOrderId,B.TargetOrderId,stu.StuTel,stu.StuRealMobile
+       ,sc.StopClassEffectTime,B.SourceOrderId,B.TargetOrderId,stu.StuTel,stu.StuRealMobile,IFNULL(B.CreateBy,0) AS OrderCreateBy,IFNULL(stu.StuId,0) AS StudentId
 FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
      LEFT JOIN rb_class as class on class.ClassId=a.ClassId
 	 LEFT JOIN rb_student_orderguest as sog on sog.GuestId=a.Id
@@ -365,9 +365,10 @@ 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 o.HelpEnterId ={demodel.HelpEnterId} )");
+                builder.AppendFormat($@" and (class.Teacher_Id ={demodel.Teacher_Id} OR stu.StuId IN(SELECT StuId FROM rb_student_assist WHERE `Status`=0 AND AssistId={demodel.HelpEnterId}) )  ");
             }
             if (!string.IsNullOrEmpty(demodel.GuestName))
             {

Edu.Repository/User/RB_Student_MarketRepository.cs

+using Edu.Model.Entity.User;
+using Edu.Model.ViewModel.User;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Edu.Repository.User
+{
+    /// <summary>
+    /// 市场部客户数据统计仓储层
+    /// </summary>
+    public class RB_Student_MarketRepository : BaseRepository<RB_Student_Market>
+    {
+        /// <summary>
+        /// 市场部客户数据统计列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Student_Market_Extend> GetStudentMarketListRepository(RB_Student_Market_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* 
+FROM RB_Student_Market AS A
+WHERE 1=1
+");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Market_Extend.Group_Id), query.Group_Id);
+                }
+                if (query.YearStr > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Market_Extend.YearStr), query.YearStr);
+                }
+                if (query.MonthStr > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Market_Extend.MonthStr), query.MonthStr);
+                }
+                if (query.Times > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Market_Extend.Times), query.Times);
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.{0} ASC ", nameof(RB_Student_Static_Extend.Id));
+            return Get<RB_Student_Market_Extend>(builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 市场部客户数据月份统计
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Student_Market_Extend> GetStudentMarketMonthListRepository(RB_Student_Market_Extend query, bool isYear = false)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+ SELECT CONCAT(DATE_FORMAT(A.Date, '%Y-%m'),'-01') AS Date,A.YearStr,A.MonthStr,SUM(A.PushCount) AS PushCount,SUM(A.TrainCount) AS TrainCount,SUM(A.StudyCount) AS StudyCount
+       ,SUM(A.MeiTuanCount) AS MeiTuanCount,SUM(A.EduCustomerSign) AS EduCustomerSign,SUM(A.EduCustomerNotSign) AS EduCustomerNotSign,SUM(A.PassBy) AS PassBy
+       ,SUM(A.WeChatFriend) AS WeChatFriend,SUM(A.TransCount) AS TransCount,SUM(A.SchoolPromote) AS SchoolPromote,SUM(A.SchoolAgent) AS SchoolAgent,SUM(A.OfflineActivity) AS OfflineActivity
+	   ,SUM(A.OfficialAccount) AS OfficialAccount,SUM(A.TeacherRecommend) AS TeacherRecommend,SUM(A.ByteDance) AS ByteDance,SUM(A.ThirdPartyPlatform) AS ThirdPartyPlatform
+	   ,SUM(A.Other) AS Other,SUM(A.ClassACount) AS ClassACount,SUM(A.ClassBCount) AS ClassBCount,SUM(A.ClassCCount) AS ClassCCount,SUM(A.ClassDCount) AS ClassDCount
+	   ,SUM(A.InvalidCount) AS InvalidCount,SUM(A.ContractCount) AS ContractCount,SUM(A.OrderMoney) AS OrderMoney,SUM(A.StudyOrderMoney) AS StudyOrderMoney
+FROM RB_Student_Market AS A
+WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
+");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Market_Extend.Group_Id), query.Group_Id);
+                }
+                if (query.YearStr > 0)
+                {
+                    if (isYear)
+                    {
+                        builder.AppendFormat(" AND A.{0}<={1} ", nameof(RB_Student_Market_Extend.YearStr), query.YearStr);
+                    }
+                    else
+                    {
+                        builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Market_Extend.YearStr), query.YearStr);
+                    }
+                }
+            }
+            builder.AppendFormat(" GROUP BY DATE_FORMAT(A.Date, '%Y-%m') ");
+            builder.AppendFormat(" ORDER BY DATE_FORMAT(A.Date, '%Y-%m') ASC ");
+            return Get<RB_Student_Market_Extend>(builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 市场部客户数据年份统计
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Student_Market_Extend> GetStudentMarketYearListRepository(RB_Student_Market_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+ SELECT CONCAT(DATE_FORMAT(A.Date, '%Y-%m'),'-01') AS Date,A.YearStr,A.MonthStr,SUM(A.PushCount) AS PushCount,SUM(A.TrainCount) AS TrainCount,SUM(A.StudyCount) AS StudyCount
+       ,SUM(A.MeiTuanCount) AS MeiTuanCount,SUM(A.EduCustomerSign) AS EduCustomerSign,SUM(A.EduCustomerNotSign) AS EduCustomerNotSign,SUM(A.PassBy) AS PassBy
+       ,SUM(A.WeChatFriend) AS WeChatFriend,SUM(A.TransCount) AS TransCount,SUM(A.SchoolPromote) AS SchoolPromote,SUM(A.SchoolAgent) AS SchoolAgent,SUM(A.OfflineActivity) AS OfflineActivity
+	   ,SUM(A.OfficialAccount) AS OfficialAccount,SUM(A.TeacherRecommend) AS TeacherRecommend,SUM(A.ByteDance) AS ByteDance,SUM(A.ThirdPartyPlatform) AS ThirdPartyPlatform
+	   ,SUM(A.Other) AS Other,SUM(A.ClassACount) AS ClassACount,SUM(A.ClassBCount) AS ClassBCount,SUM(A.ClassCCount) AS ClassCCount,SUM(A.ClassDCount) AS ClassDCount
+	   ,SUM(A.InvalidCount) AS InvalidCount,SUM(A.ContractCount) AS ContractCount,SUM(A.OrderMoney) AS OrderMoney,SUM(A.StudyOrderMoney) AS StudyOrderMoney
+FROM RB_Student_Market AS A
+WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
+");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Market_Extend.Group_Id), query.Group_Id);
+                }
+                if (query.YearStr > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}<={1} ", nameof(RB_Student_Market_Extend.YearStr), query.YearStr);
+                }
+            }
+            builder.AppendFormat(" GROUP BY A.YearStr ");
+            builder.AppendFormat(" ORDER BY A.YearStr ASC ");
+            return Get<RB_Student_Market_Extend>(builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 根据存储过程统计市场部客户信息
+        /// </summary>
+        /// <param name="DateStr"></param>
+        /// <returns></returns>
+        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);
+            return list?.FirstOrDefault();
+        }
+
+        /// <summary>
+        /// 清除市场部客户数据统计信息
+        /// </summary>
+        public void DeleteStudentMarketByProcRepository()
+        {
+            string sql = "TRUNCATE TABLE RB_Student_Market ";
+            base.Execute(sql);
+        }
+    }
+}

Edu.Repository/User/RB_Student_StaticRepository.cs

@@ -56,11 +56,11 @@ WHERE 1=1
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_Student_Static_Extend> GetStudentStaticMonthListRepository(RB_Student_Static_Extend query)
+        public List<RB_Student_Static_Extend> GetStudentStaticMonthListRepository(RB_Student_Static_Extend query,bool isYear=false)
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT CONCAT(DATE_FORMAT(A.Date, '%Y-%m'),'-01') AS Date,SUM(A.PushCount) AS PushCount,SUM(A.NewCount) AS NewCount,SUM(A.CommunicationCount) AS CommunicationCount
+SELECT CONCAT(DATE_FORMAT(A.Date, '%Y-%m'),'-01') AS Date,A.YearStr,A.MonthStr,SUM(A.PushCount) AS PushCount,SUM(A.NewCount) AS NewCount,SUM(A.CommunicationCount) AS CommunicationCount
        ,SUM(A.TrialLessonCount) AS TrialLessonCount,SUM(A.NotContacted) AS NotContacted,SUM(A.JPCount) AS JPCount,SUM(A.KRCount) AS KRCount,SUM(A.FRCount) AS FRCount
        ,SUM(A.JPStudyCount) AS JPStudyCount,SUM(A.KRStudyCount) AS KRStudyCount,SUM(A.YGAStudyCount) AS YGAStudyCount,SUM(A.USStudyCount) AS USStudyCount
 	   ,SUM(A.SGStudyCount) AS SGStudyCount,SUM(A.AXStudyCount) AS AXStudyCount,SUM(A.OtherCount) AS OtherCount,SUM(A.ClassACount) AS ClassACount,SUM(A.ClassBCount) AS ClassBCount
@@ -78,12 +78,19 @@ WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Static_Extend.Group_Id), query.Group_Id);
                 }
                 if (query.YearStr > 0)
+                {
+                    if (isYear)
+                    {
+                        builder.AppendFormat(" AND A.{0}<={1} ", nameof(RB_Student_Static_Extend.YearStr), query.YearStr);
+                    }
+                    else
                     {
                         builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Static_Extend.YearStr), query.YearStr);
                     }
                 }
+            }
             builder.AppendFormat(" GROUP BY DATE_FORMAT(A.Date, '%Y-%m') ");
-            builder.AppendFormat(" ORDER BY DATE_FORMAT(A.Date, '%Y-%m') ASC ", nameof(RB_Student_Static_Extend.Id));
+            builder.AppendFormat(" ORDER BY DATE_FORMAT(A.Date, '%Y-%m') ASC ");
             return Get<RB_Student_Static_Extend>(builder.ToString()).ToList();
         }
 

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>();
@@ -244,6 +248,10 @@ namespace Edu.WebApi.Controllers.Course
                 {
                     item.EnterName = UserReidsCache.GetUserLoginInfo(item.EnterID)?.AccountName ?? "";
                 }
+                else if (item.OrderCreateBy > 0)
+                {
+                    item.EnterName = UserReidsCache.GetUserLoginInfo(item.OrderCreateBy)?.AccountName ?? "";
+                }
                 result.Add(new
                 {
                     item.Id,
@@ -259,6 +267,7 @@ namespace Edu.WebApi.Controllers.Course
                     item.Teacher_Id,
                     item.TotalPlanNum,
                     item.Ranks,
+                    item.OrderId,
                     item.EnterName,
                     item.EnterID,
                     item.IsRenewOrder,

Edu.WebApi/Controllers/Customer/B2BCustomerController.cs

@@ -169,16 +169,38 @@ namespace Edu.WebApi.Controllers.Customer
                 School_Id = base.UserInfo.School_Id,
             };
             if (!string.IsNullOrEmpty(categoryModel.CategoryName))
+            {
+                if (customerModule.CheckCustomerCategoryModule(categoryModel))
+                {
+                    return ApiResult.Failed("已存在此同行,请重新选择!");
+                }
+                else
                 {
                     bool cflag = customerModule.SetCustomerCategoryModule(categoryModel);
                     model.CategoryId = categoryModel.CategoryId;
                 }
-
-         
+            }
             var flag = customerModule.SetCustomerModule(model);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 替换同行
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult ReplaceCategory()
+        {
+            var CategoryId = base.ParmJObj.GetInt("CategoryId");
+            var NewCategoryId= base.ParmJObj.GetInt("NewCategoryId");
+            if (NewCategoryId <= 0)
+            {
+                return ApiResult.Failed("请选择目标企业或校代!");
+            }
+            bool flag = customerModule.ReplaceCustomerCategoryModule(CategoryId, NewCategoryId);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
         /// <summary>
         /// 根据编号删除客户
         /// </summary>
@@ -1037,20 +1059,16 @@ namespace Edu.WebApi.Controllers.Customer
                 CategoryName = base.ParmJObj.GetStringValue("CategoryName"),
                 CatetoryType = (CatetoryTypeEnum)base.ParmJObj.GetInt("CatetoryType"),
             };
-            query.CreateBy = userInfo.Id;
             var list = customerModule.GetCustomerCategoryListModule(query);
             List<object> result = new List<object>();
             foreach (var item in list)
             {
-                string CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
                 result.Add(new
                 {
                     item.CategoryId,
                     item.CategoryName,
-                    CreateByName,
                     item.CatetoryType,
                     CatetoryTypeName = item.CatetoryType.ToName(),
-                    CreateTime = Common.ConvertHelper.FormatTime(item.CreateTime),
                 });
             }
             return ApiResult.Success(data: result);

Edu.WebApi/Controllers/User/StudentStatController.cs

@@ -500,8 +500,9 @@ namespace Edu.WebApi.Controllers.User
         }
         #endregion
 
+        #region 课程顾问部客户数据统计
         /// <summary>
-        /// 客户数据每日统计
+        /// 课程顾问部客户数据每日统计
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -517,9 +518,121 @@ namespace Edu.WebApi.Controllers.User
             return ApiResult.Success(data: list);
         }
 
+        /// <summary>
+        /// 下载课程顾问部客户数据每日统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Obsolete]
+        public FileContentResult DownLoadStudentStatic()
+        {
+            var query = new RB_Student_Static_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+                MonthStr = base.ParmJObj.GetInt("MonthStr")
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = studentStatModule.GetStudentStaticListModule(query);
+            string excelName = "课程顾问部每日统计.xls";
+            List<ExcelDataSource> slist = new List<ExcelDataSource>();
+            try
+            {
+                ExcelDataSource header = new ExcelDataSource
+                {
+                    ExcelRows = new List<ExcelColumn>()
+                    {
+                        new ExcelColumn("日期"){ CellWidth=15},
+                        new ExcelColumn("推送人数"){ CellWidth=15},
+                        new ExcelColumn("新客户"){ CellWidth=15},
+                        new ExcelColumn("初步沟通(二次沟通)"){ CellWidth=10},
+                        new ExcelColumn("预约试听(已到店,已试听)"){ CellWidth=15},
+                        new ExcelColumn("待联系"){ CellWidth=15},
+                        new ExcelColumn("日语语培"){ CellWidth=15},
+                        new ExcelColumn("韩国语培"){ CellWidth=15},
+                        new ExcelColumn("法语语培"){ CellWidth=15},
+                        new ExcelColumn("日本留学"){ CellWidth=15},
+                        new ExcelColumn("韩国留学"){ CellWidth=15},
+                        new ExcelColumn("英港澳留学"){ CellWidth=15},
+                        new ExcelColumn("美国留学"){ CellWidth=15},
+                        new ExcelColumn("新加坡留学"){ CellWidth=15},
+                        new ExcelColumn("澳新留学"){ CellWidth=15},
+                        new ExcelColumn("其他"){ CellWidth=15},
+                        new ExcelColumn("A类客户"){ CellWidth=15},
+                        new ExcelColumn("B类客户"){ CellWidth=15},
+                        new ExcelColumn("C类客户"){ CellWidth=15},
+                        new ExcelColumn("D类客户"){ CellWidth=15},
+                        new ExcelColumn("同行介绍"){ CellWidth=15},
+                        new ExcelColumn("直客"){ CellWidth=15},
+                        new ExcelColumn("学员转介绍"){ CellWidth=15},
+                        new ExcelColumn("内部介绍"){ CellWidth=15},
+                        new ExcelColumn("无效"){ CellWidth=15},
+                        new ExcelColumn("疑似"){ CellWidth=15},
+                        new ExcelColumn("意向"){ CellWidth=15},
+                        new ExcelColumn("近期可邀约"){ CellWidth=15},
+                        new ExcelColumn("谈判"){ CellWidth=15},
+                        new ExcelColumn("签约.成交.续费"){ CellWidth=15},
+                        new ExcelColumn("语培签约金额"){ CellWidth=15},
+                        new ExcelColumn("留学签约金额"){ CellWidth=15},
+                    }
+                };
+                slist.Add(header);
+                foreach (var item in list)
+                {
+                    JObject dObj = JObject.Parse(JsonHelper.Serialize(item));
+                    var columns = new List<ExcelColumn>
+                    {
+                        new ExcelColumn(dObj.GetStringValue("DateStr"))
+                    };
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("PushCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("NewCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("CommunicationCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("TrialLessonCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("NotContacted")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("JPCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("KRCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("FRCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("JPStudyCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("KRStudyCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("YGAStudyCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("USStudyCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("SGStudyCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("AXStudyCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("OtherCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassACount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassBCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassCCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassDCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("CustomerCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("B2CCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("TransCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("InnerCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("InvalidCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("SuspectedCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("IntentionCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("InvitationCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("NegotiationCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney")));
+                    var dataRow = new ExcelDataSource()
+                    {
+                        ExcelRows = columns
+                    };
+                    slist.Add(dataRow);
+                }
+                var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData, "application/octet-stream", excelName);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DownLoadStudentStatic");
+                var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData1, "application/octet-stream", excelName);
+            }
+        }
 
         /// <summary>
-        /// 客户数据月份统计
+        /// 课程顾问部客户数据每月统计
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -534,9 +647,120 @@ namespace Edu.WebApi.Controllers.User
             return ApiResult.Success(data: list);
         }
 
+        /// <summary>
+        /// 下载课程顾问部客户数据每月统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Obsolete]
+        public FileContentResult DownLoadStudentStaticMonth()
+        {
+            var query = new RB_Student_Static_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = studentStatModule.GetStudentStaticListMonthModule(query);
+            string excelName = "课程顾问部每月统计.xls";
+            List<ExcelDataSource> slist = new List<ExcelDataSource>();
+            try
+            {
+                ExcelDataSource header = new ExcelDataSource
+                {
+                    ExcelRows = new List<ExcelColumn>()
+                    {
+                        new ExcelColumn("日期"){ CellWidth=15},
+                        new ExcelColumn("推送人数"){ CellWidth=15},
+                        new ExcelColumn("新客户"){ CellWidth=15},
+                        new ExcelColumn("初步沟通(二次沟通)"){ CellWidth=10},
+                        new ExcelColumn("预约试听(已到店,已试听)"){ CellWidth=15},
+                        new ExcelColumn("待联系"){ CellWidth=15},
+                        new ExcelColumn("日语语培"){ CellWidth=15},
+                        new ExcelColumn("韩国语培"){ CellWidth=15},
+                        new ExcelColumn("法语语培"){ CellWidth=15},
+                        new ExcelColumn("日本留学"){ CellWidth=15},
+                        new ExcelColumn("韩国留学"){ CellWidth=15},
+                        new ExcelColumn("英港澳留学"){ CellWidth=15},
+                        new ExcelColumn("美国留学"){ CellWidth=15},
+                        new ExcelColumn("新加坡留学"){ CellWidth=15},
+                        new ExcelColumn("澳新留学"){ CellWidth=15},
+                        new ExcelColumn("其他"){ CellWidth=15},
+                        new ExcelColumn("A类客户"){ CellWidth=15},
+                        new ExcelColumn("B类客户"){ CellWidth=15},
+                        new ExcelColumn("C类客户"){ CellWidth=15},
+                        new ExcelColumn("D类客户"){ CellWidth=15},
+                        new ExcelColumn("同行介绍"){ CellWidth=15},
+                        new ExcelColumn("直客"){ CellWidth=15},
+                        new ExcelColumn("学员转介绍"){ CellWidth=15},
+                        new ExcelColumn("内部介绍"){ CellWidth=15},
+                        new ExcelColumn("无效"){ CellWidth=15},
+                        new ExcelColumn("疑似"){ CellWidth=15},
+                        new ExcelColumn("意向"){ CellWidth=15},
+                        new ExcelColumn("近期可邀约"){ CellWidth=15},
+                        new ExcelColumn("谈判"){ CellWidth=15},
+                        new ExcelColumn("签约.成交.续费"){ CellWidth=15},
+                        new ExcelColumn("语培签约金额"){ CellWidth=15},
+                        new ExcelColumn("留学签约金额"){ CellWidth=15},
+                    }
+                };
+                slist.Add(header);
+                foreach (var item in list)
+                {
+                    JObject dObj = JObject.Parse(JsonHelper.Serialize(item));
+                    var columns = new List<ExcelColumn>
+                    {
+                        new ExcelColumn(dObj.GetStringValue("DateStr"))
+                    };
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("PushCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("NewCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("CommunicationCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("TrialLessonCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("NotContacted")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("JPCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("KRCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("FRCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("JPStudyCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("KRStudyCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("YGAStudyCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("USStudyCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("SGStudyCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("AXStudyCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("OtherCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassACount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassBCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassCCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassDCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("CustomerCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("B2CCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("TransCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("InnerCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("InvalidCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("SuspectedCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("IntentionCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("InvitationCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("NegotiationCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney")));
+                    var dataRow = new ExcelDataSource()
+                    {
+                        ExcelRows = columns
+                    };
+                    slist.Add(dataRow);
+                }
+                var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData, "application/octet-stream", excelName);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DownLoadStudentStaticMonth");
+                var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData1, "application/octet-stream", excelName);
+            }
+        }
 
         /// <summary>
-        /// 客户数据月份统计
+        /// 课程顾问部客户数据每月成长率统计
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -551,9 +775,83 @@ namespace Edu.WebApi.Controllers.User
             return ApiResult.Success(data: list);
         }
 
+        /// <summary>
+        /// 下载课程顾问部客户数据每月成长率统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Obsolete]
+        public FileContentResult DownLoadStudentStaticMonthRate()
+        {
+            var query = new RB_Student_Static_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = studentStatModule.GetStudentStaticRateListMonthModule(query);
+            string excelName = "课程顾问部月成长率统计.xls";
+            List<ExcelDataSource> slist = new List<ExcelDataSource>();
+            try
+            {
+                ExcelDataSource header = new ExcelDataSource
+                {
+                    ExcelRows = new List<ExcelColumn>()
+                    {
+                        new ExcelColumn("名称"){ CellWidth=25},
+                        new ExcelColumn("1月"){ CellWidth=15},
+                        new ExcelColumn("2月"){ CellWidth=15},
+                        new ExcelColumn("3月"){ CellWidth=10},
+                        new ExcelColumn("4月"){ CellWidth=15},
+                        new ExcelColumn("5月"){ CellWidth=15},
+                        new ExcelColumn("6月"){ CellWidth=15},
+                        new ExcelColumn("7月"){ CellWidth=15},
+                        new ExcelColumn("8月"){ CellWidth=15},
+                        new ExcelColumn("9月"){ CellWidth=15},
+                        new ExcelColumn("10月"){ CellWidth=15},
+                        new ExcelColumn("11月"){ CellWidth=15},
+                        new ExcelColumn("12月"){ CellWidth=15},
+                        new ExcelColumn("平均"){ CellWidth=15},
+                    }
+                };
+                slist.Add(header);
+                foreach (var item in list)
+                {
+                    var columns = new List<ExcelColumn>
+                    {
+                        new ExcelColumn(item.ItemName)
+                    };
+                    columns.Add(new ExcelColumn(item.JanuaryRate + "%"));
+                    columns.Add(new ExcelColumn(item.FebruaryRate + "%"));
+                    columns.Add(new ExcelColumn(item.MarchRate + "%"));
+                    columns.Add(new ExcelColumn(item.AprilRate + "%"));
+                    columns.Add(new ExcelColumn(item.MayRate + "%"));
+                    columns.Add(new ExcelColumn(item.JuneRate + "%"));
+                    columns.Add(new ExcelColumn(item.JulyRate + "%"));
+                    columns.Add(new ExcelColumn(item.AugustRate + "%"));
+                    columns.Add(new ExcelColumn(item.SeptemberRate + "%"));
+                    columns.Add(new ExcelColumn(item.OctoberRate + "%"));
+                    columns.Add(new ExcelColumn(item.NovemberRate + "%"));
+                    columns.Add(new ExcelColumn(item.DecemberRate + "%"));
+                    columns.Add(new ExcelColumn(item.AvgRate + "%"));
+                    var dataRow = new ExcelDataSource()
+                    {
+                        ExcelRows = columns
+                    };
+                    slist.Add(dataRow);
+                }
+                var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData, "application/octet-stream", excelName);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DownLoadStudentStaticMonthRate");
+                var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData1, "application/octet-stream", excelName);
+            }
+        }
 
         /// <summary>
-        /// 客户数据年份统计
+        /// 课程顾问部客户数据年度统计
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -569,7 +867,62 @@ namespace Edu.WebApi.Controllers.User
         }
 
         /// <summary>
-        /// 客户数据年份统计
+        /// 下载课程顾问部客户数据年度统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Obsolete]
+        public FileContentResult DownLoadStudentStaticYear()
+        {
+            var query = new RB_Student_Static_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = studentStatModule.GetStudentStaticListYearModule(query);
+            string excelName = "课程顾问部年度数据统计.xls";
+            List<ExcelDataSource> slist = new List<ExcelDataSource>();
+            try
+            {
+                ExcelDataSource header = new ExcelDataSource
+                {
+                    ExcelRows = new List<ExcelColumn>()
+                    {
+                        new ExcelColumn("名称"){ CellWidth=25},
+                        new ExcelColumn("2021"){ CellWidth=15},
+                        new ExcelColumn("2022"){ CellWidth=15},
+                        new ExcelColumn("成长率"){ CellWidth=10},
+                    }
+                };
+                slist.Add(header);
+                foreach (var item in list)
+                {
+                    var columns = new List<ExcelColumn>
+                    {
+                        new ExcelColumn(item.ItemName)
+                    };
+                    columns.Add(new ExcelColumn(item.FirstYear.ToString()));
+                    columns.Add(new ExcelColumn(item.SecondYear.ToString()));
+                    columns.Add(new ExcelColumn(item.YearRate + "%"));
+                    var dataRow = new ExcelDataSource()
+                    {
+                        ExcelRows = columns
+                    };
+                    slist.Add(dataRow);
+                }
+                var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData, "application/octet-stream", excelName);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DownLoadStudentStaticYear");
+                var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData1, "application/octet-stream", excelName);
+            }
+        }
+
+        /// <summary>
+        /// 课程顾问部客户数据年度成长率统计
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -585,7 +938,62 @@ namespace Edu.WebApi.Controllers.User
         }
 
         /// <summary>
-        /// 初始化学员统计数据
+        /// 下载课程顾问部客户数据年度成长率统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Obsolete]
+        public FileContentResult DownLoadStudentStaticYearRate()
+        {
+            var query = new RB_Student_Static_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = studentStatModule.GetStudentStaticListYearRateModule(query);
+            string excelName = "课程顾问部年度成长率统计.xls";
+            List<ExcelDataSource> slist = new List<ExcelDataSource>();
+            try
+            {
+                ExcelDataSource header = new ExcelDataSource
+                {
+                    ExcelRows = new List<ExcelColumn>()
+                    {
+                        new ExcelColumn("名称"){ CellWidth=25},
+                        new ExcelColumn("2021"){ CellWidth=15},
+                        new ExcelColumn("2022"){ CellWidth=15},
+                        new ExcelColumn("成长率"){ CellWidth=10},
+                    }
+                };
+                slist.Add(header);
+                foreach (var item in list)
+                {
+                    var columns = new List<ExcelColumn>
+                    {
+                        new ExcelColumn(item.ItemName)
+                    };
+                    columns.Add(new ExcelColumn(item.FirstYear.ToString()));
+                    columns.Add(new ExcelColumn(item.SecondYear.ToString()));
+                    columns.Add(new ExcelColumn(item.YearRate + "%"));
+                    var dataRow = new ExcelDataSource()
+                    {
+                        ExcelRows = columns
+                    };
+                    slist.Add(dataRow);
+                }
+                var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData, "application/octet-stream", excelName);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DownLoadStudentStaticYearRate");
+                var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData1, "application/octet-stream", excelName);
+            }
+        }
+
+        /// <summary>
+        /// 初始化课程顾问部学员统计数据
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -593,7 +1001,6 @@ namespace Edu.WebApi.Controllers.User
         {
             var userInfo = base.UserInfo;
             string StartTime = base.ParmJObj.GetStringValue("StartTime");
- 
             if (string.IsNullOrEmpty(StartTime))
             {
                 StartTime = Common.ConvertHelper.FormatDate(DateTime.Now);
@@ -603,5 +1010,495 @@ namespace Edu.WebApi.Controllers.User
             bool flag = studentStatModule.CreateStudentStaticModule(userInfo, StartTime, EndTime);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
+
+        #endregion
+
+        #region 市场部客户数据统计
+        /// <summary>
+        /// 初始化市场部学员统计数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult InitStudentMarket()
+        {
+            var userInfo = base.UserInfo;
+            string StartTime = base.ParmJObj.GetStringValue("StartTime");
+            if (string.IsNullOrEmpty(StartTime))
+            {
+                StartTime = Common.ConvertHelper.FormatDate(DateTime.Now);
+            }
+            StartTime = "2021-12-21";
+            string EndTime = Common.ConvertHelper.FormatDate(DateTime.Now);
+            bool flag = studentStatModule.CreateStudentMarketModule(userInfo, StartTime, EndTime);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 市场部客户数据每日统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetStudentMarket()
+        {
+            var query = new RB_Student_Market_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+                MonthStr = base.ParmJObj.GetInt("MonthStr")
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = studentStatModule.GetStudentMarketListModule(query);
+            return ApiResult.Success(data: list);
+        }
+
+        /// <summary>
+        /// 下载市场部客户数据每日统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Obsolete]
+        public FileContentResult DownLoadStudentMarket()
+        {
+            var query = new RB_Student_Market_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+                MonthStr = base.ParmJObj.GetInt("MonthStr")
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = studentStatModule.GetStudentMarketListModule(query);
+            string excelName = "市场部每日数据统计.xls";
+            List<ExcelDataSource> slist = new List<ExcelDataSource>();
+            try
+            {
+                ExcelDataSource header = new ExcelDataSource
+                {
+                    ExcelRows = new List<ExcelColumn>()
+                    {
+                        new ExcelColumn("日期"){ CellWidth=15},
+                        new ExcelColumn("进单人数"){ CellWidth=15},
+                        new ExcelColumn("语培需求"){ CellWidth=15},
+                        new ExcelColumn("留学需求"){ CellWidth=10},
+                        new ExcelColumn("美团点评"){ CellWidth=15},
+                        new ExcelColumn("教育同行(签约)"){ CellWidth=15},
+                        new ExcelColumn("教育同行(未签约)"){ CellWidth=15},
+                        new ExcelColumn("过路客(直客)"){ CellWidth=15},
+                        new ExcelColumn("朋友圈"){ CellWidth=15},
+                        new ExcelColumn("学员转介绍"){ CellWidth=15},
+                        new ExcelColumn("校园推广"){ CellWidth=15},
+                        new ExcelColumn("校园代理"){ CellWidth=15},
+                        new ExcelColumn("线下活动"){ CellWidth=15},
+                        new ExcelColumn("公众号"){ CellWidth=15},
+                        new ExcelColumn("教师推荐"){ CellWidth=15},
+                        new ExcelColumn("字节跳动"){ CellWidth=15},
+                        new ExcelColumn("第三方平台"){ CellWidth=15},
+                        new ExcelColumn("其他"){ CellWidth=15},
+                        new ExcelColumn("A类客户"){ CellWidth=15},
+                        new ExcelColumn("B类客户"){ CellWidth=15},
+                        new ExcelColumn("C类客户"){ CellWidth=15},
+                        new ExcelColumn("D类客户"){ CellWidth=15},
+                        new ExcelColumn("无效"){ CellWidth=15},
+                        new ExcelColumn("签约.成交.续费"){ CellWidth=15},
+                        new ExcelColumn("语培签约金额"){ CellWidth=15},
+                        new ExcelColumn("留学签约金额"){ CellWidth=15},
+                    }
+                };
+                slist.Add(header);
+                foreach (var item in list)
+                {
+                    JObject dObj = JObject.Parse(JsonHelper.Serialize(item));
+                    var columns = new List<ExcelColumn>
+                    {
+                        new ExcelColumn(dObj.GetStringValue("DateStr"))
+                    };
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("PushCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("TrainCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("StudyCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("MeiTuanCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("EduCustomerSign")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("EduCustomerNotSign")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("PassBy")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("WeChatFriend")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("TransCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("SchoolPromote")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("SchoolAgent")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("OfflineActivity")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("OfficialAccount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("TeacherRecommend")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ByteDance")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ThirdPartyPlatform")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("Other")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassACount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassBCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassCCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassDCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("InvalidCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney")));
+                    var dataRow = new ExcelDataSource()
+                    {
+                        ExcelRows = columns
+                    };
+                    slist.Add(dataRow);
+                }
+                var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData, "application/octet-stream", excelName);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DownLoadStudentMarket");
+                var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData1, "application/octet-stream", excelName);
+            }
+        }
+
+        /// <summary>
+        /// 市场部客户数据月度统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetStudentMarketMonth()
+        {
+            var query = new RB_Student_Market_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = studentStatModule.GetStudentMarketListMonthModule(query);
+            return ApiResult.Success(data: list);
+        }
+
+        /// <summary>
+        /// 下载市场部客户数据月度统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Obsolete]
+        public FileContentResult DownLoadStudentMarketMonth()
+        {
+            var query = new RB_Student_Market_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = studentStatModule.GetStudentMarketListMonthModule(query);
+            string excelName = "市场部每月数据统计.xls";
+            List<ExcelDataSource> slist = new List<ExcelDataSource>();
+            try
+            {
+                ExcelDataSource header = new ExcelDataSource
+                {
+                    ExcelRows = new List<ExcelColumn>()
+                    {
+                        new ExcelColumn("日期"){ CellWidth=15},
+                        new ExcelColumn("进单人数"){ CellWidth=15},
+                        new ExcelColumn("语培需求"){ CellWidth=15},
+                        new ExcelColumn("留学需求"){ CellWidth=10},
+                        new ExcelColumn("美团点评"){ CellWidth=15},
+                        new ExcelColumn("教育同行(签约)"){ CellWidth=15},
+                        new ExcelColumn("教育同行(未签约)"){ CellWidth=15},
+                        new ExcelColumn("过路客(直客)"){ CellWidth=15},
+                        new ExcelColumn("朋友圈"){ CellWidth=15},
+                        new ExcelColumn("学员转介绍"){ CellWidth=15},
+                        new ExcelColumn("校园推广"){ CellWidth=15},
+                        new ExcelColumn("校园代理"){ CellWidth=15},
+                        new ExcelColumn("线下活动"){ CellWidth=15},
+                        new ExcelColumn("公众号"){ CellWidth=15},
+                        new ExcelColumn("教师推荐"){ CellWidth=15},
+                        new ExcelColumn("字节跳动"){ CellWidth=15},
+                        new ExcelColumn("第三方平台"){ CellWidth=15},
+                        new ExcelColumn("其他"){ CellWidth=15},
+                        new ExcelColumn("A类客户"){ CellWidth=15},
+                        new ExcelColumn("B类客户"){ CellWidth=15},
+                        new ExcelColumn("C类客户"){ CellWidth=15},
+                        new ExcelColumn("D类客户"){ CellWidth=15},
+                        new ExcelColumn("无效"){ CellWidth=15},
+                        new ExcelColumn("签约.成交.续费"){ CellWidth=15},
+                        new ExcelColumn("语培签约金额"){ CellWidth=15},
+                        new ExcelColumn("留学签约金额"){ CellWidth=15},
+                    }
+                };
+                slist.Add(header);
+                foreach (var item in list)
+                {
+                    JObject dObj = JObject.Parse(JsonHelper.Serialize(item));
+                    var columns = new List<ExcelColumn>
+                    {
+                        new ExcelColumn(dObj.GetStringValue("DateStr"))
+                    };
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("PushCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("TrainCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("StudyCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("MeiTuanCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("EduCustomerSign")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("EduCustomerNotSign")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("PassBy")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("WeChatFriend")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("TransCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("SchoolPromote")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("SchoolAgent")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("OfflineActivity")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("OfficialAccount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("TeacherRecommend")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ByteDance")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ThirdPartyPlatform")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("Other")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassACount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassBCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassCCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassDCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("InvalidCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney")));
+                    var dataRow = new ExcelDataSource()
+                    {
+                        ExcelRows = columns
+                    };
+                    slist.Add(dataRow);
+                }
+                var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData, "application/octet-stream", excelName);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DownLoadStudentMarketMonth");
+                var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData1, "application/octet-stream", excelName);
+            }
+        }
+
+        /// <summary>
+        /// 市场部客户数据月度成长率统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetStudentMarketMonthRate()
+        {
+            var query = new RB_Student_Market_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = studentStatModule.GetStudentMarketRateListMonthModule(query);
+            return ApiResult.Success(data: list);
+        }
+
+        /// <summary>
+        /// 下载市场部客户数据月度成长率统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Obsolete]
+        public FileContentResult DownLoadStudentMarketMonthRate()
+        {
+            var query = new RB_Student_Market_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = studentStatModule.GetStudentMarketRateListMonthModule(query);
+            string excelName = "市场部月成长率统计.xls";
+            List<ExcelDataSource> slist = new List<ExcelDataSource>();
+            try
+            {
+                ExcelDataSource header = new ExcelDataSource
+                {
+                    ExcelRows = new List<ExcelColumn>()
+                    {
+                        new ExcelColumn("名称"){ CellWidth=25},
+                        new ExcelColumn("1月"){ CellWidth=15},
+                        new ExcelColumn("2月"){ CellWidth=15},
+                        new ExcelColumn("3月"){ CellWidth=10},
+                        new ExcelColumn("4月"){ CellWidth=15},
+                        new ExcelColumn("5月"){ CellWidth=15},
+                        new ExcelColumn("6月"){ CellWidth=15},
+                        new ExcelColumn("7月"){ CellWidth=15},
+                        new ExcelColumn("8月"){ CellWidth=15},
+                        new ExcelColumn("9月"){ CellWidth=15},
+                        new ExcelColumn("10月"){ CellWidth=15},
+                        new ExcelColumn("11月"){ CellWidth=15},
+                        new ExcelColumn("12月"){ CellWidth=15},
+                        new ExcelColumn("平均"){ CellWidth=15},
+                    }
+                };
+                slist.Add(header);
+                foreach (var item in list)
+                {
+                    var columns = new List<ExcelColumn>
+                    {
+                        new ExcelColumn(item.ItemName)
+                    };
+                    columns.Add(new ExcelColumn(item.JanuaryRate + "%"));
+                    columns.Add(new ExcelColumn(item.FebruaryRate + "%"));
+                    columns.Add(new ExcelColumn(item.MarchRate + "%"));
+                    columns.Add(new ExcelColumn(item.AprilRate + "%"));
+                    columns.Add(new ExcelColumn(item.MayRate + "%"));
+                    columns.Add(new ExcelColumn(item.JuneRate + "%"));
+                    columns.Add(new ExcelColumn(item.JulyRate + "%"));
+                    columns.Add(new ExcelColumn(item.AugustRate + "%"));
+                    columns.Add(new ExcelColumn(item.SeptemberRate + "%"));
+                    columns.Add(new ExcelColumn(item.OctoberRate + "%"));
+                    columns.Add(new ExcelColumn(item.NovemberRate + "%"));
+                    columns.Add(new ExcelColumn(item.DecemberRate + "%"));
+                    columns.Add(new ExcelColumn(item.AvgRate + "%"));
+                    var dataRow = new ExcelDataSource()
+                    {
+                        ExcelRows = columns
+                    };
+                    slist.Add(dataRow);
+                }
+                var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData, "application/octet-stream", excelName);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DownLoadStudentMarketMonthRate");
+                var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData1, "application/octet-stream", excelName);
+            }
+        }
+
+        /// <summary>
+        /// 市场部客户数据年度统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetStudentMarketYear()
+        {
+            var query = new RB_Student_Market_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = studentStatModule.GetStudentMarketListYearModule(query);
+            return ApiResult.Success(data: list);
+        }
+
+        /// <summary>
+        /// 下载市场部客户数据年度统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Obsolete]
+        public FileContentResult DownLoadStudentMarketYear()
+        {
+            var query = new RB_Student_Market_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = studentStatModule.GetStudentMarketListYearModule(query);
+            string excelName = "市场部年度数据统计.xls";
+            List<ExcelDataSource> slist = new List<ExcelDataSource>();
+            try
+            {
+                ExcelDataSource header = new ExcelDataSource
+                {
+                    ExcelRows = new List<ExcelColumn>()
+                    {
+                        new ExcelColumn("名称"){ CellWidth=25},
+                        new ExcelColumn("2021"){ CellWidth=15},
+                        new ExcelColumn("2022"){ CellWidth=15},
+                        new ExcelColumn("成长率"){ CellWidth=10},
+                    }
+                };
+                slist.Add(header);
+                foreach (var item in list)
+                {
+                    var columns = new List<ExcelColumn>
+                    {
+                        new ExcelColumn(item.ItemName)
+                    };
+                    columns.Add(new ExcelColumn(item.FirstYear.ToString()));
+                    columns.Add(new ExcelColumn(item.SecondYear.ToString()));
+                    columns.Add(new ExcelColumn(item.YearRate + "%"));
+                    var dataRow = new ExcelDataSource()
+                    {
+                        ExcelRows = columns
+                    };
+                    slist.Add(dataRow);
+                }
+                var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData, "application/octet-stream", excelName);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DownLoadStudentMarketYear");
+                var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData1, "application/octet-stream", excelName);
+            }
+        }
+
+        /// <summary>
+        /// 市场部客户数据年度成长率统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetStudentMarketYearRate()
+        {
+            var query = new RB_Student_Market_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = studentStatModule.GetStudentMarketListYearRateModule(query);
+            return ApiResult.Success(data: list);
+        }
+
+        /// <summary>
+        /// 下载市场部客户数据年度成长率统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Obsolete]
+        public FileContentResult DownLoadStudentMarketYearRate()
+        {
+            var query = new RB_Student_Market_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = studentStatModule.GetStudentMarketListYearRateModule(query);
+            string excelName = "市场部年度成长率统计.xls";
+            List<ExcelDataSource> slist = new List<ExcelDataSource>();
+            try
+            {
+                ExcelDataSource header = new ExcelDataSource
+                {
+                    ExcelRows = new List<ExcelColumn>()
+                    {
+                        new ExcelColumn("名称"){ CellWidth=25},
+                        new ExcelColumn("2021"){ CellWidth=15},
+                        new ExcelColumn("2022"){ CellWidth=15},
+                        new ExcelColumn("成长率"){ CellWidth=10},
+                    }
+                };
+                slist.Add(header);
+                foreach (var item in list)
+                {
+                    var columns = new List<ExcelColumn>
+                    {
+                        new ExcelColumn(item.ItemName)
+                    };
+                    columns.Add(new ExcelColumn(item.FirstYear.ToString()));
+                    columns.Add(new ExcelColumn(item.SecondYear.ToString()));
+                    columns.Add(new ExcelColumn(item.YearRate + "%"));
+                    var dataRow = new ExcelDataSource()
+                    {
+                        ExcelRows = columns
+                    };
+                    slist.Add(dataRow);
+                }
+                var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData, "application/octet-stream", excelName);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DownLoadStudentMarketYearRate");
+                var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData1, "application/octet-stream", excelName);
+            }
+        }
+        #endregion
     }
 }

Edu.WebApi/Timers/TimerJobj.cs

-using Edu.CacheManager.Base;
+using Edu.Cache.User;
+using Edu.CacheManager.Base;
 using Edu.Common.Plugin;
+using Edu.Model.CacheModel;
 using Edu.Module.Course;
 using Edu.Module.Customer;
 using Edu.Module.Duty;
 using Edu.Module.EduTask;
 using Edu.Module.Exam;
+using Edu.Module.User;
 using System;
 using System.IO;
 using System.Threading;
@@ -46,6 +49,11 @@ namespace Edu.WebApi.Timers
         /// </summary>
         private static readonly ClassModule classModule = new ClassModule();
 
+        /// <summary>
+        /// 学员数据统计处理类
+        /// </summary>
+        private static readonly StudentStatModule studentStatModule = new StudentStatModule();
+
         /// <summary>
         /// 使用redis第几号库
         /// </summary>
@@ -221,6 +229,10 @@ namespace Edu.WebApi.Timers
                     redis.Set(createMarkDataKey, Common.ConvertHelper.FormatDate(currentDate));
                     marketConsultantModule.CreateConsultantDataModule(currentDate);
                     marketConsultantModule.CreateMarketDataModule(currentDate);
+
+                    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);
             }