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
f91611c6
Commit
f91611c6
authored
3 years ago
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
课时费增加离职老师查询
parent
0f931b87
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
TeachingRewardsModule.cs
Edu.Module.Course/TeachingRewardsModule.cs
+4
-4
No files found.
Edu.Module.Course/TeachingRewardsModule.cs
View file @
f91611c6
...
...
@@ -344,7 +344,7 @@ namespace Edu.Module.Course
var
dlist
=
teaching_BonusDetailRepository
.
GetList
(
new
RB_Teaching_BonusDetail_ViewModel
()
{
Group_Id
=
dmodel
.
Group_Id
,
BonusIds
=
bonusIds
});
//获取所有的教师
string
teacherIds
=
string
.
Join
(
","
,
list
.
Select
(
x
=>
x
.
TeacherIds
));
var
tlist
=
teacherRepository
.
GetTeacherListRepository
(
new
RB_Teacher_ViewModel
()
{
Group_Id
=
dmodel
.
Group_Id
,
QTIds
=
teacherIds
});
var
tlist
=
teacherRepository
.
GetTeacherListRepository
(
new
RB_Teacher_ViewModel
()
{
Group_Id
=
dmodel
.
Group_Id
,
QTIds
=
teacherIds
,
IsQLeave
=
1
});
//查询财务单据
var
financeList
=
financeRepository
.
GetListSingle
(
new
RB_Finance_Extend
()
{
RB_Group_Id
=
dmodel
.
Group_Id
,
FinanceType
=
2
,
OtherType
=
26
,
ReFinanceIds
=
bonusIds
,
IsSelectNormal
=
1
});
foreach
(
var
item
in
list
)
...
...
@@ -533,7 +533,7 @@ namespace Edu.Module.Course
checkList
=
class_CheckRepository
.
GetClassCheckStatistics
(
new
RB_Class_Check_ViewModel
()
{
Group_Id
=
userInfo
.
Group_Id
,
Q_ClassIds
=
classIds
,
StartDate
=
StartTime
,
EndDate
=
EndTime
});
//查询教师列表
string
teacherIds
=
string
.
Join
(
","
,
plist
.
Select
(
x
=>
x
.
TeacherId
).
Distinct
());
teacherList
=
teacherRepository
.
GetTeacherListRepository
(
new
RB_Teacher_ViewModel
()
{
QTIds
=
teacherIds
});
teacherList
=
teacherRepository
.
GetTeacherListRepository
(
new
RB_Teacher_ViewModel
()
{
QTIds
=
teacherIds
,
IsQLeave
=
1
});
//根据学生签到表 查询
var
list
=
class_CheckRepository
.
GetTeacherConsumptionHoursDetialList
(
teacherIds
,
-
1
,
0
,
StartTime
,
EndTime
,
userInfo
.
Group_Id
);
...
...
@@ -940,7 +940,7 @@ namespace Edu.Module.Course
checkList
=
class_CheckRepository
.
GetClassCheckStatistics
(
new
RB_Class_Check_ViewModel
()
{
Group_Id
=
userInfo
.
Group_Id
,
Q_ClassIds
=
classIds
,
StartDate
=
StartTime
,
EndDate
=
EndTime
});
//查询教师列表
string
teacherIds
=
string
.
Join
(
","
,
plist
.
Select
(
x
=>
x
.
TeacherId
).
Distinct
());
teacherList
=
teacherRepository
.
GetTeacherListRepository
(
new
RB_Teacher_ViewModel
()
{
QTIds
=
teacherIds
});
teacherList
=
teacherRepository
.
GetTeacherListRepository
(
new
RB_Teacher_ViewModel
()
{
QTIds
=
teacherIds
,
IsQLeave
=
1
});
//根据学生签到表 查询
var
list
=
class_CheckRepository
.
GetTeacherConsumptionHoursDetialList
(
teacherIds
,
-
1
,
0
,
StartTime
,
EndTime
,
userInfo
.
Group_Id
);
...
...
@@ -1902,7 +1902,7 @@ namespace Edu.Module.Course
var
dlist
=
teaching_BonusDetailRepository
.
GetList
(
new
RB_Teaching_BonusDetail_ViewModel
()
{
Group_Id
=
userInfo
.
Group_Id
,
BonusIds
=
bonusIds
});
//获取所有的教师
string
teacherIds
=
model
.
TeacherIds
;
var
tlist
=
teacherRepository
.
GetTeacherListRepository
(
new
RB_Teacher_ViewModel
()
{
Group_Id
=
userInfo
.
Group_Id
,
QTIds
=
teacherIds
});
var
tlist
=
teacherRepository
.
GetTeacherListRepository
(
new
RB_Teacher_ViewModel
()
{
Group_Id
=
userInfo
.
Group_Id
,
QTIds
=
teacherIds
,
IsQLeave
=
1
});
string
[]
teacherIdArr
=
model
.
TeacherIds
.
Split
(
","
);
List
<
object
>
RList
=
new
List
<
object
>();
...
...
This diff is collapsed.
Click to expand it.
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