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
af1a99b8
Commit
af1a99b8
authored
Dec 23, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
793c4472
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
0 deletions
+25
-0
RB_Personnel_Bonus_Extend.cs
Edu.Model/ViewModel/Bonus/RB_Personnel_Bonus_Extend.cs
+5
-0
EmployeeBonusModule.cs
Edu.Module.Course/EmployeeBonusModule.cs
+12
-0
RB_Personnel_BonusRepository.cs
Edu.Repository/Bonus/RB_Personnel_BonusRepository.cs
+8
-0
No files found.
Edu.Model/ViewModel/Bonus/RB_Personnel_Bonus_Extend.cs
View file @
af1a99b8
...
...
@@ -34,5 +34,10 @@ namespace Edu.Model.ViewModel.Bonus
/// 查询员工编号
/// </summary>
public
string
QEmployeeIds
{
get
;
set
;
}
/// <summary>
/// 期数编号【查询使用】
/// </summary>
public
string
QPeriodIds
{
get
;
set
;
}
}
}
Edu.Module.Course/EmployeeBonusModule.cs
View file @
af1a99b8
...
...
@@ -72,6 +72,18 @@ namespace Edu.Module.Course
public
List
<
RB_Personnel_Period_Extend
>
GetPersonnelPeriodPageModule
(
int
pageIdex
,
int
pageSize
,
out
long
rowsCount
,
RB_Personnel_Period_Extend
query
)
{
var
list
=
personnel_PeriodRepository
.
GetPersonnelPeriodPageRepository
(
pageIdex
,
pageSize
,
out
rowsCount
,
query
);
if
(
list
!=
null
)
{
string
ids
=
string
.
Join
(
","
,
list
.
Select
(
qitem
=>
qitem
.
Id
));
var
bonusList
=
personnel_BonusRepository
.
GetPersonnelBonusListRepository
(
new
RB_Personnel_Bonus_Extend
()
{
QPeriodIds
=
ids
});
foreach
(
var
item
in
list
)
{
item
.
SumPrice
=
bonusList
?.
Where
(
qitem
=>
qitem
.
PeriodId
==
item
.
Id
)?.
Sum
(
qitem
=>
qitem
.
CurRewardMoney
)??
0
;
}
}
return
list
;
}
...
...
Edu.Repository/Bonus/RB_Personnel_BonusRepository.cs
View file @
af1a99b8
...
...
@@ -102,6 +102,14 @@ WHERE 1=1
{
builder
.
AppendFormat
(
" AND A.DeductionMoney<>A.FinishDeductionMoney "
);
}
if
(
query
.
PeriodId
>
0
)
{
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Personnel_Bonus_Extend
.
PeriodId
),
query
.
PeriodId
);
}
if
(!
string
.
IsNullOrEmpty
(
query
.
QPeriodIds
))
{
builder
.
AppendFormat
(
" AND A.{0} IN({1}) "
,
nameof
(
RB_Personnel_Bonus_Extend
.
PeriodId
),
query
.
QPeriodIds
);
}
}
var
list
=
Get
<
RB_Personnel_Bonus_Extend
>(
builder
.
ToString
()).
ToList
();
if
(
list
!=
null
&&
list
.
Count
>
0
)
...
...
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