页面修改

Edu.Module.Customer/CustomerStudentModule.cs

@@ -16,6 +16,7 @@ using Edu.Cache.Customer;
 using Edu.Repository.StudyAbroad;
 using Edu.Model.ViewModel.StudyAbroad;
 using Edu.Common.Enum.System;
+using Newtonsoft.Json.Linq;
 
 namespace Edu.Module.Customer
 {
@@ -817,7 +818,7 @@ namespace Edu.Module.Customer
             {
                 QDictKeys = string.Format("'{0}','{1}','{2}'", pushKey, pushRule, studyabroad)
             });
-            var stuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { StuIds = studIds });
+            var stuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { StuIds = studIds.TrimStart(',').TrimEnd(',') });
             var push = dicList.Where(qitem => qitem.DictKey == pushKey).FirstOrDefault();
             var rule = dicList.Where(qitem => qitem.DictKey == pushRule).FirstOrDefault();
             var study= dicList.Where(qitem => qitem.DictKey == studyabroad).FirstOrDefault();
@@ -831,24 +832,84 @@ namespace Edu.Module.Customer
                         Id = 0,
                         AssistType = Common.Enum.User.AssistTypeEnum.CourseAdviser,
                         StuId = item.StuId,
-                        Status = Common.Enum.DateStateEnum.Normal
+                        Status = DateStateEnum.Normal
                     };
-                    //留学就业分配
-                    if (study.Code.Contains(item.StuNeeds.ToString()))
+                    if (!string.IsNullOrEmpty(study.Content))
                     {
+                        JArray jArray = JArray.Parse(study.Content);
+                        if (jArray != null && jArray.Count > 0)
+                        {
+                            bool isExists = false;
+                            RB_Dictvalue_Extend tempItem = null;
+                            foreach (var jItem in jArray)
+                            {
+                                JObject sObj = JObject.Parse(jItem.ToString());
+                                if (!isExists&& sObj.GetStringValue("Code").Contains(item.StuNeeds.ToString()))
+                                {
+                                    isExists = true;
+                                    tempItem = new RB_Dictvalue_Extend()
+                                    {
+                                        Content= sObj.GetStringValue("Content"),
+                                        Mask= sObj.GetStringValue("Mask"),
+                                    };
+                                }
+                            }
+                            if (isExists)
+                            {
+                                mask += PushStudyManagerModule(tempItem, model, uid);
+                            }
+                            else
+                            {
+                                mask += PushCourseManagerModule(push, rule, model, uid);
+                            }
+                        }
+                    }
+                    //语培客户分配规则
+                    else
+                    {
+                        mask += PushCourseManagerModule(push, rule, model, uid);
+                    }
+                }
+                return (true, "学员批量转课程顾问成功，已分别转给顾问：" + mask);
+            }
+            else
+            {
+                return (false, "未获取到学员信息");
+            }
+        }
+
+        /// <summary>
+        /// 推送学员给留学顾问
+        /// </summary>
+        /// <param name="study"></param>
+        /// <param name="model"></param>
+        /// <param name="uid"></param>
+        /// <returns></returns>
+        private string PushStudyManagerModule(RB_Dictvalue_Extend study, RB_Student_Assist_Extend model,int uid)
+        {
+            string mask = "";
             var idArray = Common.ConvertHelper.StringToList(study.Content);
             var nameArray = Common.ConvertHelper.StringToFileList(study.Mask);
             if (idArray != null && idArray.Count > 0)
             {
                 model.AssistId = idArray[0];
-                            SetStudentAssistModule(item.StuId, model, uid);
+                SetStudentAssistModule(model.StuId, model, uid);
                 mask += mask.Contains("," + nameArray[0]) ? "" : "," + nameArray[0];
             }
-                    
+            return mask;
         }
-                    //语培客户分配规则
-                    else
+
+        /// <summary>
+        /// 推送学员给普通课程顾问
+        /// </summary>
+        /// <param name="push"></param>
+        /// <param name="rule"></param>
+        /// <param name="model"></param>
+        /// <param name="uid"></param>
+        /// <param name="mask"></param>
+        private string PushCourseManagerModule(RB_Dictvalue_Extend push, RB_Dictvalue_Extend rule, RB_Student_Assist_Extend model,int uid)
         {
+            string mask = "";
             var guwen = push.Content.Split(',', StringSplitOptions.RemoveEmptyEntries);
             var guwenName = push.Mask.Split(',', StringSplitOptions.RemoveEmptyEntries);
             if (guwen.Length > 1)
@@ -858,7 +919,7 @@ namespace Edu.Module.Customer
                     Random ran = new Random();
                     var cur = ran.Next(0, guwen.Length - 1);
                     model.AssistId = int.Parse(guwen[cur]);
-                                SetStudentAssistModule(item.StuId, model, uid);
+                    SetStudentAssistModule(model.StuId, model, uid);
                     mask += mask.Contains("," + guwenName[cur]) ? "" : "," + guwenName[cur];
                 }
                 else
@@ -870,18 +931,11 @@ namespace Edu.Module.Customer
                         cache = 0;
                     }
                     model.AssistId = int.Parse(guwen[cache]);
-                                SetStudentAssistModule(item.StuId, model, uid);
+                    SetStudentAssistModule(model.StuId, model, uid);
                     mask += mask.Contains("," + guwenName[cache]) ? "" : "," + guwenName[cache];
                 }
             }
-                    }
-                }
-                return (true, "学员批量转课程顾问成功，已分别转给顾问：" + mask);
-            }
-            else
-            {
-                return (false, "未获取到学员信息");
-            }
+            return mask;
         }
 
         /// <summary>