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
d5ca9e08
Commit
d5ca9e08
authored
Oct 13, 2020
by
罗超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整助教查询部字段
parent
81b1e2b6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
6 deletions
+24
-6
RB_Assist_ViewModel.cs
Edu.Model/ViewModel/User/RB_Assist_ViewModel.cs
+15
-0
RB_AssistRepository.cs
Edu.Repository/User/RB_AssistRepository.cs
+9
-5
UserController.cs
Edu.WebApi/Controllers/User/UserController.cs
+0
-1
No files found.
Edu.Model/ViewModel/User/RB_Assist_ViewModel.cs
View file @
d5ca9e08
...
...
@@ -44,5 +44,20 @@ namespace Edu.Model.ViewModel.User
/// 审核状态字符串
/// </summary>
public
string
AuditStatusStr
{
get
{
return
this
.
AuditStatus
.
ToName
();
}
}
/// <summary>
/// 带班数量
/// </summary>
public
int
ClassCount
{
get
;
set
;
}
/// <summary>
/// 网课产品
/// </summary>
public
int
OnlineClassCount
{
get
;
set
;
}
/// <summary>
/// 网课订单
/// </summary>
public
int
OnlineOrderCount
{
get
;
set
;
}
}
}
\ No newline at end of file
Edu.Repository/User/RB_AssistRepository.cs
View file @
d5ca9e08
...
...
@@ -79,11 +79,11 @@ WHERE 1=1
var
parameters
=
new
DynamicParameters
();
StringBuilder
builder
=
new
StringBuilder
();
builder
.
AppendFormat
(
@"
SELECT a.*,g.GroupName,s.SName
FROM rb_assist AS a LEFT JOIN rb_group AS g ON a.Group_Id=g.GId
LEFT JOIN rb_school AS s ON a.School_Id=s.SId
WHERE 1=1
"
);
SELECT a.*,g.GroupName,s.SName
FROM rb_assist AS a LEFT JOIN rb_group AS g ON a.Group_Id=g.GId
LEFT JOIN rb_school AS s ON a.School_Id=s.SId
WHERE 1=1
"
);
builder
.
AppendFormat
(
" AND a.{0}={1} "
,
nameof
(
RB_Assist_ViewModel
.
Status
),
(
int
)
DateStateEnum
.
Normal
);
if
(
query
!=
null
)
{
...
...
@@ -118,6 +118,10 @@ WHERE 1=1
{
builder
.
AppendFormat
(
" AND a.{0}={1} "
,
nameof
(
RB_Assist_ViewModel
.
Teacher_Id
),
query
.
Teacher_Id
);
}
if
(
query
.
AuditStatus
>
0
)
{
builder
.
AppendFormat
(
" AND a.{0}={1} "
,
nameof
(
RB_Assist_ViewModel
.
AuditStatus
),
(
int
)
query
.
AuditStatus
);
}
}
return
GetPage
<
RB_Assist_ViewModel
>(
pageIndex
,
pageSize
,
out
rowsCount
,
builder
.
ToString
(),
parameters
).
ToList
();
}
...
...
Edu.WebApi/Controllers/User/UserController.cs
View file @
d5ca9e08
...
...
@@ -371,7 +371,6 @@ namespace Edu.WebApi.Controllers.User
var
pageModel
=
Common
.
Plugin
.
JsonHelper
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
Msg
.
ToString
());
var
query
=
Common
.
Plugin
.
JsonHelper
.
DeserializeObject
<
RB_Assist_ViewModel
>(
RequestParm
.
Msg
.
ToString
());
query
.
Group_Id
=
base
.
UserInfo
.
Group_Id
;
query
.
School_Id
=
base
.
UserInfo
.
School_Id
;
var
list
=
assistModule
.
GetAssistPageListModule
(
pageModel
.
PageIndex
,
pageModel
.
PageSize
,
out
long
rowsCount
,
query
);
foreach
(
var
item
in
list
)
{
...
...
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