Commit 3d80ccd2 authored by 黄奎's avatar 黄奎

页面修改

parent 44fe56a3
......@@ -17,6 +17,7 @@ using Edu.Module.Course;
using Edu.Module.Customer;
using Edu.Module.EduTask;
using Edu.Module.Exam;
using Edu.Module.Goods;
using Edu.Module.Public;
using Edu.Module.User;
using Edu.WebApi.Filter;
......@@ -72,6 +73,11 @@ namespace Edu.WebApi.Controllers.Applet
/// </summary>
private readonly CustomerStudentModule customerStudentModule = new CustomerStudentModule();
/// <summary>
/// 意见调查处理类对象
/// </summary>
private readonly ActivitySurveyModule activitySurveyModule = new ActivitySurveyModule();
#region 小程序首页
/// <summary>
......@@ -364,7 +370,18 @@ namespace Edu.WebApi.Controllers.Applet
ClassId = 0,
};
}
Int32.TryParse(appletUserInfo.JHTenantId, out int JHTenantId);
Int32.TryParse(appletUserInfo.JHMallBaseId, out int JHMallBaseId);
var surveyList = activitySurveyModule.GetActivitySurveyListModule(new Model.Entity.Mall.RB_ActivitySurvey()
{
TenantId = JHTenantId,
MallBaseId = JHMallBaseId,
}, appletUserInfo.Id.ToString());
var ActivitySurveyId = 0;
if (surveyList != null && surveyList.Count > 0)
{
ActivitySurveyId = surveyList.FirstOrDefault().ID;
}
return ApiResult.Success("", new
{
studentModel.GuestId,
......@@ -379,7 +396,8 @@ namespace Edu.WebApi.Controllers.Applet
ClassNext,
LearningGardenList,
Words,
BankTypeList
BankTypeList,
ActivitySurveyId
});
}
......
......@@ -8,7 +8,7 @@
"DataStatisticsConnectionPName": "MySql.Data.MySqlClient",
"LogConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_sys;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"LogConnectionPName": "MySql.Data.MySqlClient",
"MallConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"MallConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"MallConnectionPName": "MySql.Data.MySqlClient"
},
"Logging": {
......
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