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
c22c784d
Commit
c22c784d
authored
Jul 05, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
5ebb8cc6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
ExcelTempLateHelper.cs
Edu.Common/Plugin/ExcelTempLateHelper.cs
+2
-0
ScrollClassModule.cs
Edu.Module.Course/ScrollClassModule.cs
+2
-3
ScrollController.cs
Edu.WebApi/Controllers/Course/ScrollController.cs
+2
-3
No files found.
Edu.Common/Plugin/ExcelTempLateHelper.cs
View file @
c22c784d
...
...
@@ -184,6 +184,8 @@ namespace Edu.Common.Plugin
ms
.
Position
=
0
;
return
ms
.
ToArray
();
}
}
/// <summary>
...
...
Edu.Module.Course/ScrollClassModule.cs
View file @
c22c784d
...
...
@@ -3473,7 +3473,6 @@ namespace Edu.Module.Course
foreach
(
var
item
in
orderList
)
{
List
<
object
>
ChapterList
=
new
List
<
object
>();
var
ogModel
=
ogList
.
Where
(
x
=>
x
.
OrderId
==
item
.
OrderId
).
FirstOrDefault
();
var
oguestModel
=
orderGuestList
.
Where
(
x
=>
x
.
Id
==
ogModel
.
GuestId
).
FirstOrDefault
();
...
...
@@ -3554,8 +3553,8 @@ namespace Edu.Module.Course
item
.
CourseId
,
item
.
CourseName
,
item
.
ClassScrollType
,
oguestModel
.
CourseChapterNo
,
oguestModel
.
TotalChapterNo
,
CourseChapterNo
=
oguestModel
?.
CourseChapterNo
??
0
,
TotalChapterNo
=
oguestModel
?.
TotalChapterNo
??
0
,
ChapterList
});
}
...
...
Edu.WebApi/Controllers/Course/ScrollController.cs
View file @
c22c784d
...
...
@@ -1229,13 +1229,12 @@ namespace Edu.WebApi.Controllers.Course
int
State
=
sObj
.
GetInt
(
"State"
);
if
(
State
==
4
)
{
dataRow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
chapterName
)
);
dataRow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
chapterName
)
{
}
);
}
else
{
dataRow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
"【已上课】"
+
chapterName
)
{
BgColorEnum
=
ColorEnum
.
DarkBlue
}
);
dataRow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
"【已上课】"
+
chapterName
));
}
}
else
{
...
...
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