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
083143c4
Commit
083143c4
authored
Mar 17, 2022
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
267ac48f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
RB_Scroll_CourseTime_ViewModel.cs
Edu.Model/ViewModel/Scroll/RB_Scroll_CourseTime_ViewModel.cs
+5
-0
ScrollClassModule.cs
Edu.Module.Course/ScrollClassModule.cs
+2
-0
No files found.
Edu.Model/ViewModel/Scroll/RB_Scroll_CourseTime_ViewModel.cs
View file @
083143c4
...
@@ -107,6 +107,11 @@ namespace Edu.Model.ViewModel.Scroll
...
@@ -107,6 +107,11 @@ namespace Edu.Model.ViewModel.Scroll
/// </summary>
/// </summary>
public
string
Description
{
get
;
set
;
}
public
string
Description
{
get
;
set
;
}
/// <summary>
/// 已报名教室ID
/// </summary>
public
int
RoomId
{
get
;
set
;
}
public
DateTime
SDate
{
get
=>
Convert
.
ToDateTime
(
"2022-01-01 "
+
this
.
StartTime
);
}
public
DateTime
SDate
{
get
=>
Convert
.
ToDateTime
(
"2022-01-01 "
+
this
.
StartTime
);
}
public
DateTime
EDate
{
get
=>
Convert
.
ToDateTime
(
"2022-01-01 "
+
this
.
EndTime
);
}
public
DateTime
EDate
{
get
=>
Convert
.
ToDateTime
(
"2022-01-01 "
+
this
.
EndTime
);
}
}
}
...
...
Edu.Module.Course/ScrollClassModule.cs
View file @
083143c4
...
@@ -2556,6 +2556,7 @@ namespace Edu.Module.Course
...
@@ -2556,6 +2556,7 @@ namespace Edu.Module.Course
z
.
CourseName
=
firstModel
.
CourseName
;
z
.
CourseName
=
firstModel
.
CourseName
;
z
.
CourseGradeNo
=
x
.
Key
.
CourseGradeNo
;
z
.
CourseGradeNo
=
x
.
Key
.
CourseGradeNo
;
z
.
PeopleNum
=
x
.
Count
();
z
.
PeopleNum
=
x
.
Count
();
z
.
RoomId
=
firstModel
.
RoomId
;
});
});
});
});
}
}
...
@@ -2573,6 +2574,7 @@ namespace Edu.Module.Course
...
@@ -2573,6 +2574,7 @@ namespace Edu.Module.Course
if
(
demodel
.
CourseGradeNo
!=
item
.
CourseGradeNo
)
{
return
"预约课程章节不一致"
;
}
if
(
demodel
.
CourseGradeNo
!=
item
.
CourseGradeNo
)
{
return
"预约课程章节不一致"
;
}
if
(
item
.
PeopleNum
+
1
>
item
.
MaxPeopleNum
)
{
return
"该时段已预约满,请预约其他时段"
;
}
if
(
item
.
PeopleNum
+
1
>
item
.
MaxPeopleNum
)
{
return
"该时段已预约满,请预约其他时段"
;
}
demodel
.
CourseId
=
item
.
CourseId
;
demodel
.
CourseId
=
item
.
CourseId
;
demodel
.
RoomId
=
item
.
RoomId
;
}
}
demodel
.
CourseEndTime
=
Convert
.
ToDateTime
(
Date
+
" "
+
timeList
.
Max
(
x
=>
x
.
EndTime
));
//上完课的时间
demodel
.
CourseEndTime
=
Convert
.
ToDateTime
(
Date
+
" "
+
timeList
.
Max
(
x
=>
x
.
EndTime
));
//上完课的时间
...
...
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