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
b80cf891
Commit
b80cf891
authored
Dec 09, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增字段
parent
5cc8b0af
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletion
+10
-1
RB_Class.cs
Edu.Model/Entity/Course/RB_Class.cs
+5
-0
ClassModule.cs
Edu.Module.Course/ClassModule.cs
+4
-1
ClassController.cs
Edu.WebApi/Controllers/Course/ClassController.cs
+1
-0
No files found.
Edu.Model/Entity/Course/RB_Class.cs
View file @
b80cf891
...
@@ -151,5 +151,10 @@ namespace Edu.Model.Entity.Course
...
@@ -151,5 +151,10 @@ namespace Edu.Model.Entity.Course
/// 完成进度
/// 完成进度
/// </summary>
/// </summary>
public
int
CompleteProgress
{
get
;
set
;
}
public
int
CompleteProgress
{
get
;
set
;
}
/// <summary>
/// 班级类型(1-学生班,2-社会班)
/// </summary>
public
int
ClassType
{
get
;
set
;
}
}
}
}
}
Edu.Module.Course/ClassModule.cs
View file @
b80cf891
...
@@ -149,8 +149,9 @@ namespace Edu.Module.Course
...
@@ -149,8 +149,9 @@ namespace Edu.Module.Course
{
nameof
(
RB_Class_ViewModel
.
ClassStyle
),
model
.
ClassStyle
},
{
nameof
(
RB_Class_ViewModel
.
ClassStyle
),
model
.
ClassStyle
},
{
nameof
(
RB_Class_ViewModel
.
ClassStatus
),
model
.
ClassStatus
},
{
nameof
(
RB_Class_ViewModel
.
ClassStatus
),
model
.
ClassStatus
},
{
nameof
(
RB_Class_ViewModel
.
InnerRemark
),
model
.
InnerRemark
},
{
nameof
(
RB_Class_ViewModel
.
InnerRemark
),
model
.
InnerRemark
},
{
nameof
(
RB_Class_ViewModel
.
OutRemark
),
model
.
OutRemark
},
{
nameof
(
RB_Class_ViewModel
.
ClassType
),
model
.
ClassType
},
//{ nameof(RB_Class_ViewModel.CompleteProgress),model.CompleteProgress},
//{ nameof(RB_Class_ViewModel.CompleteProgress),model.CompleteProgress},
//{ nameof(RB_Class_ViewModel.OutRemark),model.OutRemark},
};
};
flag
=
classRepository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_Class_ViewModel
.
ClassId
),
model
.
ClassId
));
flag
=
classRepository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_Class_ViewModel
.
ClassId
),
model
.
ClassId
));
}
}
...
@@ -497,11 +498,13 @@ namespace Edu.Module.Course
...
@@ -497,11 +498,13 @@ namespace Edu.Module.Course
{
{
timeList
=
class_TimeRepository
.
GetClassTimeListRepository
(
new
RB_Class_Time_ViewModel
()
{
QClassPlanIds
=
Ids
});
timeList
=
class_TimeRepository
.
GetClassTimeListRepository
(
new
RB_Class_Time_ViewModel
()
{
QClassPlanIds
=
Ids
});
}
}
DateTime
today
=
Convert
.
ToDateTime
(
DateTime
.
Now
.
ToString
(
"yyyy-MM-dd"
));
foreach
(
var
item
in
planList
)
foreach
(
var
item
in
planList
)
{
{
item
.
PlanTimeList
=
timeList
?.
Where
(
qitem
=>
qitem
.
ClassPlanId
==
item
.
ClassPlanId
)?.
ToList
();
item
.
PlanTimeList
=
timeList
?.
Where
(
qitem
=>
qitem
.
ClassPlanId
==
item
.
ClassPlanId
)?.
ToList
();
list
.
Add
(
new
list
.
Add
(
new
{
{
IsEndDate
=
item
.
ClassDate
<=
today
?
true
:
false
,
item
.
ClassPlanId
,
item
.
ClassPlanId
,
item
.
ClassId
,
item
.
ClassId
,
item
.
ClassDate
,
item
.
ClassDate
,
...
...
Edu.WebApi/Controllers/Course/ClassController.cs
View file @
b80cf891
...
@@ -125,6 +125,7 @@ namespace Edu.WebApi.Controllers.Course
...
@@ -125,6 +125,7 @@ namespace Edu.WebApi.Controllers.Course
OutRemark
=
base
.
ParmJObj
.
GetStringValue
(
"OutRemark"
),
OutRemark
=
base
.
ParmJObj
.
GetStringValue
(
"OutRemark"
),
CompleteProgress
=
base
.
ParmJObj
.
GetInt
(
"CompleteProgress"
),
CompleteProgress
=
base
.
ParmJObj
.
GetInt
(
"CompleteProgress"
),
School_Id
=
base
.
ParmJObj
.
GetInt
(
"School_Id"
),
School_Id
=
base
.
ParmJObj
.
GetInt
(
"School_Id"
),
ClassType
=
base
.
ParmJObj
.
GetInt
(
"ClassType"
),
};
};
try
try
{
{
...
...
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