Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
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
黄奎
mall.oytour.com
Commits
817a0beb
Commit
817a0beb
authored
Mar 30, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
7e6ebed3
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
2 deletions
+17
-2
RB_Education_Activity.cs
Mall.Model/Entity/Education/RB_Education_Activity.cs
+5
-0
RB_Education_Activity_Extend.cs
Mall.Model/Extend/Education/RB_Education_Activity_Extend.cs
+5
-0
ActivityModule.cs
Mall.Module.Education/ActivityModule.cs
+4
-0
AppletEducationController.cs
...WebApi/Controllers/Education/AppletEducationController.cs
+1
-1
EducationController.cs
Mall.WebApi/Controllers/Education/EducationController.cs
+1
-0
run_5000.cmd
Mall.WebApi/run_5000.cmd
+1
-1
No files found.
Mall.Model/Entity/Education/RB_Education_Activity.cs
View file @
817a0beb
...
...
@@ -170,5 +170,10 @@ namespace Mall.Model.Entity.Education
/// 活动总结
/// </summary>
public
string
Summary
{
get
;
set
;
}
/// <summary>
/// 教师编号
/// </summary>
public
int
TeacherId
{
get
;
set
;
}
}
}
Mall.Model/Extend/Education/RB_Education_Activity_Extend.cs
View file @
817a0beb
...
...
@@ -201,5 +201,10 @@ namespace Mall.Model.Extend.Education
/// 是否查询有封面图的活动
/// </summary>
public
string
IsQueryCoverImage
{
get
;
set
;
}
/// <summary>
/// 关联老师名称
/// </summary>
public
string
TeacherName
{
get
;
set
;
}
}
}
Mall.Module.Education/ActivityModule.cs
View file @
817a0beb
...
...
@@ -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
)
...
...
Mall.WebApi/Controllers/Education/AppletEducationController.cs
View file @
817a0beb
...
...
@@ -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
;
...
...
Mall.WebApi/Controllers/Education/EducationController.cs
View file @
817a0beb
...
...
@@ -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
{
...
...
Mall.WebApi/run.cmd
→
Mall.WebApi/run
_5000
.cmd
View file @
817a0beb
@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
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