Commit 817a0beb authored by 黄奎's avatar 黄奎

页面修改

parent 7e6ebed3
......@@ -170,5 +170,10 @@ namespace Mall.Model.Entity.Education
/// 活动总结
/// </summary>
public string Summary { get; set; }
/// <summary>
/// 教师编号
/// </summary>
public int TeacherId { get; set; }
}
}
......@@ -201,5 +201,10 @@ namespace Mall.Model.Extend.Education
/// 是否查询有封面图的活动
/// </summary>
public string IsQueryCoverImage { get; set; }
/// <summary>
/// 关联老师名称
/// </summary>
public string TeacherName { get; set; }
}
}
......@@ -283,6 +283,8 @@ namespace Mall.Module.Education
if (list != null && isQuerySignup)
{
string ids = string.Join(",", list.Select(qitem => qitem.Id));
string tids = string.Join(",", list.Select(qitem => qitem.TeacherId));
var employeeList = RB_AccountRepository.GetEmployeeListRepository(new Employee_ViewModel { School_Id = -1, AccountTypeStr = "2", }).ToList();
List<RB_Education_Consult_Extend> joinList = new List<RB_Education_Consult_Extend>();
if (!string.IsNullOrEmpty(ids))
{
......@@ -291,6 +293,7 @@ namespace Mall.Module.Education
foreach (var item in list)
{
item.EducationConsultList = joinList?.Where(qitem => qitem.ActivityId == item.Id)?.ToList() ?? new List<RB_Education_Consult_Extend>();
item.TeacherName = employeeList?.FirstOrDefault(qitem => qitem.AccountId == item.TeacherId)?.EmployeeName ?? "";
}
}
return list;
......@@ -367,6 +370,7 @@ namespace Mall.Module.Education
{nameof(RB_Education_Activity_Extend.LonLat),model.LonLat },
{nameof(RB_Education_Activity_Extend.LocationName),model.LocationName },
{nameof(RB_Education_Activity_Extend.LnsideLimit),model.LnsideLimit },
{nameof(RB_Education_Activity_Extend.TeacherId),model.TeacherId },
};
flag = education_ActivityRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Activity_Extend.Id), model.Id), trans);
if (flag)
......
......@@ -1730,7 +1730,7 @@ namespace Mall.WebApi.Controllers.Education
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetActivityPage()
{
var req = RequestParm;
......
......@@ -2147,6 +2147,7 @@ namespace Mall.WebApi.Controllers.Education
LonLat = jObj.GetStringValue("LonLat"),
LocationName = jObj.GetStringValue("LocationName"),
LnsideLimit = jObj.GetInt("LnsideLimit", 0),
TeacherId=jObj.GetInt("TeacherId")
};
try
{
......
@echo off
echo ASPNETCORE_ENVIRONMENT=Development
dotnet build
start "Mall.WebApi" dotnet bin\Debug\netcoreapp3.0\Mall.WebApi.dll
start "Mall.WebApi" dotnet bin\Debug\netcoreapp3.0\Mall.WebApi.dll --urls http://0.0.0.0:5000 --ip="127.0.0.1" --port=5000
exit
\ No newline at end of file
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