页面修改

Edu.Common/Enum/Course/GuestEducationEnum.cs

@@ -55,5 +55,11 @@ namespace Edu.Common.Enum.Course
         /// </summary>
         [EnumField("博士后")]
         N9 = 9,
+
+        /// <summary>
+        /// 在职
+        /// </summary>
+        [EnumField("在职")]
+        N10 = 10,
     }
 }

Edu.Repository/User/RB_StudentRepository.cs

@@ -163,11 +163,25 @@ WHERE 1=1
                     builder.AppendFormat(" AND t.{0} LIKE @StuTel ", nameof(RB_Student_ViewModel.StuTel));
                     parameters.Add("StuTel", "%" + query.StuTel.Trim() + "%");
                 }
+                if (!string.IsNullOrWhiteSpace(query.QQ))
+                {
+                    builder.AppendFormat(" AND t.{0} LIKE @QQ ", nameof(RB_Student_ViewModel.QQ));
+                    parameters.Add("QQ", "%" + query.QQ.Trim() + "%");
+                }
+                if (!string.IsNullOrWhiteSpace(query.WeChatNo))
+                {
+                    builder.AppendFormat(" AND t.{0} LIKE @WeChatNo ", nameof(RB_Student_ViewModel.WeChatNo));
+                    parameters.Add("WeChatNo", "%" + query.WeChatNo.Trim() + "%");
+                }
                 if (!string.IsNullOrWhiteSpace(query.KeyWords))
                 {
                     builder.AppendFormat(" AND (t.{0} LIKE @KeyWords OR  t.{1} LIKE @KeyWords) ", nameof(RB_Student_ViewModel.StuName), nameof(RB_Student_ViewModel.StuTel));
                     parameters.Add("KeyWords", "%" + query.KeyWords.Trim() + "%");
                 }
+                if (query.StuType > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.StuType), query.StuType);
+                }
                 if (query.ProviceId > 0)
                 {
                     builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.ProviceId), query.ProviceId);

Edu.WebApi/Controllers/User/UserController.cs

@@ -676,7 +676,10 @@ namespace Edu.WebApi.Controllers.User
                 StartTime = base.ParmJObj.GetStringValue("StartTime"),
                 EndTime = base.ParmJObj.GetStringValue("EndTime"),
                 BelongType=base.ParmJObj.GetInt("BelongType"),
-                QStudentType = base.ParmJObj.GetInt("QStudentType", -1)
+                QStudentType = base.ParmJObj.GetInt("QStudentType", -1),
+                QQ=base.ParmJObj.GetStringValue("QQ"),
+                WeChatNo=base.ParmJObj.GetStringValue("WeChatNo"),
+                StuType=base.ParmJObj.GetInt("StuType"),
             };
             if (query.IsQueryMyStu == 1)
             {
@@ -951,11 +954,11 @@ namespace Edu.WebApi.Controllers.User
                         {
                             if (isB2B)
                             {
-                                message = "此学员微信已绑定同行!请重新录入!";
+                                message = "此学员微信号已绑定同行!请重新录入!";
                             }
                             else
                             {
-                                message = string.Format("此学员QQ号已被【{0}】于【{1}】注册。", name, Common.ConvertHelper.FormatTime(model.CreateTime));
+                                message = string.Format("此学员微信号已被【{0}】于【{1}】注册。", name, Common.ConvertHelper.FormatTime(model.CreateTime));
                             }
                         }
                     }
@@ -963,12 +966,12 @@ namespace Edu.WebApi.Controllers.User
                     {
                         if (isB2B)
                         {
-                            message = "此学员微信已绑定同行!请重新录入!";
+                            message = "此学员微信号已绑定同行!请重新录入!";
                             PushMessage(model);
                         }
                         else
                         {
-                            message = string.Format("此学员QQ号已被【{0}】于【{1}】注册。", name, Common.ConvertHelper.FormatTime(model.CreateTime));
+                            message = string.Format("此学员微信号已被【{0}】于【{1}】注册。", name, Common.ConvertHelper.FormatTime(model.CreateTime));
                         }
                     }
                 }