页面修改

Edu.Model/Entity/User/RB_Student.cs

@@ -114,7 +114,7 @@ namespace Edu.Model.Entity.User
         /// <summary>
         /// 日语基础信息
         /// </summary>
-        public int JapanBaseInfo { get; set; }
+        public GuestBasicsEnum JapanBaseInfo { get; set; }
 
         /// <summary>
         /// 同业客户编号

Edu.Module.User/StudentModule.cs

@@ -159,7 +159,6 @@ namespace Edu.Module.User
                     {nameof(RB_Student_ViewModel.ProviceId),model.ProviceId },
                     {nameof(RB_Student_ViewModel.CityId),model.CityId },
                     {nameof(RB_Student_ViewModel.AreaId),model.AreaId },
-                    {nameof(RB_Student_ViewModel.AreaId),model.AreaId },
                     {nameof(RB_Student_ViewModel.Interest),model.Interest },
                     {nameof(RB_Student_ViewModel.JapanBaseInfo),model.JapanBaseInfo },
                     {nameof(RB_Student_ViewModel.StuProfession),model.StuProfession },

Edu.Repository/User/RB_StudentRepository.cs

@@ -101,6 +101,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.CustomerId), query.CustomerId);
                 }
+                if (query.StuId > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.StuId), query.StuId);
+                }
                 if (!string.IsNullOrWhiteSpace(query.StuName))
                 {
                     builder.AppendFormat(" AND t.{0} LIKE @StuName ", nameof(RB_Student_ViewModel.StuName));

Edu.WebApi/Controllers/APP/AppIndexController.cs

@@ -42,7 +42,7 @@ namespace Edu.WebApi.Controllers.APP
             var query = new RB_Student_ViewModel()
             {
                 Interest = base.ParmJObj.GetInt("Interest"),
-                JapanBaseInfo = base.ParmJObj.GetInt("JapanBaseInfo"),
+                JapanBaseInfo = (GuestBasicsEnum)base.ParmJObj.GetInt("JapanBaseInfo"),
                 StuSex = base.ParmJObj.GetInt("StuSex"),
                 StuIcon = base.ParmJObj.GetStringValue("StuIcon"),
                 Group_Id = base.AppUserInfo.Group_Id,

Edu.WebApi/Controllers/User/UserController.cs

@@ -716,7 +716,7 @@ namespace Edu.WebApi.Controllers.User
                 CityId=base.ParmJObj.GetInt("CityId"),
                 AreaId=base.ParmJObj.GetInt("AreaId"),
                 Interest=base.ParmJObj.GetInt("Interest"),
-                JapanBaseInfo=base.ParmJObj.GetInt("JapanBaseInfo"),
+                JapanBaseInfo=(GuestBasicsEnum)base.ParmJObj.GetInt("JapanBaseInfo"),
                 StuProfession=base.ParmJObj.GetStringValue("StuProfession"),
                 StuEducation=(GuestEducationEnum)base.ParmJObj.GetInt("StuEducation"),
                 StuPurpose=(GuestLearningGoalsEnum)base.ParmJObj.GetInt("StuPurpose"),
@@ -756,11 +756,12 @@ namespace Edu.WebApi.Controllers.User
             var query = new RB_Student_ViewModel()
             {
                 KeyWords=base.ParmJObj.GetStringValue("KeyWords"),
+                StuId=base.ParmJObj.GetInt("StuId"),
             };
             var customer = base.AppletCustomerInfo;
-            query.Group_Id =   customer.GroupId;
-            //query.CustomerId = customer.CustomerId;
-           
+            query.Group_Id = customer.GroupId;
+            query.CustomerId = customer.CustomerId;
+
             var list = studentModule.GetStudentPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             List<object> result = new List<object>();
             foreach (var item in list)
@@ -801,6 +802,7 @@ namespace Edu.WebApi.Controllers.User
                 extModel.StuIcon,
                 extModel.StuSex,
                 extModel.StuBirth,
+                StuBirthStr=Common.ConvertHelper.FormatDate(extModel.StuBirth),
                 extModel.ProviceId,
                 extModel.CityId,
                 extModel.AreaId,
@@ -808,6 +810,7 @@ namespace Edu.WebApi.Controllers.User
                 extModel.StuStatus,
                 extModel.Interest,
                 extModel.JapanBaseInfo,
+                JapanBaseInfoName= extModel.JapanBaseInfo.ToName(),
                 extModel.CustomerId,
                 extModel.StuProfession,
                 extModel.StuEducation,