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
df4c63a9
Commit
df4c63a9
authored
Dec 28, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
92af4a70
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
ClassModule.cs
Edu.Module.Course/ClassModule.cs
+3
-3
RB_Reserve_ClassRepository.cs
Edu.Repository/Reserve/RB_Reserve_ClassRepository.cs
+3
-1
No files found.
Edu.Module.Course/ClassModule.cs
View file @
df4c63a9
...
...
@@ -3745,7 +3745,7 @@ namespace Edu.Module.Course
ClassType
=
2
,
ClassId
=
subItem
.
ReserveClassId
,
ClassName
=
"试听课"
,
CourseName
=
subItem
.
ClassContent
,
CourseName
=
subItem
.
LessonName
,
subItem
.
RoomName
,
subItem
.
TeacherName
,
Ranks
=
0
,
...
...
@@ -3823,7 +3823,7 @@ namespace Edu.Module.Course
{
ClassId
=
item
.
ReserveClassId
,
ClassName
=
"试听课"
,
CourseName
=
item
.
ClassContent
,
CourseName
=
item
.
LessonName
,
item
.
RoomName
,
item
.
TeacherName
,
ClassDate
=
Common
.
ConvertHelper
.
FormatDate
(
item
.
ClassDate
),
...
...
@@ -4025,7 +4025,7 @@ namespace Edu.Module.Course
ClassType
=
2
,
ClassId
=
subItem
.
ReserveClassId
,
ClassName
=
"试听课"
,
CourseName
=
subItem
.
ClassContent
,
CourseName
=
subItem
.
LessonName
,
subItem
.
RoomName
,
subItem
.
TeacherName
,
TimeStr
=
Common
.
ConvertHelper
.
GetTimeStr
(
currentDate
),
...
...
Edu.Repository/Reserve/RB_Reserve_ClassRepository.cs
View file @
df4c63a9
...
...
@@ -78,9 +78,11 @@ WHERE 1=1
var
parameters
=
new
DynamicParameters
();
builder
.
Append
(
@"
SELECT A.*,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(E.RoomName,'') AS RoomName,IFNULL(E.SeatNum,0) AS RoomNum
,IFNULL(G.LessonName,'') AS LessonName
FROM RB_Reserve_Class AS A LEFT JOIN rb_teacher AS D ON A.TeacherId=D.TId
LEFT JOIN rb_class_room AS E ON A.ClassRoomId=E.RoomId
WHERE 1=1
LEFT JOIN rb_triallesson AS G ON A.TrialLessonId=G.Id
WHERE 1=1
"
);
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Reserve_Class_Extend
.
Status
),
(
int
)
DateStateEnum
.
Normal
);
if
(
query
!=
null
)
...
...
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