Skip to content

E
Education
Commit bddb6bb6 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents 48356c9f 4934137f
Hide whitespace changes
Inline Side-by-side
Showing with 328 additions and 108 deletions
Edu.Common/Plugin/StringHelper.cs
View file @ bddb6bb6
......@@ -1616,5 +1616,20 @@ namespace Edu.Common.Plugin
Regex regex = new Regex("^1[3456789]\\d{9}$");
return regex.IsMatch(input);
}
/// <summary>
/// 替换电话号码中间4位位*
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public static string ReplaceMobile(string input)
{
string str = "";
if (!string.IsNullOrEmpty(input))
{
str= Regex.Replace(input, "(\\d{3})(\\d{5})(\\d{3})", "$1*****$3");
}
return str;
}
}
}
Edu.Model/Entity/Customer/RB_Student_Assist.cs
View file @ bddb6bb6
using Edu.Common.Enum.User;
using Edu.Common.Enum;
using Edu.Common.Enum.User;
using System;
using System.Collections.Generic;
using System.Text;
......@@ -32,5 +33,20 @@ namespace Edu.Model.Entity.Customer
/// 协助类型编号
/// </summary>
public int AssistId { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreateBy { get; set; }
/// <summary>
/// 删除状态
/// </summary>
public DateStateEnum Status { get; set; }
}
}
Edu.Model/ViewModel/Customer/RB_Student_Visit_Extend.cs
View file @ bddb6bb6
......@@ -55,5 +55,15 @@ namespace Edu.Model.ViewModel.Customer
return str;
}
}
/// <summary>
/// 学员编号
/// </summary>
public string QStuIds { get; set; }
/// <summary>
/// 到访次数
/// </summary>
public int VisitCount { get; set; }
}
}
Edu.Model/ViewModel/Reserve/RB_Visitor_Reserve_Extend.cs
View file @ bddb6bb6
......@@ -66,6 +66,11 @@ namespace Edu.Model.ViewModel.Reserve
/// </summary>
public string StuName { get; set; }
/// <summary>
/// 学员电话
/// </summary>
public string StuTel { get; set; }
/// <summary>
/// 教师名称
/// </summary>
......@@ -140,5 +145,15 @@ namespace Edu.Model.ViewModel.Reserve
/// 创建时间字符串
/// </summary>
public string CreateTimeStr2 { get { return Common.ConvertHelper.FormatTimeStr2(this.CreateTime); } }
/// <summary>
/// 学员编号
/// </summary>
public string QVisitor_Ids { get; set; }
/// <summary>
/// 试听次数
/// </summary>
public int TrialLessonCount { get; set; }
}
}
Edu.Model/ViewModel/User/RB_Student_ViewModel.cs
View file @ bddb6bb6
......@@ -194,14 +194,16 @@ namespace Edu.Model.ViewModel.User
public List<RB_Student_Assist_Extend> AssistList { get; set; }
/// <summary>
/// 是否查询当天访客
/// 查询日期
/// </summary>
public int IsQCurrentDay { get; set; }
public string QDate { get; set; }
public int VisitCount { get; set; }
/// <summary>
/// 是否添加到访记录
/// 试听次数
/// </summary>
public int IsCreateVisit { get; set; }
public int TrialLessonCount{get;set;}
/// <summary>
/// 同行
......
Edu.Module.Course/ClassModule.cs
View file @ bddb6bb6
......@@ -3830,7 +3830,12 @@ namespace Edu.Module.Course
TimeStr = Common.ConvertHelper.GetTimeStr(item.ClassDate),
StartTime = item.ClassTime,
item.EndTime,
GuestList = visitorList?.Where(qitem => qitem.ReserveClassId == item.ReserveClassId)?.Select(qitem => new { GuestName = qitem.VisitorName })
GuestList = visitorList?.Where(qitem => qitem.ReserveClassId == item.ReserveClassId)
?.Select(qitem => new
{
GuestName = qitem.VisitorName,
StuTel = Common.Plugin.StringHelper.ReplaceMobile(qitem.StuTel)
})
});
}
return list;
......
Edu.Module.Customer/CustomerStudentModule.cs
View file @ bddb6bb6
......@@ -478,7 +478,10 @@ namespace Edu.Module.Customer
{
logContent += string.Format("反馈信息：由【{0}】=>【{1}】", oldModel.Feedback, Feedback);
}
if (oldModel.IsVisit != IsVisit)
{
logContent += string.Format("到访状态：由【{0}】=>【{1}】", oldModel.IsVisitStr, (IsVisit==1?"已到访":"未到访"));
}
bool flag = student_VisitRepository.Update(fileds, new WhereHelper(nameof(RB_Student_Visit_Extend.Id), Id));
student_LogRepository.AddStuLogRepository(oldModel.StuId, Common.Enum.Log.StudentLogTypeEnum.Visit, logTitle, logContent, OperateId);
return flag;
......@@ -548,7 +551,6 @@ namespace Edu.Module.Customer
public List<RB_Student_OrderGuest_ViewModel> GetStuOrderGuestContractPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Student_OrderGuest_ViewModel query)
{
var list = student_OrderGuestRepository.GetStuContractGuestPageRepository(pageIndex, pageSize, out rowsCount, query);
return list;
}
......@@ -558,100 +560,79 @@ namespace Edu.Module.Customer
/// <param name="StuId"></param>
/// <param name="AssistList"></param>
/// <returns></returns>
public bool SetStudentAssistModule(int StuId, List<RB_Student_Assist_Extend> AssistList,int Uid)
public bool SetStudentAssistModule(int StuId, RB_Student_Assist_Extend model,int Uid)
{
bool flag = true;
string logTitle = "协助人员";
string logContent = "";
var oldAssistList = student_AssistRepository.GetStudentAssistListRepository(new Model.ViewModel.Customer.RB_Student_Assist_Extend()
var oldModel = student_AssistRepository.GetEntity(model.Id);
model.CreateBy = Uid;
model.CreateTime = DateTime.Now;
List<Employee_ViewModel> empList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel()
{
StuId = StuId
QIds = (oldModel?.AssistId ?? 0) + "," + model.AssistId
});
List<int> ids1 = new List<int>();
if (AssistList != null&&AssistList.Count>0)
{
ids1 = Common.Plugin.StringHelper.StringToListInt(string.Join(",", AssistList.Select(qitem => qitem.AssistId)));
}
if (oldAssistList != null&&oldAssistList.Count>0)
if (model.Id > 0)
{
List<int> ids2 = Common.Plugin.StringHelper.StringToListInt(string.Join(",", oldAssistList.Select(qitem => qitem.AssistId)));
if (ids2 != null && ids2.Count > 0)
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
ids1.AddRange(ids2);
}
}
string aids = string.Join(",", ids1);
List<Employee_ViewModel> empList = new List<Employee_ViewModel>();
if (!string.IsNullOrEmpty(aids))
{
empList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel()
{nameof(RB_Student_Assist_Extend.AssistType),model.AssistType },
{nameof(RB_Student_Assist_Extend.AssistId),model.AssistId },
};
if (oldModel.AssistId != model.AssistId)
{
QIds = aids
});
}
//以前没有协同人员【直接新增】
if (oldAssistList == null || (oldAssistList != null && oldAssistList.Count == 0))
{
foreach (var item in AssistList)
logContent += string.Format("修改协同人员：【0】=>【{1}】",
empList?.FirstOrDefault(qitem => qitem.Id == (oldModel?.AssistId ?? 0))?.EmployeeName,
empList?.FirstOrDefault(qitem => qitem.Id == model.AssistId)?.EmployeeName
);
}
if (oldModel.AssistType != model.AssistType)
{
student_AssistRepository.Insert(new Model.Entity.Customer.RB_Student_Assist()
{
AssistId = item.AssistId,
AssistType = item.AssistType,
StuId = StuId
});
logContent += string.Format("新增协同人员:" + empList?.FirstOrDefault(qitem => qitem.Id == item.AssistId)?.EmployeeName);
logContent += string.Format("修改协同类型：【0】=>【{1}】", oldModel.AssistType.ToName(),model.AssistType.ToName());
}
flag= student_AssistRepository.Update(fileds, new WhereHelper(nameof(RB_Student_Assist_Extend.Id), model.Id));
}
else
{
//现在没有协同人员了【直接删除以前的协同人员】
if (AssistList == null || (AssistList != null && AssistList.Count == 0))
{
student_AssistRepository.DeleteStudentAssistRepository(StuId);
foreach (var item in oldAssistList)
{
logContent += string.Format("删除协同人员:" + empList?.FirstOrDefault(qitem => qitem.Id == item.AssistId)?.EmployeeName);
}
}
//找出差异的数据
var deleteList = oldAssistList.Where(qitem => !AssistList.Any(oldItem => qitem.Id == oldItem.Id)).ToList();
foreach (var dItem in deleteList)
{
if (dItem.Id > 0)
{
logContent += string.Format("删除协同人员:" + empList?.FirstOrDefault(qitem => qitem.Id == dItem.AssistId)?.EmployeeName);
student_AssistRepository.Delete(dItem.Id);
}
}
foreach (var item in AssistList)
{
item.StuId = StuId;
if (item.Id == 0)
{
logContent += string.Format("新增协同人员:" + empList?.FirstOrDefault(qitem => qitem.Id == item.AssistId)?.EmployeeName);
student_AssistRepository.Insert(item);
}
else
{
var oldModel = oldAssistList?.FirstOrDefault(qitem => qitem.Id == item.Id);
if ((oldModel?.AssistId ?? 0) != item.AssistId)
{
logContent += string.Format("修改协同人员：【0】=>【{1}】",
empList?.FirstOrDefault(qitem => qitem.Id == (oldModel?.AssistId ?? 0))?.EmployeeName,
empList?.FirstOrDefault(qitem => qitem.Id == item.AssistId)?.EmployeeName
);
}
student_AssistRepository.Update(item);
}
}
logContent += string.Format("新增协同人员:" + empList?.FirstOrDefault(qitem => qitem.Id == model.AssistId)?.EmployeeName);
var newId = student_AssistRepository.Insert(model);
model.Id = newId;
flag = newId > 0;
}
student_LogRepository.AddStuLogRepository(StuId, Common.Enum.Log.StudentLogTypeEnum.BasicInfo, logTitle, logContent, Uid);
return flag;
}
/// <summary>
/// 删除协助人员
/// </summary>
/// <param name="Id"></param>
/// <param name="Uid"></param>
/// <returns></returns>
public bool RemoveStudentAssistModule(int Id, int Uid)
{
bool flag = false;
string logTitle = "删除协助人员";
string logContent = "";
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Student_Assist_Extend.Status),(int)DateStateEnum.Delete}
};
var model = student_AssistRepository.GetEntity(Id);
var empModel = accountRepository.GetEmployeeListRepository(new Employee_ViewModel()
{
QIds = model.AssistId.ToString()
})?.FirstOrDefault();
logContent += string.Format("删除协助人员：{0}", empModel?.EmployeeName);
student_LogRepository.AddStuLogRepository(model.StuId, Common.Enum.Log.StudentLogTypeEnum.BasicInfo, logTitle, logContent, Uid);
flag = student_AssistRepository.Update(fileds, new WhereHelper(nameof(RB_Student_Assist_Extend.Id), Id));
return flag;
}
/// <summary>
/// 获取学员协助人员列表
/// </summary>
......
Edu.Module.User/StudentModule.cs
View file @ bddb6bb6
......@@ -7,6 +7,7 @@ using Edu.Model.ViewModel.Mall;
using Edu.Model.ViewModel.User;
using Edu.Repository.Customer;
using Edu.Repository.Mall;
using Edu.Repository.Reserve;
using Edu.Repository.System;
using Edu.Repository.User;
using System;
......@@ -64,6 +65,16 @@ namespace Edu.Module.User
/// </summary>
private readonly RB_Student_AssistRepository student_AssistRepository = new RB_Student_AssistRepository();
/// <summary>
/// 学员到访仓储层对象
/// </summary>
private readonly RB_Student_VisitRepository student_VisitRepository = new RB_Student_VisitRepository();
/// <summary>
/// 学员试听课仓储层对象
/// </summary>
private readonly RB_Visitor_ReserveRepository visitor_ReserveRepository = new RB_Visitor_ReserveRepository();
/// <summary>
/// 获取学生列表
/// </summary>
......@@ -111,6 +122,16 @@ namespace Edu.Module.User
{
accountList= accountModule.GetAccountListExtModule(new RB_Account_ViewModel() { QIds = aIds });
}
//学员到访统计
var visitList = student_VisitRepository.GetStudentVisitStaticRepository(new RB_Student_Visit_Extend()
{
QStuIds = stuIds
});
//学员试听统计
var stuReserveList = visitor_ReserveRepository.GetStuReserveStaticsListRepository(new Model.ViewModel.Reserve.RB_Visitor_Reserve_Extend()
{
QVisitor_Ids = stuIds
});
var provideList = list.Where(qitem => qitem.ProviceId > 0).Select(qitem => qitem.ProviceId).ToList();
var cityList = list.Where(qitem => qitem.CityId > 0).Select(qitem => qitem.CityId).ToList();
var areaList = list.Where(qitem => qitem.AreaId > 0).Select(qitem => qitem.AreaId).ToList();
......@@ -157,6 +178,8 @@ namespace Edu.Module.User
sItem.AssistName = accountList?.FirstOrDefault(qitem => qitem.Id == sItem.AssistId)?.AccountName ?? "";
}
item.AssistList = tempAssistList;
item.VisitCount = visitList?.FirstOrDefault(qitem => qitem.StuId == item.StuId)?.VisitCount ?? 0;
item.TrialLessonCount = stuReserveList?.FirstOrDefault(qitem => qitem.Visitor_Id == item.StuId)?.TrialLessonCount ?? 0;
}
}
return list;
......
Edu.Repository/Customer/RB_Student_VisitRepository.cs
View file @ bddb6bb6
......@@ -78,5 +78,44 @@ WHERE 1=1
builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Student_Visit_Extend.Id));
return Get<RB_Student_Visit_Extend>( builder.ToString()).ToList();
}
/// <summary>
/// 获取到访列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Student_Visit_Extend> GetStudentVisitStaticRepository(RB_Student_Visit_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.StuId,Count(1) AS VisitCount
FROM RB_Student_Visit AS A INNER JOIN rb_student AS B ON A.StuId=B.StuId
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Visit_Extend.Status), (int)DateStateEnum.Normal);
if (query != null)
{
if (query.Group_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Visit_Extend.Group_Id), query.Group_Id);
}
if (query.StuId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Visit_Extend.StuId), query.StuId);
}
if (!string.IsNullOrEmpty(query.QStuIds))
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Student_Visit_Extend.StuId), query.QStuIds);
}
if (!string.IsNullOrEmpty(query.QueryDate))
{
//今日到访
builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%y/%m/%d')= DATE_FORMAT('{1}','%y/%m/%d') ", nameof(RB_Student_Visit_Extend.CreateTime), Common.ConvertHelper.FormatDate(query.QueryDate));
}
}
builder.AppendFormat(" GROUP BY A.StuId ");
return Get<RB_Student_Visit_Extend>(builder.ToString()).ToList();
}
}
}
Edu.Repository/Reserve/RB_Visitor_ReserveRepository.cs
View file @ bddb6bb6
......@@ -99,6 +99,7 @@ WHERE 1=1
var parameters = new DynamicParameters();
builder.Append(@"
SELECT A.*,IFNULL(B.StuName,'') AS VisitorName,C.ClassDate,C.ClassTime,C.EndTime,C.ClassContent,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(E.RoomName,'') AS RoomName
,IFNULL(B.StuTel,'') AS StuTel
FROM RB_Visitor_Reserve AS A LEFT JOIN rb_student AS B ON A.Visitor_Id=B.StuId
LEFT JOIN rb_reserve_class AS C ON A.ReserveClassId=C.ReserveClassId
LEFT JOIN rb_teacher AS D ON C.TeacherId=D.TId
......@@ -227,5 +228,31 @@ WHERE 1=1 AND A.Status=0
}
return result > 0;
}
/// <summary>
/// 统计学员约课次数列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Visitor_Reserve_Extend> GetStuReserveStaticsListRepository(RB_Visitor_Reserve_Extend query)
{
StringBuilder builder = new StringBuilder();
var parameters = new DynamicParameters();
builder.AppendFormat(@"
SELECT A.Visitor_Id,COUNT(1) AS TrialLessonCount
FROM RB_Visitor_Reserve AS A LEFT JOIN rb_student AS B ON A.Visitor_Id=B.StuId
WHERE 1=1
");
if (query != null)
{
if (!string.IsNullOrEmpty(query.QVisitor_Ids))
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Visitor_Reserve_Extend.Visitor_Id), query.QVisitor_Ids);
}
}
builder.AppendFormat(" GROUP BY A.Visitor_Id ");
return Get<RB_Visitor_Reserve_Extend>(builder.ToString(), parameters).ToList();
}
}
}
Edu.WebApi/Controllers/B2BApp/B2BAppController.cs
View file @ bddb6bb6
......@@ -97,6 +97,7 @@ namespace Edu.WebApi.Controllers.B2BApp
DepositbookMoney = tempBalanceList?.Where(qitem => qitem.RebateType == 2)?.Sum(qitem => qitem.Money) ?? 0,
item.B2BBackground,
item.B2BIcon,
item.OrderId,
});
}
pageModel.PageData = result;
......
Edu.WebApi/Controllers/Customer/CustomerStudentController.cs
View file @ bddb6bb6
......@@ -233,10 +233,12 @@ namespace Edu.WebApi.Controllers.Customer
item.ReceptionPersionName,
item.Remark,
item.Feedback,
CreateTime=Common.ConvertHelper.FormatTimeStr2(item.CreateTime),
CreateTime = Common.ConvertHelper.FormatTimeStr2(item.CreateTime),
CreateByName,
item.IsVisit,
item.IsVisitStr,
item.VisitTime,
Date = Common.ConvertHelper.FormatDate(item.Date),
});
}
pageModel.Count = rowsCount;
......@@ -261,6 +263,10 @@ namespace Edu.WebApi.Controllers.Customer
ReceptionPersion=base.ParmJObj.GetInt("ReceptionPersion"),
Remark = base.ParmJObj.GetStringValue("Remark"),
};
if (extModel.ReceptionPersion <= 0)
{
extModel.ReceptionPersion = base.UserInfo.Id;
}
extModel.Status = Common.Enum.DateStateEnum.Normal;
extModel.CreateBy = base.UserInfo.Id;
extModel.CreateTime = DateTime.Now;
......@@ -426,30 +432,28 @@ namespace Edu.WebApi.Controllers.Customer
{
var AssistList = new List<RB_Student_Assist_Extend>();
var StuId = base.ParmJObj.GetInt("StuId");
string assistListStr = base.ParmJObj.GetStringValue("AssistList");
if (!string.IsNullOrEmpty(assistListStr))
var model = new RB_Student_Assist_Extend()
{
JArray jarray = JArray.Parse(assistListStr);
if (jarray != null && jarray.Count > 0)
{
foreach (var jItem in jarray)
{
JObject jobj = JObject.Parse(jItem.ToString());
var aModel = new RB_Student_Assist_Extend()
{
Id = jobj.GetInt("Id"),
AssistId = jobj.GetInt("AssistId"),
AssistType = (AssistTypeEnum)jobj.GetInt("AssistType"),
StuId = StuId,
};
AssistList.Add(aModel);
}
}
}
bool flag = customerStudentModule.SetStudentAssistModule(StuId, AssistList,base.UserInfo.Id);
Id = ParmJObj.GetInt("Id"),
AssistId = ParmJObj.GetInt("AssistId"),
AssistType = (AssistTypeEnum)ParmJObj.GetInt("AssistType"),
StuId = StuId,
Status = Common.Enum.DateStateEnum.Normal
};
bool flag = customerStudentModule.SetStudentAssistModule(StuId, model, base.UserInfo.Id);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 删除协同人员
/// </summary>
/// <returns></returns>
public ApiResult RemoveStudentAssist()
{
int Id = base.ParmJObj.GetInt("Id");
bool flag = customerStudentModule.RemoveStudentAssistModule(Id, base.UserInfo.Id);
return ApiResult.Failed();
}
/// <summary>
/// 获取协助人员列表
......@@ -460,7 +464,20 @@ namespace Edu.WebApi.Controllers.Customer
{
var StuId = base.ParmJObj.GetInt("StuId");
var data = customerStudentModule.GeStudentAssistListModule(StuId);
return ApiResult.Success(data: data);
List<object> list = new List<object>();
foreach (var item in data)
{
list.Add(new
{
item.Id,
item.AssistId,
item.AssistType,
AssistTypeName = item.AssistType.ToName(),
item.AssistName,
CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime)
});
}
return ApiResult.Success(data: list);
}
}
}
Edu.WebApi/Controllers/Duty/DutyPlanController.cs
View file @ bddb6bb6
......@@ -4,6 +4,7 @@ using Edu.Common.Enum.Duty;
using Edu.Common.Plugin;
using Edu.Model.ViewModel.Duty;
using Edu.Model.ViewModel.Grade;
using Edu.Model.ViewModel.User;
using Edu.Module.Course;
using Edu.Module.Customer;
using Edu.Module.Duty;
......@@ -723,8 +724,7 @@ namespace Edu.WebApi.Controllers.Duty
{
foreach (var item in data)
{
string StuTel = item.StuTel;
StuTel= Regex.Replace(StuTel, "(\\d{3})(\\d{5})(\\d{3})", "$1*****$3");
string StuTel = Common.Plugin.StringHelper.ReplaceMobile(item.StuTel);
list.Add(new
{
item.Id,
......@@ -761,5 +761,67 @@ namespace Edu.WebApi.Controllers.Duty
var data = classModule.GetDateTrialLessonModule(planDate, planDate);
return ApiResult.Success(data: data);
}
/// <summary>
/// 获取学生分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult DutyGetStudentPageList()
{
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Student_ViewModel()
{
KeyWords = base.ParmJObj.GetStringValue("KeyWords")
};
if (query.IsQueryMyStu == 1)
{
query.CreateBy = base.UserInfo.Id;
}
query.Group_Id = base.UserInfo.Group_Id;
var data = studentModule.GetStudentPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
List<object> list = new List<object>();
foreach (var item in data)
{
if (item.CreateBy > 0)
{
item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
}
list.Add(new
{
item.StuId,
item.StuName,
item.StuTel,
item.StuIcon,
item.StuSex,
StuSexStr = item.StuSex == 0 ? "男" : "女",
StuBirth = Common.ConvertHelper.FormatDate(item.StuBirth),
item.StuStage,
StuStageName = item.StuStage.ToName(),
CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
item.CreateByName,
item.CreateType,
CreateTypeStr = item.CreateType == 1 ? "员工录入" : "同业录入",
item.StuChannel,
StuChannelName = item.StuChannel.ToName(),
item.PlatformName,
item.CustomerId,
AssistList = item.AssistList.Select(qitem => new
{
qitem.Id,
qitem.StuId,
qitem.AssistId,
qitem.AssistName,
qitem.AssistType,
AssistTypeName = qitem.AssistType.ToName()
}),
});
}
pageModel.Count = rowsCount;
pageModel.PageData = list;
return ApiResult.Success(data: pageModel);
}
}
}
Edu.WebApi/Controllers/User/UserController.cs
View file @ bddb6bb6
......@@ -663,6 +663,7 @@ namespace Edu.WebApi.Controllers.User
StuStage = (StuStageEnum)base.ParmJObj.GetInt("StuStage"),
StartTime = base.ParmJObj.GetStringValue("StartTime"),
EndTime = base.ParmJObj.GetStringValue("EndTime"),
};
if (query.IsQueryMyStu == 1)
{
......@@ -805,8 +806,14 @@ namespace Edu.WebApi.Controllers.User
StuTel = base.ParmJObj.GetStringValue("StuTel"),
};
var customer = base.AppletCustomerInfo;
extModel.Group_Id = customer.GroupId;
extModel.CustomerId = customer.CustomerId;
if (customer != null&&customer.GroupId>0)
{
extModel.Group_Id = customer.GroupId;
}
if (extModel.Group_Id <= 0)
{
extModel.Group_Id = base.UserInfo.Group_Id;
}
bool flag = studentModule.CheckStudentModule(extModel);
return flag ? ApiResult.Failed(message: "此学员手机号已绑定同行!请重新录入!") : ApiResult.Success();
}
......
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