Skip to content

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

页面修改

parent c302d513
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 51 deletions
Edu.WebApi/Controllers/User/UserController.cs
View file @ 883335a3
......@@ -339,13 +339,13 @@ namespace Edu.WebApi.Controllers.User
{
var query = new RB_School_ViewModel()
{
SName=base.ParmJObj.GetStringValue("SName"),
SAddress=base.ParmJObj.GetStringValue("SAddress"),
SLinkTel=base.ParmJObj.GetStringValue("SLinkTel"),
SDomain=base.ParmJObj.GetStringValue("SDomain"),
Remark=base.ParmJObj.GetStringValue("Remark"),
SId=base.ParmJObj.GetInt("SId"),
QSIds=base.ParmJObj.GetStringValue("QSIds"),
SName = base.ParmJObj.GetStringValue("SName"),
SAddress = base.ParmJObj.GetStringValue("SAddress"),
SLinkTel = base.ParmJObj.GetStringValue("SLinkTel"),
SDomain = base.ParmJObj.GetStringValue("SDomain"),
Remark = base.ParmJObj.GetStringValue("Remark"),
SId = base.ParmJObj.GetInt("SId"),
QSIds = base.ParmJObj.GetStringValue("QSIds"),
};
query.Group_Id = base.ParmJObj.GetInt("Group_Id", 100000);
var list = schoolModule.GetSchoolListModule(query);
......@@ -381,7 +381,7 @@ namespace Edu.WebApi.Controllers.User
IsShow = base.ParmJObj.GetInt("IsShow"),
AuditStatus = (AccountStatusEnum)base.ParmJObj.GetInt("AuditStatus"),
School_Id = -1,
IsLeave=base.ParmJObj.GetInt("IsLeave"),
IsLeave = base.ParmJObj.GetInt("IsLeave"),
};
var schoolId = base.ParmJObj.GetStringValue("School_Id");
if (!string.IsNullOrEmpty(schoolId))
......@@ -421,8 +421,8 @@ namespace Edu.WebApi.Controllers.User
{
IsQLeave = base.ParmJObj.GetInt("IsQLeave"),
IsShow = base.ParmJObj.GetInt("IsShow", 0),
NotQueryTIds=base.ParmJObj.GetStringValue("NotQueryTIds"),
Dept_Id=base.ParmJObj.GetInt("Dept_Id"),
NotQueryTIds = base.ParmJObj.GetStringValue("NotQueryTIds"),
Dept_Id = base.ParmJObj.GetInt("Dept_Id"),
};
query.Group_Id = base.UserInfo.Group_Id;
query.School_Id = base.UserInfo.School_Id;
......@@ -694,13 +694,13 @@ namespace Edu.WebApi.Controllers.User
QQ = base.ParmJObj.GetStringValue("QQ"),
WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
StuType = base.ParmJObj.GetInt("StuType"),
ExistCourseConsultant=base.ParmJObj.GetInt("ExistCourseConsultant"),
CategoryId=base.ParmJObj.GetInt("CategoryId"),
QStudentStatus=base.ParmJObj.GetInt("QStudentStatus"),
AdvisorStatus=base.ParmJObj.GetInt("AdvisorStatus"),
StuChannel=base.ParmJObj.GetInt("StuChannel"),
CreateType=(StuCreateTypeEnum) base.ParmJObj.GetInt("CreateType"),
StuSourceId=base.ParmJObj.GetInt("StuSourceId"),
ExistCourseConsultant = base.ParmJObj.GetInt("ExistCourseConsultant"),
CategoryId = base.ParmJObj.GetInt("CategoryId"),
QStudentStatus = base.ParmJObj.GetInt("QStudentStatus"),
AdvisorStatus = base.ParmJObj.GetInt("AdvisorStatus"),
StuChannel = base.ParmJObj.GetInt("StuChannel"),
CreateType = (StuCreateTypeEnum)base.ParmJObj.GetInt("CreateType"),
StuSourceId = base.ParmJObj.GetInt("StuSourceId"),
};
if (query.IsQueryMyStu == 1)
{
......@@ -713,14 +713,14 @@ namespace Edu.WebApi.Controllers.User
}
if (query.BelongType == 1)
{
var tempList= okrPeriodModule.GetOKRPersonalDimensionListModule(base.UserInfo.Group_Id, base.UserInfo.Id, base.UserInfo.DeptId);
var tempList = okrPeriodModule.GetOKRPersonalDimensionListModule(base.UserInfo.Group_Id, base.UserInfo.Id, base.UserInfo.DeptId);
string QCreateBys = "";
if (tempList != null && tempList.Count > 0)
{
foreach (var jItem in tempList)
{
JObject jObj = JObject.Parse(JsonHelper.Serialize(jItem));
QCreateBys += jObj.GetStringValue("Id")+",";
QCreateBys += jObj.GetStringValue("Id") + ",";
}
}
if (!string.IsNullOrEmpty(QCreateBys))
......@@ -930,7 +930,7 @@ namespace Edu.WebApi.Controllers.User
{
var courseManager = item?.AssistList?.Where(qtiem => qtiem.AssistType == AssistTypeEnum.CourseAdviser)?.FirstOrDefault();
string course = courseManager?.AssistName ?? "暂未推送";
var teacherManager= item?.AssistList?.Where(qtiem => qtiem.AssistType == AssistTypeEnum.Teacher)?.FirstOrDefault();
var teacherManager = item?.AssistList?.Where(qtiem => qtiem.AssistType == AssistTypeEnum.Teacher)?.FirstOrDefault();
string teacher = teacherManager?.AssistName ?? "暂无";
string orderStr = item.OrderCount > 0 ? "已报名" + item.OrderCount + "单" : "未报名";
string assistStr = "";
......@@ -943,7 +943,7 @@ namespace Edu.WebApi.Controllers.User
}
var dataRow = new ExcelDataSource()
{
ExcelRows=new List<ExcelColumn>()
ExcelRows = new List<ExcelColumn>()
{
new ExcelColumn(item.StuName),
new ExcelColumn(course),
......@@ -974,7 +974,7 @@ namespace Edu.WebApi.Controllers.User
};
foreach (var hItem in advisorList)
{
var tempItem = item?.AdvisorList?.Where(qitem => qitem.AdvisorStatus == hItem.Id)?.LastOrDefault()?.AdvisorDate??"";
var tempItem = item?.AdvisorList?.Where(qitem => qitem.AdvisorStatus == hItem.Id)?.LastOrDefault()?.AdvisorDate ?? "";
dataRow.ExcelRows.Add(new ExcelColumn(tempItem));
}
slist.Add(dataRow);
......@@ -1057,8 +1057,8 @@ namespace Edu.WebApi.Controllers.User
WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
QQ = base.ParmJObj.GetStringValue("QQ"),
StuType = base.ParmJObj.GetInt("StuType"),
StuNeeds=base.ParmJObj.GetInt("StuNeeds"),
StuRealMobile=base.ParmJObj.GetStringValue("StuRealMobile"),
StuNeeds = base.ParmJObj.GetInt("StuNeeds"),
StuRealMobile = base.ParmJObj.GetStringValue("StuRealMobile"),
};
if (string.IsNullOrEmpty(extModel.StuRealMobile) && string.IsNullOrEmpty(extModel.QQ) && string.IsNullOrEmpty(extModel.WeChatNo))
{
......@@ -1127,7 +1127,7 @@ namespace Edu.WebApi.Controllers.User
var flag = studentModule.SetStudentStageModule(StuId, StuStage, base.UserInfo.Id);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
return ApiResult.Failed(message:"请选择客户阶段");
return ApiResult.Failed(message: "请选择客户阶段");
}
/// <summary>
......@@ -1170,7 +1170,7 @@ namespace Edu.WebApi.Controllers.User
if (isB2B)
{
message = "此学员手机号已绑定同行!请重新录入!";
studentModule.PushMessageModule(model,1);
studentModule.PushMessageModule(model, 1);
}
else
{
......@@ -1183,7 +1183,7 @@ namespace Edu.WebApi.Controllers.User
if (isB2B)
{
message = "此学员手机号已绑定同行!请重新录入!";
studentModule.PushMessageModule(model,1);
studentModule.PushMessageModule(model, 1);
}
else
{
......@@ -1205,7 +1205,7 @@ namespace Edu.WebApi.Controllers.User
if (isB2B)
{
message = "此学员QQ已绑定同行!请重新录入!";
studentModule.PushMessageModule(model,2);
studentModule.PushMessageModule(model, 2);
}
else
{
......@@ -1218,7 +1218,7 @@ namespace Edu.WebApi.Controllers.User
if (isB2B)
{
message = "此学员QQ已绑定同行!请重新录入!";
studentModule.PushMessageModule(model,2);
studentModule.PushMessageModule(model, 2);
}
else
{
......@@ -1240,7 +1240,7 @@ namespace Edu.WebApi.Controllers.User
if (isB2B)
{
message = "此学员微信号已绑定同行!请重新录入!";
studentModule.PushMessageModule(model,3);
studentModule.PushMessageModule(model, 3);
}
else
{
......@@ -1253,7 +1253,7 @@ namespace Edu.WebApi.Controllers.User
if (isB2B)
{
message = "此学员微信号已绑定同行!请重新录入!";
studentModule.PushMessageModule(model,3);
studentModule.PushMessageModule(model, 3);
}
else
{
......@@ -1319,7 +1319,7 @@ namespace Edu.WebApi.Controllers.User
WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
QQ = base.ParmJObj.GetStringValue("QQ"),
StuType = base.ParmJObj.GetInt("StuType"),
StuRealMobile=base.ParmJObj.GetStringValue("StuRealMobile"),
StuRealMobile = base.ParmJObj.GetStringValue("StuRealMobile"),
};
extModel.CreateType = StuCreateTypeEnum.CustomerInput;
extModel.Status = DateStateEnum.Normal;
......@@ -1349,7 +1349,7 @@ namespace Edu.WebApi.Controllers.User
{
return ApiResult.Failed("此学员微信号已绑定同行!请重新录入!");
}
bool flag = studentModule.SetStudentModule(extModel, fromApp:1);
bool flag = studentModule.SetStudentModule(extModel, fromApp: 1);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
......@@ -1527,7 +1527,7 @@ namespace Edu.WebApi.Controllers.User
extModel.CreateByName = UserReidsCache.GetUserLoginInfo(extModel.CreateBy)?.AccountName ?? "";
if (customer != null)
{
studentModule.PushMessageModule(extModel,1);
studentModule.PushMessageModule(extModel, 1);
}
}
return ApiResult.Success(data: extModel);
......@@ -1631,7 +1631,7 @@ namespace Edu.WebApi.Controllers.User
StartBirthDate = base.ParmJObj.GetStringValue("StartBirthDate"),
StartEntryTime = base.ParmJObj.GetStringValue("StartEntryTime"),
StartLeaveTime = base.ParmJObj.GetStringValue("StartLeaveTime"),
IsLeave=base.ParmJObj.GetInt("IsLeave"),
IsLeave = base.ParmJObj.GetInt("IsLeave"),
};
query.Group_Id = base.UserInfo.Group_Id;
var list = employeeModule.GetEmployeePageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
......@@ -1711,7 +1711,7 @@ namespace Edu.WebApi.Controllers.User
Account = base.ParmJObj.GetStringValue("Account"),
Password = base.ParmJObj.GetStringValue("Password"),
UserRole = (UserRoleEnum)base.ParmJObj.GetInt("UserRole"),
IsTenCccUser = base.ParmJObj.GetInt("IsTenCccUser",0)
IsTenCccUser = base.ParmJObj.GetInt("IsTenCccUser", 0)
};
if (!string.IsNullOrEmpty(extModel.Password.Trim()))
{
......@@ -1969,6 +1969,19 @@ namespace Edu.WebApi.Controllers.User
}
}
/// <summary>
/// 获取学员账号列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetAccountStudentList()
{
var query = new RB_Account_ViewModel() { };
query.Group_Id = base.UserInfo.Group_Id;
var list = accountModule.GetStudentExt(query);
return ApiResult.Success(data: list.Select(qitem => new { qitem.Id, qitem.AccountName }));
}
/// <summary>
/// 获取管理者实体
/// </summary>
......@@ -2020,8 +2033,8 @@ namespace Edu.WebApi.Controllers.User
Email = extModel?.Email ?? "",
DirectSupervisor = extModel?.DirectSupervisor ?? 0,
DirectSupervisorName = base.GetUserInfo(extModel?.DirectSupervisor ?? 0)?.AccountName ?? "",
UserRole= extModel?.UserRole??0,
UserRoleName= extModel?.UserRole.ToName()??"",
UserRole = extModel?.UserRole ?? 0,
UserRoleName = extModel?.UserRole.ToName() ?? "",
IsTenCccUser = extModel?.IsTenCccUser ?? 0,
};
return ApiResult.Success(data: obj);
......@@ -2665,7 +2678,7 @@ namespace Edu.WebApi.Controllers.User
Group_Id = base.UserInfo.Group_Id,
Name = base.ParmJObj.GetStringValue("Name")
};
var list=studentModule.GetStudentAdvisorConfigPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
var list = studentModule.GetStudentAdvisorConfigPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
List<object> result = new List<object>();
foreach (var item in list)
{
......@@ -2813,8 +2826,8 @@ namespace Edu.WebApi.Controllers.User
AdvisorStatus = base.ParmJObj.GetInt("AdvisorStatus"),
AdvisorDate = base.ParmJObj.GetStringValue("AdvisorDate"),
AdvisorRemark = base.ParmJObj.GetStringValue("AdvisorRemark"),
AdvisorExpectDate=base.ParmJObj.GetStringValue("AdvisorExpectDate"),
AdvisorRate=base.ParmJObj.GetDecimal("AdvisorRate"),
AdvisorExpectDate = base.ParmJObj.GetStringValue("AdvisorExpectDate"),
AdvisorRate = base.ParmJObj.GetDecimal("AdvisorRate"),
};
model.CreateBy = base.UserInfo.Id;
model.CreateTime = DateTime.Now;
......
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