页面修改

Edu.Common/Enum/Course/ClassLogTypeEnum.cs

@@ -25,5 +25,11 @@ namespace Edu.Common.Enum.Course
         /// </summary>
         [EnumField("上课记录")]
         Class = 3,
+
+        /// <summary>
+        /// 创建班级
+        /// </summary>
+        [EnumField("创建班级")]
+        CreateClass =4,
     }
 }

Edu.Module.Course/ClassModule.cs

@@ -159,6 +159,7 @@ namespace Edu.Module.Course
                 var newId = classRepository.Insert(model);
                 model.ClassId = newId;
                 flag = newId > 0;
+                classLogRepository.AddClassLogRepository(Common.Enum.Course.ClassLogTypeEnum.CreateClass, "创建班级", newId, model.Group_Id, model.School_Id, model.CreateBy);
             }
 
             #region 阶梯报价

Edu.Module.User/EmployeeModule.cs

@@ -132,6 +132,10 @@ namespace Edu.Module.User
         /// <returns></returns>
         public virtual bool SetEmployeeModule(Employee_ViewModel extModel)
         {
+            if (extModel.LeaveStatus != Common.Enum.User.LeaveStatusEnum.Departure)
+            {
+                extModel.LeaveTime = null;
+            }
             bool flag = false;
             switch (extModel.AccountType)
             {

Edu.WebApi/Controllers/User/UserController.cs

@@ -689,13 +689,30 @@ namespace Edu.WebApi.Controllers.User
         [HttpPost]
         public ApiResult SetEmployee()
         {
-            var extModel = Common.Plugin.JsonHelper.DeserializeObject<Employee_ViewModel>(RequestParm.Msg.ToString());
+            var extModel = new Employee_ViewModel()
+            {
+                 AccountId=base.ParmJObj.GetInt("AccountId"),
+                 AccountType=(AccountTypeEnum)base.ParmJObj.GetInt("AccountType"),
+                 EmployeeName=base.ParmJObj.GetStringValue("EmployeeName"),
+                 EmployeeTel=base.ParmJObj.GetStringValue("EmployeeTel"),
+                 UserIcon=base.ParmJObj.GetStringValue("UserIcon"),
+                 Dept_Id=base.ParmJObj.GetInt("Dept_Id"),
+                 Post_Id=base.ParmJObj.GetInt("Post_Id"),
+                 IDCard=base.ParmJObj.GetStringValue("IDCard"),
+                 Sex=base.ParmJObj.GetInt("Sex"),
+                 EntryTime=base.ParmJObj.GetDateTime("EntryTime"),
+                 Address=base.ParmJObj.GetStringValue("Address"),
+                 BirthDate=base.ParmJObj.GetDateTime("BirthDate"),
+                 LeaveStatus=(LeaveStatusEnum)base.ParmJObj.GetInt("LeaveStatus"),
+                 LeaveTime=base.ParmJObj.GetDateTime("LeaveTime"),
+                 Education=(EducationEnum)base.ParmJObj.GetInt("Education"),
+                 School_Id=base.ParmJObj.GetInt("School_Id"),
+            };
             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.School_Id = base.UserInfo.School_Id;
 
             //判断手机号码是否存在
             bool existPhoneResult = employeeModule.ExistPhone(extModel);
@@ -835,7 +852,7 @@ namespace Edu.WebApi.Controllers.User
                 extModel?.BirthDate,
                 BirthDateStr = (extModel?.BirthDate != null ? Convert.ToDateTime(extModel.BirthDate).ToString("MM-dd") : ""),
                 CreateBy = extModel?.CreateBy ?? 0,
-                CreateTime = extModel?.CreateTime,
+                CreateTime = Common.ConvertHelper.FormatDate((extModel?.CreateTime)),
                 DeptName = extModel?.DeptName ?? "",
                 DeptTier = extModel?.DeptTier ?? 0,
                 Dept_Id = extModel?.Dept_Id ?? 0,
@@ -851,8 +868,8 @@ namespace Edu.WebApi.Controllers.User
                 IsBirth = extModel?.IsBirth ?? 0,
                 LeaveStatus = extModel?.LeaveStatus ?? 0,
                 LeaveStatusStr = (extModel?.LeaveStatus ?? 0).ToName(),
-                LeaveTime = extModel?.LeaveTime,
-                PostName = extModel?.PostName,
+                LeaveTime = Common.ConvertHelper.FormatDate(extModel?.LeaveTime),
+                PostName = extModel?.PostName??"",
                 Post_Id = extModel?.Post_Id ?? 0,
                 SchoolName = extModel?.SchoolName ?? "",
                 School_Id = extModel?.School_Id ?? 0,