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
4fb9a1a1
Commit
4fb9a1a1
authored
Oct 20, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
34b94ab6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
63 additions
and
9 deletions
+63
-9
RB_Class_ViewModel.cs
Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs
+35
-0
RB_ClassRepository.cs
Edu.Repository/Course/RB_ClassRepository.cs
+27
-4
ClassController.cs
Edu.WebApi/Controllers/Course/ClassController.cs
+1
-5
No files found.
Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs
View file @
4fb9a1a1
...
...
@@ -27,5 +27,40 @@ namespace Edu.Model.ViewModel.Course
/// 更新时间
/// </summary>
public
string
UpdateTimeStr
{
get
{
return
Common
.
ConvertHelper
.
FormatTime
(
this
.
UpdateTime
);
}
}
/// <summary>
/// 课程名称
/// </summary>
public
string
CourseName
{
get
;
set
;
}
/// <summary>
/// 助教名称
/// </summary>
public
string
AssistName
{
get
;
set
;
}
/// <summary>
/// 助教头像
/// </summary>
public
string
AssistIcon
{
get
;
set
;
}
/// <summary>
/// 讲师名称
/// </summary>
public
string
TeacherName
{
get
;
set
;
}
/// <summary>
/// 讲师头像
/// </summary>
public
string
TeacherHead
{
get
;
set
;
}
/// <summary>
/// 学员数量
/// </summary>
public
int
StudentCount
{
get
;
set
;
}
/// <summary>
/// 作业数量
/// </summary>
public
int
JobCount
{
get
;
set
;
}
}
}
\ No newline at end of file
Edu.Repository/Course/RB_ClassRepository.cs
View file @
4fb9a1a1
...
...
@@ -4,6 +4,7 @@ using Edu.Model.ViewModel.Course;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
VT.FW.DB.Dapper
;
namespace
Edu.Repository.Course
{
...
...
@@ -46,10 +47,13 @@ WHERE 1=1
/// <returns></returns>
public
List
<
RB_Class_ViewModel
>
GetClassPageListRepository
(
int
pageIndex
,
int
pageSize
,
out
long
rowsCount
,
RB_Class_ViewModel
query
)
{
var
parameters
=
new
DynamicParameters
();
StringBuilder
builder
=
new
StringBuilder
();
builder
.
AppendFormat
(
@"
SELECT A.*
FROM rb_class AS A
SELECT A.*,B.CourseName,C.AssistName,IFNULL(C.AssistIcon,'') AS AssistIcon,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead
FROM rb_class AS A LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId
LEFT JOIN rb_assist AS C ON A.Assist_Id=C.AId
LEFT JOIN rb_teacher AS D ON A.Teacher_Id=D.TId
WHERE 1=1
"
);
if
(
query
!=
null
)
...
...
@@ -58,10 +62,29 @@ WHERE 1=1
{
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Class_ViewModel
.
Status
),
(
int
)
query
.
Status
);
}
if
(!
string
.
IsNullOrWhiteSpace
(
query
.
ClassName
))
{
builder
.
AppendFormat
(
" AND A.{0} LIKE @ClassName "
,
nameof
(
RB_Class_ViewModel
.
ClassName
));
parameters
.
Add
(
"ClassName"
,
"%"
+
query
.
ClassName
.
Trim
()
+
"%"
);
}
if
(!
string
.
IsNullOrWhiteSpace
(
query
.
CourseName
))
{
builder
.
AppendFormat
(
" AND B.{0} LIKE @CourseName "
,
nameof
(
RB_Class_ViewModel
.
CourseName
));
parameters
.
Add
(
"CourseName"
,
"%"
+
query
.
CourseName
.
Trim
()
+
"%"
);
}
if
(!
string
.
IsNullOrWhiteSpace
(
query
.
AssistName
))
{
builder
.
AppendFormat
(
" AND C.{0} LIKE @AssistName "
,
nameof
(
RB_Class_ViewModel
.
AssistName
));
parameters
.
Add
(
"AssistName"
,
"%"
+
query
.
AssistName
.
Trim
()
+
"%"
);
}
if
(!
string
.
IsNullOrWhiteSpace
(
query
.
TeacherName
))
{
builder
.
AppendFormat
(
" AND D.{0} LIKE @TeacherName "
,
nameof
(
RB_Class_ViewModel
.
TeacherName
));
parameters
.
Add
(
"TeacherName"
,
"%"
+
query
.
TeacherName
.
Trim
()
+
"%"
);
}
}
return
GetPage
<
RB_Class_ViewModel
>(
pageIndex
,
pageSize
,
out
rowsCount
,
builder
.
ToString
()).
ToList
();
return
GetPage
<
RB_Class_ViewModel
>(
pageIndex
,
pageSize
,
out
rowsCount
,
builder
.
ToString
()
,
parameters
).
ToList
();
}
}
}
Edu.WebApi/Controllers/Course/ClassController.cs
View file @
4fb9a1a1
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading.Tasks
;
using
Edu.Cache.User
;
using
Edu.Common.API
;
using
Edu.Common.Plugin
;
...
...
@@ -9,7 +6,6 @@ using Edu.Model.ViewModel.Course;
using
Edu.Module.Course
;
using
Edu.WebApi.Filter
;
using
Microsoft.AspNetCore.Cors
;
using
Microsoft.AspNetCore.Http
;
using
Microsoft.AspNetCore.Mvc
;
namespace
Edu.WebApi.Controllers.Course
...
...
@@ -91,7 +87,7 @@ namespace Edu.WebApi.Controllers.Course
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetC
ourseCategory
()
public
ApiResult
GetC
lass
()
{
var
ClassId
=
base
.
ParmJObj
.
GetInt
(
"ClassId"
,
0
);
var
extModel
=
classModule
.
GetClassModule
(
ClassId
);
...
...
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