页面修改

Edu.Module.User/StudentModule.cs

@@ -155,8 +155,10 @@ namespace Edu.Module.User
             bool IsInsert = false;
             if (model.StuId == 0) { IsInsert = true; }
             bool flag = studentRepository.SetStudentRepository(model);
-            if (flag) {
-                if (IsInsert && model.CustomerId > 0) {
+            if (flag)
+            {
+                if (IsInsert && model.CustomerId > 0)
+                {
                     var queryTargetWorkId = accountModule.GetWorkUserIdModule(model.CreateBy);
                     if (!string.IsNullOrEmpty(queryTargetWorkId))
                     {

Edu.Repository/User/RB_StudentRepository.cs

@@ -218,6 +218,9 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an
                     {nameof(RB_Student_ViewModel.StuContractMobile),model.StuContractMobile },
                     {nameof(RB_Student_ViewModel.StuIDCard),model.StuIDCard },
                     {nameof(RB_Student_ViewModel.StuIDCardAddress),model.StuIDCardAddress },
+                    {nameof(RB_Student_ViewModel.CreateType),model.CreateType },
+                    {nameof(RB_Student_ViewModel.CreateBy),model.CreateBy },
+                    {nameof(RB_Student_ViewModel.StuStage),model.StuStage },
                 };
                 flag = base.Update(fileds, new WhereHelper(nameof(RB_Student_ViewModel.StuId), model.StuId));
             }

Edu.WebApi/Controllers/User/UserController.cs

@@ -708,13 +708,49 @@ namespace Edu.WebApi.Controllers.User
         [HttpPost]
         public ApiResult SetStudent()
         {
-            var extModel = Common.Plugin.JsonHelper.DeserializeObject<RB_Student_ViewModel>(RequestParm.Msg.ToString());
+            var extModel = new RB_Student_ViewModel()
+            {
+                StuId = base.ParmJObj.GetInt("StuId"),
+                StuName = base.ParmJObj.GetStringValue("StuName"),
+                StuTel = base.ParmJObj.GetStringValue("StuTel"),
+                StuIcon = base.ParmJObj.GetStringValue("StuIcon"),
+                StuSex = base.ParmJObj.GetInt("StuSex"),
+                StuBirth = base.ParmJObj.GetDateTime("StuBirth"),
+                ProviceId = base.ParmJObj.GetInt("ProviceId"),
+                CityId = base.ParmJObj.GetInt("CityId"),
+                AreaId = base.ParmJObj.GetInt("AreaId"),
+                Interest = base.ParmJObj.GetInt("Interest"),
+                JapanBaseInfo = (GuestBasicsEnum)base.ParmJObj.GetInt("JapanBaseInfo"),
+                StuProfession = base.ParmJObj.GetStringValue("StuProfession"),
+                StuEducation = (GuestEducationEnum)base.ParmJObj.GetInt("StuEducation"),
+                StuPurpose = (GuestLearningGoalsEnum)base.ParmJObj.GetInt("StuPurpose"),
+                StuSource = (OrderSourceEnum)base.ParmJObj.GetInt("StuSource"),
+                StuAddress = base.ParmJObj.GetStringValue("StuAddress"),
+                StuContract = base.ParmJObj.GetStringValue("StuContract"),
+                StuContractMobile = base.ParmJObj.GetStringValue("StuContractMobile"),
+                StuIDCard = base.ParmJObj.GetStringValue("StuIDCard"),
+                StuIDCardAddress = base.ParmJObj.GetStringValue("StuIDCardAddress"),
+                StuStage=(StuStageEnum)base.ParmJObj.GetInt("StuStage"),
+            };
+            if (extModel.StuId == 0)
+            {
+                extModel.CreateType = 1;
+            }
+            extModel.Status = DateStateEnum.Normal;
+            extModel.StuStatus = 1;
+            extModel.CreateTime = DateTime.Now;
+            extModel.UpdateTime = DateTime.Now;
             extModel.CreateBy = base.UserInfo.Id;
             extModel.CreateTime = DateTime.Now;
             extModel.UpdateBy = base.UserInfo.Id;
             extModel.UpdateTime = DateTime.Now;
             extModel.Group_Id = base.UserInfo.Group_Id;
+            extModel.CustomerId = 0;
             extModel.IsDisable = 1;
+            if (studentModule.CheckStudentModule(extModel))
+            {
+                return ApiResult.Failed("此学员手机号已绑定同行!请重新录入!");
+            }
             bool flag = studentModule.SetStudentModule(extModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
@@ -748,14 +784,20 @@ namespace Edu.WebApi.Controllers.User
                 StuContractMobile = base.ParmJObj.GetStringValue("StuContractMobile"),
                 StuIDCard = base.ParmJObj.GetStringValue("StuIDCard"),
                 StuIDCardAddress = base.ParmJObj.GetStringValue("StuIDCardAddress"),
+                StuStage =(StuStageEnum)base.ParmJObj.GetInt("StuStage"),
             };
-            var customer = base.AppletCustomerInfo;
+            extModel.CreateType = 2;
+            if (extModel.StuId == 0)
+            {
+                extModel.StuStage = StuStageEnum.NewStu;
+            }
             extModel.Status = DateStateEnum.Normal;
             extModel.StuStatus = 1;
-            extModel.CreateBy = customer.CustomerId;
             extModel.CreateTime = DateTime.Now;
-            extModel.UpdateBy = customer.CustomerId;
             extModel.UpdateTime = DateTime.Now;
+            var customer = base.AppletCustomerInfo;
+            extModel.CreateBy = 0;
+            extModel.UpdateBy = 0;
             extModel.Group_Id = customer.GroupId;
             extModel.CustomerId = customer.CustomerId;
             extModel.IsDisable = 1;
@@ -824,7 +866,7 @@ namespace Edu.WebApi.Controllers.User
                 extModel.StuTel,
                 extModel.StuIcon,
                 extModel.StuSex,
-                extModel.StuBirth,
+                StuBirth= Common.ConvertHelper.FormatDate(extModel.StuBirth),
                 StuBirthStr = Common.ConvertHelper.FormatDate(extModel.StuBirth),
                 extModel.ProviceId,
                 extModel.CityId,
@@ -849,11 +891,27 @@ namespace Edu.WebApi.Controllers.User
                 extModel.StuIDCardAddress,
                 CreateTimeStr = Common.ConvertHelper.FormatDate(extModel.CreateTime),
                 newClassStatus,
-                classStatusName
+                classStatusName,
+                extModel.CreateType,
+                CreateTypeStr = extModel.CreateType == 1 ? "员工录入" : "同业录入",
+                extModel.StuStage,
+                StuStageName = extModel.StuStage.ToName(),
+                extModel.CreateBy,
             };
             return ApiResult.Success(data: obj);
         }
 
+        /// <summary>
+        /// 获取客户状态列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetStuStageList()
+        {
+            var list = Common.Plugin.EnumHelper.EnumToList(typeof(StuStageEnum));
+            return ApiResult.Success(data: list);
+        }
+
         /// <summary>
         /// 更新学生状态
         /// </summary>