页面修改

Edu.Module.User/StudentModule.cs

@@ -74,7 +74,7 @@ namespace Edu.Module.User
         /// <summary>
         /// 学员试听课仓储层对象
         /// </summary>
-        private readonly RB_Visitor_ReserveRepository  visitor_ReserveRepository = new RB_Visitor_ReserveRepository();
+        private readonly RB_Visitor_ReserveRepository visitor_ReserveRepository = new RB_Visitor_ReserveRepository();
 
         /// <summary>
         /// 客户阶段仓储层对象
@@ -133,7 +133,7 @@ namespace Edu.Module.User
                 var stuTypeList = student_TypeRepository.GetStudentTypeListRepository(new RB_Student_Type_Extend());
                 string stuIds = string.Join(",", list.Select(qitem => qitem.StuId));
                 //学员跟进
-                var followList= followRepository.GetStudentFollowListRepository(new RB_Student_Follow_Extend()
+                var followList = followRepository.GetStudentFollowListRepository(new RB_Student_Follow_Extend()
                 {
                     QStuIds = stuIds
                 });
@@ -143,7 +143,7 @@ namespace Edu.Module.User
                     QStudentIds = stuIds
                 });
                 //本周新增
-                var stuList= studentRepository.GetCustomerStuWeekListRepository(new RB_Student_ViewModel()
+                var stuList = studentRepository.GetCustomerStuWeekListRepository(new RB_Student_ViewModel()
                 {
                     CustomerId = query.CustomerId
                 });
@@ -153,10 +153,10 @@ namespace Edu.Module.User
                     QStuIds = stuIds
                 });
                 //内部介绍人
-                List<int> empIdList= Common.ConvertHelper.StringToList(string.Join(",", list.Where(qitem=>qitem.CreateType== StuCreateTypeEnum.InternalIntroduction).Select(qitem => qitem.StuSourceId)));
+                List<int> empIdList = Common.ConvertHelper.StringToList(string.Join(",", list.Where(qitem => qitem.CreateType == StuCreateTypeEnum.InternalIntroduction).Select(qitem => qitem.StuSourceId)));
                 List<int> aIds = Common.ConvertHelper.StringToList(string.Join(",", assistList.Select(qitem => qitem.AssistId)));
                 List<RB_Account_ViewModel> accountList = new List<RB_Account_ViewModel>();
-                if (aIds!=null&&aIds.Count>0)
+                if (aIds != null && aIds.Count > 0)
                 {
                     empIdList.AddRange(aIds);
                 }
@@ -206,7 +206,7 @@ namespace Edu.Module.User
                 List<int> customerIdList = Common.ConvertHelper.StringToList(string.Join(",", list.Where(qitem => qitem.CreateType == StuCreateTypeEnum.CustomerInput).Select(qitem => qitem.StuSourceId)));
                 if (customerIdList != null && customerIdList.Count > 0)
                 {
-                    customerList= customerRepository.GetCustomerListRepository(new RB_Customer_Extend()
+                    customerList = customerRepository.GetCustomerListRepository(new RB_Customer_Extend()
                     {
                         CustomerIds = string.Join(",", customerIdList)
                     });
@@ -226,13 +226,13 @@ namespace Edu.Module.User
                 string goalIds = string.Join(",", list.Select(qitem => qitem.StuPurpose));
                 var goalList = learningGoalsRepository.GetLearningGoalsListRepository(new Model.ViewModel.System.RB_LearningGoals_Extend()
                 {
-                    QGoalIds=goalIds
+                    QGoalIds = goalIds
                 });
 
                 string channelIds = string.Join(",", list.Select(qitem => qitem.StuChannel));
                 var channelList = channelRepository.GetChannelListRepository(new Model.ViewModel.System.RB_Channel_Extend()
                 {
-                    QChannelIds=channelIds
+                    QChannelIds = channelIds
                 });
 
                 var needIds = string.Join(",", list.Select(qitem => qitem.StuNeeds));
@@ -245,10 +245,10 @@ namespace Edu.Module.User
                     var tempOrderList = stuOrderList?.Where(qitem => qitem.Student_Id == item.StuId)?.ToList();
                     var tempFollow = followList?.Where(qitem => qitem.StuId == item.StuId)?.OrderByDescending(qitem => qitem.Id)?.FirstOrDefault();
                     item.followUpTime = Common.ConvertHelper.FormatTime(tempFollow?.CreateTime);
-                    item.WeekCount = stuList?.Count()??0;
+                    item.WeekCount = stuList?.Count() ?? 0;
                     item.TodayCount = stuList?.Where(qitem => Common.ConvertHelper.FormatDate(qitem.CreateTime) == Common.ConvertHelper.FormatDate(DateTime.Now))?.Count() ?? 0;
                     item.OrderCount = tempOrderList?.Count() ?? 0;
-                    item.RenewOrderCount = tempOrderList?.Where(qitem => qitem.RenewState == 2)?.Count()??0;
+                    item.RenewOrderCount = tempOrderList?.Where(qitem => qitem.RenewState == 2)?.Count() ?? 0;
                     item.StuGuestState = tempOrderList?.OrderByDescending(qitem => qitem.OrderId)?.LastOrDefault()?.StuGuestState ?? 0;
                     item.AreaName = (destinationList?.FirstOrDefault(qitem => qitem.ID == item.ProviceId)?.Name ?? "")
                         + "/" + (destinationList?.FirstOrDefault(qitem => qitem.ID == item.CityId)?.Name ?? "")
@@ -290,7 +290,7 @@ namespace Edu.Module.User
         /// <param name="model"></param>
         /// <param name="Type">1-电话，2-QQ，3-微信号</param>
         /// <returns></returns>
-        public bool CheckStudentModule(RB_Student_ViewModel model,int Type)
+        public bool CheckStudentModule(RB_Student_ViewModel model, int Type)
         {
             List<WhereHelper> where = new List<WhereHelper>()
             {
@@ -337,7 +337,7 @@ namespace Edu.Module.User
         /// <param name="model"></param>
         /// <param name="fromApp">来至于同业  1是</param>
         /// <returns></returns>
-        public bool SetStudentModule(RB_Student_ViewModel model, int fromApp =0)
+        public bool SetStudentModule(RB_Student_ViewModel model, int fromApp = 0)
         {
             bool IsInsert = false;
             if (model.StuId == 0) { IsInsert = true; }
@@ -381,7 +381,7 @@ namespace Edu.Module.User
         /// <param name="StuStage"></param>
         /// <param name="Uid"></param>
         /// <returns></returns>
-        public bool SetStudentStageModule(int StuId,int StuStage,int Uid)
+        public bool SetStudentStageModule(int StuId, int StuStage, int Uid)
         {
             return studentRepository.SetStudentStageRepository(StuId, StuStage, Uid);
         }
@@ -408,9 +408,9 @@ namespace Edu.Module.User
         /// <param name="CreateBy">负责人</param>
         /// <param name="OperateId">操作人</param>
         /// <returns></returns>
-        public bool ForwardStudentModule(int StuId, int CreateBy,int OperateId)
+        public bool ForwardStudentModule(int StuId, int CreateBy, int OperateId)
         {
-           return studentRepository.ForwardStudentRepository(StuId, CreateBy, OperateId);
+            return studentRepository.ForwardStudentRepository(StuId, CreateBy, OperateId);
         }
 
         /// <summary>
@@ -586,13 +586,27 @@ namespace Edu.Module.User
         /// 推送消息
         /// </summary>
         /// <param name="model"></param>
-        public void PushMessageModule(RB_Student_ViewModel model)
+        /// <param name="type">1-手机，2-QQ,3-微信</param>
+        public void PushMessageModule(RB_Student_ViewModel model, int type)
         {
             var assistList = GetStuAssistListModule(model.StuId);
             var customerModel = customerRepository.GetEntity(model.CustomerId);
 
-            
-            string markdownContent = $"`同业查重通知` \n>**概要信息** \n>同业名称：{customerModel?.CustomerName ?? ""}({customerModel?.ContactNumber ?? ""})\n>学生名称：{model.StuName}\n>学生电话：{model.StuTel}\n>";
+            string searchContent = model.StuTel;
+            if (type == 2)
+            {
+                searchContent = model.QQ;
+            }
+            if (type == 3)
+            {
+                searchContent = model.WeChatNo;
+            }
+            string createByName = accountModule.GetAccountListExtModule(new RB_Account_ViewModel()
+            {
+                Id = model.CreateBy
+            })?.FirstOrDefault()?.AccountName ?? "";
+            string markdownContent = $"`同业查重通知` \n>**概要信息** \n>同业名称：{customerModel?.CustomerName ?? ""}({customerModel?.ContactNumber ?? ""})\n>查询内容：{searchContent} \n>关联学员：{model.StuName}\n>关联学员电话：{model.StuTel}\n>";
+            markdownContent += $"关联同事：{ createByName}\n> ";
             Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
             {
                 CategoryId = PushMessageCategoryEnum.B2BCustomerStu,
@@ -606,7 +620,6 @@ namespace Edu.Module.User
                 Title = "同业查重通知",
                 Platform = 5,
             };
-
             if (customerModel.CreateBy > 0)
             {
                 var queryTargetWorkId = accountModule.GetWorkUserIdModule(customerModel.CreateBy);