页面修改

Edu.Model/Entity/Course/RB_Course.cs

@@ -366,5 +366,15 @@ namespace Edu.Model.Entity.Course
         /// 课程增加课时费
         /// </summary>
         public decimal AddHoursMoney { get; set; }
+
+        /// <summary>
+        /// 中教课时
+        /// </summary>
+        public decimal ChineseHours { get; set; }
+
+        /// <summary>
+        /// 外教课时
+        /// </summary>
+        public decimal ForeignHours { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/DataStatistics/StudentFollowStatic.cs

+using Edu.Common.Enum.Course;
+using Edu.Common.Enum.User;
+using Edu.Model.ViewModel.Customer;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.DataStatistics
+{
+    /// <summary>
+    /// 学员跟进统计信息实体类
+    /// </summary>
+    [Serializable]
+    public class StudentFollowStatic
+    {
+        /// <summary>
+        /// 学员编号
+        /// </summary>
+        public int StuId { get; set; }
+
+        /// <summary>
+        /// 学员名称
+        /// </summary>
+        public string StuName { get; set; }
+    
+        /// <summary>
+        /// 学员电话
+        /// </summary>
+        public string StuTel { get; set; }
+
+        /// <summary>
+        /// 学员真实电话
+        /// </summary>
+        public string StuRealMobile { get; set; }
+
+        /// <summary>
+        /// 最后一次跟进时间
+        /// </summary>
+        public string ContractSTime { get; set; }
+
+        /// <summary>
+        /// 课程名称
+        /// </summary>
+        public string CourseName { get; set; }
+
+        /// <summary>
+        /// 日语基础
+        /// </summary>
+        public string JapanBaseInfo { get; set; }
+
+        /// <summary>
+        /// 出生日期
+        /// </summary>
+        public string StuBirthStr { get; set; }
+
+        /// <summary>
+        /// 学员状态
+        /// </summary>
+        public GuestStateEnum StuGuestState { get; set; }
+
+        /// <summary>
+        /// 学员状态名称
+        /// </summary>
+        public string StuGuestStateName { get; set; }
+
+        /// <summary>
+        /// 月份数据
+        /// </summary>
+        public List<object> MonthList { get; set; }
+
+        /// <summary>
+        /// 负责人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 负责人姓名
+        /// </summary>
+        public string CreateByName { get; set; }
+
+        /// 协助人员
+        /// </summary>
+        public List<RB_Student_Assist_Extend> AssistList { get; set; }
+
+        /// <summary>
+        /// 收客渠道
+        /// </summary>
+        public int StuChannel { get; set; }
+
+        /// <summary>
+        /// 收客渠道名称
+        /// </summary>
+        public string StuChannelName { get; set; }
+
+        /// <summary>
+        /// 客户来源见枚举
+        /// </summary>
+        public StuCreateTypeEnum CreateType { get; set; }
+
+        /// <summary>
+        /// 客户来源名称
+        /// </summary>
+        public string CreateTypeName { get; set; }
+
+        /// <summary>
+        /// 来源人编号
+        /// </summary>
+        public int StuSourceId { get; set; }
+
+        /// <summary>
+        /// 来源名称
+        /// </summary>
+        public string StuSourceIdName { get; set; }
+
+        /// <summary>
+        /// 同业企业
+        /// </summary>
+        public string EnterpriseName { get; set; }
+
+        /// <summary>
+        /// 学习目的
+        /// </summary>
+        public int StuPurpose { get; set; }
+
+        /// <summary>
+        /// 学习目的名称
+        /// </summary>
+        public string StuPurposeName { get; set; }
+
+        /// <summary>
+        /// 课程顾问胜率
+        /// </summary>
+        public decimal AdvisorWinRate { get; set; }
+
+        /// <summary>
+        /// 课程顾问期望达成协议日期
+        /// </summary>
+        public string AdvisorExpectDate { get; set; }
+
+        /// <summary>
+        /// 课程顾问跟进状态
+        /// </summary>
+        public int AdvisorStatus { get; set; }
+
+        /// <summary>
+        /// 课程顾问跟进状态名称
+        /// </summary>
+        public string AdvisorStatusName{ get; set; }
+
+        /// <summary>
+        /// 课程顾问跟进信息列表
+        /// </summary>
+        public List<RB_Student_Advisor_Extend> AdvisorList { get; set; }
+
+        /// <summary>
+        /// 开始上课日期
+        /// </summary>
+        public string BeginClassDate { get; set; }
+
+        /// <summary>
+        /// 毕业日期
+        /// </summary>
+        public string GraduationTime { get; set; }
+    }
+}

Edu.Module.EduTask/CourseVipModule.cs

@@ -183,6 +183,7 @@ namespace Edu.Module.EduTask
                     CateId = 12,//日语VIP订制系列
                     OriginalPrice = model.CoursePrice,
                     SellPrice = model.CoursePrice,
+                    ChineseHours=model.TotalHour,
                     ClassHours = model.TotalHour,
                     CourseTimeId = model.CourseTimeId,
                 };

Edu.Repository/Course/RB_CourseRepository.cs

@@ -271,6 +271,7 @@ WHERE 1=1
                 model.RenewOgPrice = 0;
                 model.RenewSlPrice = 0;
             }
+            model.ClassHours = model.ChineseHours + model.ForeignHours;
             if (model.CourseId > 0)
             {
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
@@ -303,6 +304,8 @@ WHERE 1=1
                     {nameof(RB_Course_ViewModel.OpenBankLevel),model.OpenBankLevel },
                     {nameof(RB_Course_ViewModel.FreeCoffeeNum),model.FreeCoffeeNum },
                     {nameof(RB_Course_ViewModel.AddHoursMoney),model.AddHoursMoney },
+                    {nameof(RB_Course_ViewModel.ChineseHours),model.ChineseHours },
+                    {nameof(RB_Course_ViewModel.ForeignHours),model.ForeignHours },
                 };
                 flag = base.Update(fileds, new WhereHelper(nameof(RB_Course_ViewModel.CourseId), model.CourseId));
             }

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -423,7 +423,9 @@ namespace Edu.WebApi.Controllers.Course
                 ScrollMaxNum = base.ParmJObj.GetInt("ScrollMaxNum"),
                 CourseTimeId = base.ParmJObj.GetInt("CourseTimeId"),
                 FreeCoffeeNum = base.ParmJObj.GetInt("FreeCoffeeNum", 0),
-                AddHoursMoney = base.ParmJObj.GetDecimal("AddHoursMoney")
+                AddHoursMoney = base.ParmJObj.GetDecimal("AddHoursMoney"),
+                ChineseHours = base.ParmJObj.GetDecimal("ChineseHours"),
+                ForeignHours = base.ParmJObj.GetDecimal("ForeignHours"),
             };
             try
             {

Edu.WebApi/Controllers/User/StudentStatController.cs

@@ -235,13 +235,13 @@ namespace Edu.WebApi.Controllers.User
                 header.ExcelRows.Add(new ExcelColumn("结课时间") { CellWidth = 15, Rowspan = 2 });
                 header.ExcelRows.Add(new ExcelColumn("当前级别") { CellWidth = 15, Rowspan = 2 });
                 header.ExcelRows.Add(new ExcelColumn("生日") { CellWidth = 15, Rowspan = 2 });
-                if (base.UserInfo.AccountType != AccountTypeEnum.Teacher)
+                if (demodel.QueryTpye!=2)
                 {
                     header.ExcelRows.Add(new ExcelColumn("客户来源") { CellWidth = 15, Rowspan = 2 });
                 }
       
                 header.ExcelRows.Add(new ExcelColumn("学习目的") { CellWidth = 15, Rowspan = 2 });
-                if (base.UserInfo.AccountType != AccountTypeEnum.Teacher)
+                if (demodel.QueryTpye != 2)
                 {
                     header.ExcelRows.Add(new ExcelColumn("关联来源人") { CellWidth = 15, Rowspan = 2 });
                     header.ExcelRows.Add(new ExcelColumn("收客渠道") { CellWidth = 15, Rowspan = 2 });
@@ -249,7 +249,7 @@ namespace Edu.WebApi.Controllers.User
                 header.ExcelRows.Add(new ExcelColumn("负责人") { CellWidth = 15, Rowspan = 2 });
                 header.ExcelRows.Add(new ExcelColumn("合同状态") { CellWidth = 15, Rowspan = 2 });
 
-                if (base.UserInfo.AccountType != AccountTypeEnum.Teacher)
+                if (demodel.QueryTpye != 2)
                 {
                     header.ExcelRows.Add(new ExcelColumn("期望达成协议日期") { CellWidth = 15, Rowspan = 2 });
                     header.ExcelRows.Add(new ExcelColumn("目前状态") { CellWidth = 15, Rowspan = 2 });
@@ -272,7 +272,7 @@ namespace Edu.WebApi.Controllers.User
                         new ExcelColumn(),
                     }
                 };
-                if (base.UserInfo.AccountType != AccountTypeEnum.Teacher)
+                if (demodel.QueryTpye != 2)
                 {
                     subHeader.ExcelRows.Add(new ExcelColumn());
                     subHeader.ExcelRows.Add(new ExcelColumn()); 
@@ -281,7 +281,7 @@ namespace Edu.WebApi.Controllers.User
                     subHeader.ExcelRows.Add(new ExcelColumn());
                 }
                 subHeader.ExcelRows.Add(new ExcelColumn());
-                if (base.UserInfo.AccountType != AccountTypeEnum.Teacher)
+                if (demodel.QueryTpye != 2)
                 {
                     subHeader.ExcelRows.Add(new ExcelColumn());
                     subHeader.ExcelRows.Add(new ExcelColumn());
@@ -334,12 +334,12 @@ namespace Edu.WebApi.Controllers.User
                         columns.Add(new ExcelColumn(item.GraduationTime));
                         columns.Add(new ExcelColumn(item.JapanBaseInfo));
                         columns.Add(new ExcelColumn(item.StuBirthStr));
-                        if (base.UserInfo.AccountType != AccountTypeEnum.Teacher)
+                        if (demodel.QueryTpye != 2)
                         {
                             columns.Add(new ExcelColumn(item.CreateTypeName));
                         }
                         columns.Add(new ExcelColumn(item.StuPurposeName));
-                        if (base.UserInfo.AccountType != AccountTypeEnum.Teacher)
+                        if (demodel.QueryTpye != 2)
                         {
                             columns.Add(new ExcelColumn(item.StuSourceIdName));
                             columns.Add(new ExcelColumn(item.StuChannelName));