Skip to content

E
Education
Commit c1834eb9 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent d789cead
Show whitespace changes
Inline Side-by-side
Showing with 77 additions and 36 deletions
Edu.Model/Entity/User/RB_Manager.cs
View file @ c1834eb9
...@@ -121,5 +121,10 @@ namespace Edu.Model.Entity.User ...@@ -121,5 +121,10 @@ namespace Edu.Model.Entity.User
/// 邮箱 /// 邮箱
/// </summary> /// </summary>
public string Email { get; set; } public string Email { get; set; }
/// <summary>
/// 用户角色(1-市场人员，2-课程顾问)
/// </summary>
public UserRoleEnum UserRole { get; set; }
} }
} }
Edu.Model/Entity/User/RB_Teacher.cs
View file @ c1834eb9
...@@ -202,5 +202,10 @@ namespace Edu.Model.Entity.User ...@@ -202,5 +202,10 @@ namespace Edu.Model.Entity.User
/// 启用时间 (存到月) /// 启用时间 (存到月)
/// </summary> /// </summary>
public string EnableTime { get; set; } public string EnableTime { get; set; }
/// <summary>
/// 用户角色(1-市场人员，2-课程顾问)
/// </summary>
public UserRoleEnum UserRole { get; set; }
} }
} }
\ No newline at end of file
Edu.Model/ViewModel/User/Employee_ViewModel.cs
View file @ c1834eb9
...@@ -206,5 +206,10 @@ namespace Edu.Model.ViewModel.User ...@@ -206,5 +206,10 @@ namespace Edu.Model.ViewModel.User
/// 企业微信用户Ids /// 企业微信用户Ids
/// </summary> /// </summary>
public string WorkUserIds { get; set; } public string WorkUserIds { get; set; }
/// <summary>
/// 用户角色(1-市场人员，2-课程顾问)
/// </summary>
public UserRoleEnum UserRole { get; set; }
} }
} }
Edu.Module.User/EmployeeModule.cs
View file @ c1834eb9
...@@ -187,7 +187,8 @@ namespace Edu.Module.User ...@@ -187,7 +187,8 @@ namespace Edu.Module.User
DirectSupervisor = extModel.DirectSupervisor, DirectSupervisor = extModel.DirectSupervisor,
ManagerAccount = extModel.Account, ManagerAccount = extModel.Account,
Password = extModel.Password, Password = extModel.Password,
Token = token Token = token,
UserRole=extModel.UserRole,
}); });
break; break;
case Common.Enum.User.AccountTypeEnum.Teacher: case Common.Enum.User.AccountTypeEnum.Teacher:
...@@ -218,7 +219,8 @@ namespace Edu.Module.User ...@@ -218,7 +219,8 @@ namespace Edu.Module.User
DirectSupervisor = extModel.DirectSupervisor, DirectSupervisor = extModel.DirectSupervisor,
TeacherAccount=extModel.Account, TeacherAccount=extModel.Account,
Password=extModel.Password, Password=extModel.Password,
Token = token Token = token,
UserRole = extModel.UserRole,
}); });
break; break;
case Common.Enum.User.AccountTypeEnum.Assist: case Common.Enum.User.AccountTypeEnum.Assist:
......
Edu.Module.User/ManagerModule.cs
View file @ c1834eb9
...@@ -115,6 +115,7 @@ namespace Edu.Module.User ...@@ -115,6 +115,7 @@ namespace Edu.Module.User
{ nameof(RB_Manager_ViewModel.LeaveTime),model.LeaveTime }, { nameof(RB_Manager_ViewModel.LeaveTime),model.LeaveTime },
{ nameof(RB_Manager_ViewModel.Education),model.Education }, { nameof(RB_Manager_ViewModel.Education),model.Education },
{ nameof(RB_Manager_ViewModel.Email),model.Email }, { nameof(RB_Manager_ViewModel.Email),model.Email },
{ nameof(RB_Manager_ViewModel.UserRole),model.UserRole },
}; };
#region 日志 #region 日志
...@@ -163,6 +164,10 @@ namespace Edu.Module.User ...@@ -163,6 +164,10 @@ namespace Edu.Module.User
{ {
logContent += string.Format(",将邮箱由【{0}】修改为【{1}】。", oldModel.Email, model.Email); logContent += string.Format(",将邮箱由【{0}】修改为【{1}】。", oldModel.Email, model.Email);
} }
if (model.UserRole != oldModel.UserRole)
{
logContent += string.Format(",用户角色由【{0}】修改为【{1}】。", oldModel.UserRole.ToName(), model.UserRole.ToName());
}
if (!string.IsNullOrEmpty(logContent)) if (!string.IsNullOrEmpty(logContent))
{ {
//新增日志 //新增日志
......
Edu.Module.User/TeacherModule.cs
View file @ c1834eb9
...@@ -180,6 +180,7 @@ namespace Edu.Module.User ...@@ -180,6 +180,7 @@ namespace Edu.Module.User
fileds.Add(nameof(RB_Teacher_ViewModel.LeaveTime), model.LeaveTime); fileds.Add(nameof(RB_Teacher_ViewModel.LeaveTime), model.LeaveTime);
fileds.Add(nameof(RB_Teacher_ViewModel.Education), model.Education); fileds.Add(nameof(RB_Teacher_ViewModel.Education), model.Education);
fileds.Add(nameof(RB_Teacher_ViewModel.Email), model.Email); fileds.Add(nameof(RB_Teacher_ViewModel.Email), model.Email);
fileds.Add(nameof(RB_Teacher_ViewModel.UserRole), model.UserRole);
} }
#region 修改日志 #region 修改日志
string logContent = ""; string logContent = "";
...@@ -239,6 +240,10 @@ namespace Edu.Module.User ...@@ -239,6 +240,10 @@ namespace Edu.Module.User
{ {
logContent += string.Format(",将基础带班人数由【{0}】修改为【{1}】。", oldModel.BaseStuNum, model.BaseStuNum); logContent += string.Format(",将基础带班人数由【{0}】修改为【{1}】。", oldModel.BaseStuNum, model.BaseStuNum);
} }
if (model.UserRole != oldModel.UserRole)
{
logContent += string.Format(",将用户角色由【{0}】修改为【{1}】。", oldModel.UserRole, model.UserRole);
}
if (!string.IsNullOrEmpty(logContent)) if (!string.IsNullOrEmpty(logContent))
{ {
//新增日志 //新增日志
......
Edu.Repository/User/RB_AccountRepository.cs
View file @ c1834eb9
...@@ -480,7 +480,7 @@ FROM ...@@ -480,7 +480,7 @@ FROM
,b.School_Id,IFNULL(B.MName,'') AS EmployeeName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard ,b.School_Id,IFNULL(B.MName,'') AS EmployeeName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate ,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
,B.LeaveStatus,B.LeaveTime,B.MTel AS EmployeeTel,IFNULL(B.Email,'') AS Email ,B.LeaveStatus,B.LeaveTime,B.MTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
,0 as BaseHourFee,0 as BaseHoursEnabled,'' as EnableTime ,0 as BaseHourFee,0 as BaseHoursEnabled,'' as EnableTime,B.UserRole
FROM rb_manager AS B LEFT JOIN rb_account AS A ON A.AccountId=B.MId AND A.AccountType=1 FROM rb_manager AS B LEFT JOIN rb_account AS A ON A.AccountId=B.MId AND A.AccountType=1
WHERE 1=1 {0} {1} WHERE 1=1 {0} {1}
UNION ALL UNION ALL
...@@ -489,7 +489,7 @@ FROM ...@@ -489,7 +489,7 @@ FROM
,b.School_Id,IFNULL(B.TeacherName,'') AS EmployeeName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard ,b.School_Id,IFNULL(B.TeacherName,'') AS EmployeeName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate ,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
,B.LeaveStatus,B.LeaveTime,B.TeacherTel AS EmployeeTel,IFNULL(B.Email,'') AS Email ,B.LeaveStatus,B.LeaveTime,B.TeacherTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
,B.BaseHourFee,B.BaseHoursEnabled,B.EnableTime ,B.BaseHourFee,B.BaseHoursEnabled,B.EnableTime,B.UserRole
FROM rb_teacher AS B LEFT JOIN rb_account AS A ON A.AccountId=B.TId AND A.AccountType=2 FROM rb_teacher AS B LEFT JOIN rb_account AS A ON A.AccountId=B.TId AND A.AccountType=2
WHERE 1=1 {0} {2} WHERE 1=1 {0} {2}
UNION ALL UNION ALL
...@@ -498,7 +498,7 @@ FROM ...@@ -498,7 +498,7 @@ FROM
,b.School_Id,IFNULL(B.AssistName,'') AS EmployeeName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard ,b.School_Id,IFNULL(B.AssistName,'') AS EmployeeName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate ,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
,B.LeaveStatus,B.LeaveTime,B.AssistTel AS EmployeeTel,IFNULL(B.Email,'') AS Email ,B.LeaveStatus,B.LeaveTime,B.AssistTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
,0 as BaseHourFee,0 as BaseHoursEnabled,'' as EnableTime ,0 as BaseHourFee,0 as BaseHoursEnabled,'' as EnableTime,0 AS UserRole
FROM rb_assist AS B LEFT JOIN rb_account AS A ON A.AccountId=B.AId AND A.AccountType=3 FROM rb_assist AS B LEFT JOIN rb_account AS A ON A.AccountId=B.AId AND A.AccountType=3
WHERE 1=1 {0} {3} WHERE 1=1 {0} {3}
) AS A LEFT JOIN rb_group AS g ON A.Group_Id=g.GId ) AS A LEFT JOIN rb_group AS g ON A.Group_Id=g.GId
......
Edu.WebApi/Controllers/User/UserController.cs
View file @ c1834eb9
...@@ -675,11 +675,11 @@ namespace Edu.WebApi.Controllers.User ...@@ -675,11 +675,11 @@ namespace Edu.WebApi.Controllers.User
StuStage = base.ParmJObj.GetInt("StuStage"), StuStage = base.ParmJObj.GetInt("StuStage"),
StartTime = base.ParmJObj.GetStringValue("StartTime"), StartTime = base.ParmJObj.GetStringValue("StartTime"),
EndTime = base.ParmJObj.GetStringValue("EndTime"), EndTime = base.ParmJObj.GetStringValue("EndTime"),
BelongType=base.ParmJObj.GetInt("BelongType"), BelongType = base.ParmJObj.GetInt("BelongType"),
QStudentType = base.ParmJObj.GetInt("QStudentType", -1), QStudentType = base.ParmJObj.GetInt("QStudentType", -1),
QQ=base.ParmJObj.GetStringValue("QQ"), QQ = base.ParmJObj.GetStringValue("QQ"),
WeChatNo=base.ParmJObj.GetStringValue("WeChatNo"), WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
StuType=base.ParmJObj.GetInt("StuType"), StuType = base.ParmJObj.GetInt("StuType"),
}; };
if (query.IsQueryMyStu == 1) if (query.IsQueryMyStu == 1)
{ {
...@@ -722,7 +722,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -722,7 +722,7 @@ namespace Edu.WebApi.Controllers.User
item.CreateType, item.CreateType,
CreateTypeStr = item.CreateType.ToName(), CreateTypeStr = item.CreateType.ToName(),
item.StuChannel, item.StuChannel,
StuChannelName= item.StuChannel.ToName(), StuChannelName = item.StuChannel.ToName(),
item.PlatformName, item.PlatformName,
item.CustomerId, item.CustomerId,
item.CustomerName, item.CustomerName,
...@@ -736,12 +736,12 @@ namespace Edu.WebApi.Controllers.User ...@@ -736,12 +736,12 @@ namespace Edu.WebApi.Controllers.User
AssistTypeName = qitem.AssistType.ToName() AssistTypeName = qitem.AssistType.ToName()
}), }),
item.JapanBaseInfo, item.JapanBaseInfo,
JapanBaseInfoName=item.JapanBaseInfo.ToName(), JapanBaseInfoName = item.JapanBaseInfo.ToName(),
item.StuProfession, item.StuProfession,
item.StuEducation, item.StuEducation,
StuEducationName= item.StuEducation.ToName(), StuEducationName = item.StuEducation.ToName(),
item.StuPurpose, item.StuPurpose,
StuPurposeName=item.StuPurpose.ToName(), StuPurposeName = item.StuPurpose.ToName(),
item.VisitCount, item.VisitCount,
item.TrialLessonCount, item.TrialLessonCount,
item.StuSourceId, item.StuSourceId,
...@@ -818,14 +818,14 @@ namespace Edu.WebApi.Controllers.User ...@@ -818,14 +818,14 @@ namespace Edu.WebApi.Controllers.User
StuStage = base.ParmJObj.GetInt("StuStage"), StuStage = base.ParmJObj.GetInt("StuStage"),
StuChannel = (StuChannelEnum)base.ParmJObj.GetInt("StuChannel"), StuChannel = (StuChannelEnum)base.ParmJObj.GetInt("StuChannel"),
PlatformName = base.ParmJObj.GetStringValue("PlatformName"), PlatformName = base.ParmJObj.GetStringValue("PlatformName"),
CreateType=(StuCreateTypeEnum)base.ParmJObj.GetInt("CreateType"), CreateType = (StuCreateTypeEnum)base.ParmJObj.GetInt("CreateType"),
StuSourceId=base.ParmJObj.GetInt("StuSourceId"), StuSourceId = base.ParmJObj.GetInt("StuSourceId"),
CustomerId=base.ParmJObj.GetInt("CustomerId"), CustomerId = base.ParmJObj.GetInt("CustomerId"),
WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"), WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
QQ = base.ParmJObj.GetStringValue("QQ"), QQ = base.ParmJObj.GetStringValue("QQ"),
StuType=base.ParmJObj.GetInt("StuType"), StuType = base.ParmJObj.GetInt("StuType"),
}; };
if (string.IsNullOrEmpty(extModel.StuTel)&&string.IsNullOrEmpty(extModel.QQ)&&string.IsNullOrEmpty(extModel.WeChatNo)) if (string.IsNullOrEmpty(extModel.StuTel) && string.IsNullOrEmpty(extModel.QQ) && string.IsNullOrEmpty(extModel.WeChatNo))
{ {
return ApiResult.Failed("手机号码、QQ号码、微信号码至少填写一项!"); return ApiResult.Failed("手机号码、QQ号码、微信号码至少填写一项!");
} }
...@@ -859,7 +859,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -859,7 +859,7 @@ namespace Edu.WebApi.Controllers.User
} }
bool flag = studentModule.SetStudentModule(extModel); bool flag = studentModule.SetStudentModule(extModel);
return flag ? ApiResult.Success(data:extModel) : ApiResult.Failed(); return flag ? ApiResult.Success(data: extModel) : ApiResult.Failed();
} }
/// <summary> /// <summary>
...@@ -872,14 +872,14 @@ namespace Edu.WebApi.Controllers.User ...@@ -872,14 +872,14 @@ namespace Edu.WebApi.Controllers.User
{ {
StuId = base.ParmJObj.GetInt("StuId"), StuId = base.ParmJObj.GetInt("StuId"),
StuTel = base.ParmJObj.GetStringValue("StuTel"), StuTel = base.ParmJObj.GetStringValue("StuTel"),
QQ=base.ParmJObj.GetStringValue("QQ"), QQ = base.ParmJObj.GetStringValue("QQ"),
WeChatNo=base.ParmJObj.GetStringValue("WeChatNo") WeChatNo = base.ParmJObj.GetStringValue("WeChatNo")
}; };
string message = ""; string message = "";
var customer = base.AppletCustomerInfo; var customer = base.AppletCustomerInfo;
//是否是同行注册 //是否是同行注册
bool isB2B = false; bool isB2B = false;
if (customer != null&&customer.GroupId>0) if (customer != null && customer.GroupId > 0)
{ {
query.Group_Id = customer.GroupId; query.Group_Id = customer.GroupId;
isB2B = true; isB2B = true;
...@@ -1080,9 +1080,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -1080,9 +1080,9 @@ namespace Edu.WebApi.Controllers.User
StuContractMobile = base.ParmJObj.GetStringValue("StuContractMobile"), StuContractMobile = base.ParmJObj.GetStringValue("StuContractMobile"),
StuIDCard = base.ParmJObj.GetStringValue("StuIDCard"), StuIDCard = base.ParmJObj.GetStringValue("StuIDCard"),
StuIDCardAddress = base.ParmJObj.GetStringValue("StuIDCardAddress"), StuIDCardAddress = base.ParmJObj.GetStringValue("StuIDCardAddress"),
WeChatNo=base.ParmJObj.GetStringValue("WeChatNo"), WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
QQ=base.ParmJObj.GetStringValue("QQ"), QQ = base.ParmJObj.GetStringValue("QQ"),
StuType=base.ParmJObj.GetInt("StuType"), StuType = base.ParmJObj.GetInt("StuType"),
}; };
extModel.CreateType = StuCreateTypeEnum.CustomerInput; extModel.CreateType = StuCreateTypeEnum.CustomerInput;
extModel.Status = DateStateEnum.Normal; extModel.Status = DateStateEnum.Normal;
...@@ -1100,7 +1100,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -1100,7 +1100,7 @@ namespace Edu.WebApi.Controllers.User
{ {
return ApiResult.Failed("手机号码、QQ号码、微信号码至少填写一项!"); return ApiResult.Failed("手机号码、QQ号码、微信号码至少填写一项!");
} }
if (!string.IsNullOrEmpty(extModel.StuTel) && studentModule.CheckStudentModule(extModel,1)) if (!string.IsNullOrEmpty(extModel.StuTel) && studentModule.CheckStudentModule(extModel, 1))
{ {
return ApiResult.Failed("此学员手机号已绑定同行!请重新录入!"); return ApiResult.Failed("此学员手机号已绑定同行!请重新录入!");
} }
...@@ -1142,7 +1142,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -1142,7 +1142,7 @@ namespace Edu.WebApi.Controllers.User
{ {
KeyWords = base.ParmJObj.GetStringValue("KeyWords"), KeyWords = base.ParmJObj.GetStringValue("KeyWords"),
StuId = base.ParmJObj.GetInt("StuId"), StuId = base.ParmJObj.GetInt("StuId"),
StuStage =base.ParmJObj.GetInt("StuStage") StuStage = base.ParmJObj.GetInt("StuStage")
}; };
var customer = base.AppletCustomerInfo; var customer = base.AppletCustomerInfo;
query.Group_Id = customer.GroupId; query.Group_Id = customer.GroupId;
...@@ -1246,9 +1246,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -1246,9 +1246,9 @@ namespace Edu.WebApi.Controllers.User
var customer = base.AppletCustomerInfo; var customer = base.AppletCustomerInfo;
var query = new RB_Student_ViewModel() var query = new RB_Student_ViewModel()
{ {
StuTel= base.ParmJObj.GetStringValue("StuTel"), StuTel = base.ParmJObj.GetStringValue("StuTel"),
QQ=base.ParmJObj.GetStringValue("QQ"), QQ = base.ParmJObj.GetStringValue("QQ"),
WeChatNo=base.ParmJObj.GetStringValue("WeChatNo") WeChatNo = base.ParmJObj.GetStringValue("WeChatNo")
}; };
if (customer != null && customer.GroupId > 0) if (customer != null && customer.GroupId > 0)
{ {
...@@ -1419,6 +1419,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -1419,6 +1419,7 @@ namespace Edu.WebApi.Controllers.User
DirectSupervisor = base.ParmJObj.GetInt("DirectSupervisor"), DirectSupervisor = base.ParmJObj.GetInt("DirectSupervisor"),
Account = base.ParmJObj.GetStringValue("Account"), Account = base.ParmJObj.GetStringValue("Account"),
Password = base.ParmJObj.GetStringValue("Password"), Password = base.ParmJObj.GetStringValue("Password"),
UserRole = (UserRoleEnum)base.ParmJObj.GetInt("UserRole"),
}; };
if (!string.IsNullOrEmpty(extModel.Password.Trim())) if (!string.IsNullOrEmpty(extModel.Password.Trim()))
{ {
...@@ -1517,6 +1518,17 @@ namespace Edu.WebApi.Controllers.User ...@@ -1517,6 +1518,17 @@ namespace Edu.WebApi.Controllers.User
} }
/// <summary>
/// 获取用户角色类型列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetUserRoleList()
{
var list = Common.Plugin.EnumHelper.EnumToList(typeof(UserRoleEnum));
return ApiResult.Success(data: list);
}
/// <summary> /// <summary>
/// 修改员工的部门 /// 修改员工的部门
/// </summary> /// </summary>
...@@ -1695,7 +1707,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -1695,7 +1707,9 @@ namespace Edu.WebApi.Controllers.User
Status = extModel?.Status ?? 0, Status = extModel?.Status ?? 0,
Email = extModel?.Email ?? "", Email = extModel?.Email ?? "",
DirectSupervisor = extModel?.DirectSupervisor ?? 0, DirectSupervisor = extModel?.DirectSupervisor ?? 0,
DirectSupervisorName = base.GetUserInfo(extModel?.DirectSupervisor ?? 0)?.AccountName ?? "" DirectSupervisorName = base.GetUserInfo(extModel?.DirectSupervisor ?? 0)?.AccountName ?? "",
UserRole= extModel?.UserRole??0,
UserRoleName= extModel?.UserRole.ToName()??"",
}; };
return ApiResult.Success(data: obj); return ApiResult.Success(data: obj);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment