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
d4086266
Commit
d4086266
authored
Jul 13, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
1295f77c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
RB_Teaching_BonusDetail_ViewModel.cs
...del/ViewModel/Course/RB_Teaching_BonusDetail_ViewModel.cs
+5
-0
RB_Teaching_BonusDetailRepository.cs
Edu.Repository/Course/RB_Teaching_BonusDetailRepository.cs
+8
-0
TeachingRewardsController.cs
Edu.WebApi/Controllers/Course/TeachingRewardsController.cs
+1
-1
No files found.
Edu.Model/ViewModel/Course/RB_Teaching_BonusDetail_ViewModel.cs
View file @
d4086266
...
@@ -17,6 +17,11 @@ namespace Edu.Model.ViewModel.Course
...
@@ -17,6 +17,11 @@ namespace Edu.Model.ViewModel.Course
/// 奖励ids
/// 奖励ids
/// </summary>
/// </summary>
public
string
BonusIds
{
get
;
set
;
}
public
string
BonusIds
{
get
;
set
;
}
/// <summary>
/// 老师ids
/// </summary>
public
string
TeacherIds
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 教师名称
/// 教师名称
/// </summary>
/// </summary>
...
...
Edu.Repository/Course/RB_Teaching_BonusDetailRepository.cs
View file @
d4086266
...
@@ -145,6 +145,10 @@ where {where} order by bd.Date asc";
...
@@ -145,6 +145,10 @@ where {where} order by bd.Date asc";
{
{
where
+=
$@" and b.
{
nameof
(
RB_Teaching_BonusDetail
.
TeacherId
)}
=
{
demodel
.
TeacherId
}
"
;
where
+=
$@" and b.
{
nameof
(
RB_Teaching_BonusDetail
.
TeacherId
)}
=
{
demodel
.
TeacherId
}
"
;
}
}
if
(!
string
.
IsNullOrEmpty
(
demodel
.
TeacherIds
))
{
where
+=
$@" and b.
{
nameof
(
RB_Teaching_BonusDetail
.
TeacherId
)}
in(
{
demodel
.
TeacherIds
}
)"
;
}
if
(
demodel
.
ClassId
>
0
)
if
(
demodel
.
ClassId
>
0
)
{
{
where
+=
$@" and b.
{
nameof
(
RB_Teaching_BonusDetail
.
ClassId
)}
=
{
demodel
.
ClassId
}
"
;
where
+=
$@" and b.
{
nameof
(
RB_Teaching_BonusDetail
.
ClassId
)}
=
{
demodel
.
ClassId
}
"
;
...
@@ -190,6 +194,10 @@ where {where} order by b.TeacherId asc,b.Date asc";
...
@@ -190,6 +194,10 @@ where {where} order by b.TeacherId asc,b.Date asc";
{
{
where
+=
$@" and b.
{
nameof
(
RB_Teaching_BonusDetail
.
TeacherId
)}
=
{
demodel
.
TeacherId
}
"
;
where
+=
$@" and b.
{
nameof
(
RB_Teaching_BonusDetail
.
TeacherId
)}
=
{
demodel
.
TeacherId
}
"
;
}
}
if
(!
string
.
IsNullOrEmpty
(
demodel
.
TeacherIds
))
{
where
+=
$@" and b.
{
nameof
(
RB_Teaching_BonusDetail
.
TeacherId
)}
in(
{
demodel
.
TeacherIds
}
)"
;
}
if
(
demodel
.
ClassId
>
0
)
if
(
demodel
.
ClassId
>
0
)
{
{
where
+=
$@" and b.
{
nameof
(
RB_Teaching_BonusDetail
.
ClassId
)}
=
{
demodel
.
ClassId
}
"
;
where
+=
$@" and b.
{
nameof
(
RB_Teaching_BonusDetail
.
ClassId
)}
=
{
demodel
.
ClassId
}
"
;
...
...
Edu.WebApi/Controllers/Course/TeachingRewardsController.cs
View file @
d4086266
...
@@ -248,7 +248,7 @@ namespace Edu.WebApi.Controllers.Course
...
@@ -248,7 +248,7 @@ namespace Edu.WebApi.Controllers.Course
var
userInfo
=
base
.
UserInfo
;
var
userInfo
=
base
.
UserInfo
;
var
dmodel
=
JsonHelper
.
DeserializeObject
<
RB_Teaching_BonusDetail_ViewModel
>(
RequestParm
.
Msg
.
ToString
());
var
dmodel
=
JsonHelper
.
DeserializeObject
<
RB_Teaching_BonusDetail_ViewModel
>(
RequestParm
.
Msg
.
ToString
());
dmodel
.
Group_Id
=
userInfo
.
Group_Id
;
dmodel
.
Group_Id
=
userInfo
.
Group_Id
;
if
(
dmodel
.
BonusId
<=
0
&&
string
.
IsNullOrEmpty
(
dmodel
.
BonusIds
)
)
if
(
dmodel
.
BonusId
<=
0
)
{
{
return
ApiResult
.
ParamIsNull
(
"请传递教师奖励id"
);
return
ApiResult
.
ParamIsNull
(
"请传递教师奖励id"
);
}
}
...
...
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