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
d5b0fdb3
Commit
d5b0fdb3
authored
Sep 29, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
5c2aaba7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
ClassModule.cs
Edu.Module.Course/ClassModule.cs
+3
-0
ClassController.cs
Edu.WebApi/Controllers/Course/ClassController.cs
+3
-1
No files found.
Edu.Module.Course/ClassModule.cs
View file @
d5b0fdb3
...
@@ -1394,6 +1394,9 @@ namespace Edu.Module.Course
...
@@ -1394,6 +1394,9 @@ namespace Edu.Module.Course
extModel
.
ClassStepPriceList
=
class_StepPriceRepository
.
GetClassStepPriceListRepository
(
new
RB_Class_StepPrice_ViewModel
()
{
ClassId
=
extModel
.
ClassId
})?.
ToList
()
??
new
List
<
RB_Class_StepPrice_ViewModel
>();
extModel
.
ClassStepPriceList
=
class_StepPriceRepository
.
GetClassStepPriceListRepository
(
new
RB_Class_StepPrice_ViewModel
()
{
ClassId
=
extModel
.
ClassId
})?.
ToList
()
??
new
List
<
RB_Class_StepPrice_ViewModel
>();
//课程计划上课日期
//课程计划上课日期
extModel
.
ClassPlanList
=
class_PlanRepository
.
GetClassPlanListRepository
(
new
RB_Class_Plan_ViewModel
()
{
ClassId
=
extModel
.
ClassId
})?.
ToList
()
??
new
List
<
RB_Class_Plan_ViewModel
>();
extModel
.
ClassPlanList
=
class_PlanRepository
.
GetClassPlanListRepository
(
new
RB_Class_Plan_ViewModel
()
{
ClassId
=
extModel
.
ClassId
})?.
ToList
()
??
new
List
<
RB_Class_Plan_ViewModel
>();
extModel
.
TotalPlanNum
=
extModel
?.
ClassPlanList
?.
Count
()
??
0
;
extModel
.
UsePlanNum
=
extModel
?.
ClassPlanList
?.
Where
(
qitem
=>
qitem
.
ClassDate
<=
DateTime
.
Now
)?.
Count
()
??
0
;
//班级上课计划时间列表
//班级上课计划时间列表
var
timeList
=
class_TimeRepository
.
GetClassTimeListRepository
(
new
RB_Class_Time_ViewModel
()
{
ClassId
=
extModel
.
ClassId
})?.
ToList
()
??
new
List
<
RB_Class_Time_ViewModel
>();
var
timeList
=
class_TimeRepository
.
GetClassTimeListRepository
(
new
RB_Class_Time_ViewModel
()
{
ClassId
=
extModel
.
ClassId
})?.
ToList
()
??
new
List
<
RB_Class_Time_ViewModel
>();
if
(
extModel
.
ClassPlanList
!=
null
&&
extModel
.
ClassPlanList
.
Count
>
0
&&
timeList
!=
null
&&
timeList
.
Count
>
0
)
if
(
extModel
.
ClassPlanList
!=
null
&&
extModel
.
ClassPlanList
.
Count
>
0
&&
timeList
!=
null
&&
timeList
.
Count
>
0
)
...
...
Edu.WebApi/Controllers/Course/ClassController.cs
View file @
d5b0fdb3
...
@@ -673,7 +673,9 @@ namespace Edu.WebApi.Controllers.Course
...
@@ -673,7 +673,9 @@ namespace Edu.WebApi.Controllers.Course
CompleteProgress
=
extModel
?.
CompleteProgress
??
0
,
CompleteProgress
=
extModel
?.
CompleteProgress
??
0
,
ClassStatusStr
=
extModel
?.
ClassStatusStr
??
""
,
ClassStatusStr
=
extModel
?.
ClassStatusStr
??
""
,
ClassHourMinute
=
extModel
?.
ClassHourMinute
??
45
,
ClassHourMinute
=
extModel
?.
ClassHourMinute
??
45
,
ClassDateList
=
extModel
?.
ClassDateList
??
new
List
<
string
>(),
ClassDateList
=
extModel
?.
ClassDateList
??
new
List
<
string
>(),
TotalPlanNum
=
extModel
?.
TotalPlanNum
??
0
,
UsePlanNum
=
extModel
?.
UsePlanNum
??
0
,
};
};
return
ApiResult
.
Success
(
data
:
obj
);
return
ApiResult
.
Success
(
data
:
obj
);
}
}
...
...
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