Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Education
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
Education
Commits
3d80ccd2
Commit
3d80ccd2
authored
Apr 11, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
44fe56a3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
3 deletions
+21
-3
AppletIndexController.cs
Edu.WebApi/Controllers/Applet/AppletIndexController.cs
+20
-2
appsettings.json
Edu.WebApi/appsettings.json
+1
-1
No files found.
Edu.WebApi/Controllers/Applet/AppletIndexController.cs
View file @
3d80ccd2
...
...
@@ -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
});
}
...
...
Edu.WebApi/appsettings.json
View file @
3d80ccd2
...
...
@@ -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"
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment