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
96ce4829
Commit
96ce4829
authored
Dec 28, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增字段
parent
61b20c68
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
RB_Personnel_Bonus.cs
Edu.Model/Entity/Bonus/RB_Personnel_Bonus.cs
+5
-0
EmployeeBonusModule.cs
Edu.Module.Course/EmployeeBonusModule.cs
+3
-3
No files found.
Edu.Model/Entity/Bonus/RB_Personnel_Bonus.cs
View file @
96ce4829
...
@@ -133,5 +133,10 @@ namespace Edu.Model.Entity.Bonus
...
@@ -133,5 +133,10 @@ namespace Edu.Model.Entity.Bonus
/// 线索条数
/// 线索条数
/// </summary>
/// </summary>
public
int
ClueNum
{
get
;
set
;
}
public
int
ClueNum
{
get
;
set
;
}
/// <summary>
/// 是否发放人头奖励[1-已发放,0-待发放]
/// </summary>
public
int
IsIssue
{
get
;
set
;
}
}
}
}
}
Edu.Module.Course/EmployeeBonusModule.cs
View file @
96ce4829
...
@@ -381,8 +381,9 @@ namespace Edu.Module.Course
...
@@ -381,8 +381,9 @@ namespace Edu.Module.Course
UpdateTime
=
DateTime
.
Now
,
UpdateTime
=
DateTime
.
Now
,
DeductionMoney
=
DeductionMoney
,
DeductionMoney
=
DeductionMoney
,
OpenBonus
=
curNum
>
0
?
item
.
OpenBonus
:
0
,
OpenBonus
=
curNum
>
0
?
item
.
OpenBonus
:
0
,
ClueNum
=
stuModel
?.
ClueCount
??
0
,
ClueNum
=
stuModel
?.
ClueCount
??
0
,
ClueNumSalary
=
stuModel
?.
ClueCount
>
5
?
item
.
ClueNumSalary
:
0
ClueNumSalary
=
stuModel
?.
ClueCount
>
5
?
item
.
ClueNumSalary
:
0
,
IsIssue
=
0
};
};
pModel
.
IsReach
=
pModel
.
CurOrderMoney
>
item
.
MonthGoalMoney
?
1
:
0
;
pModel
.
IsReach
=
pModel
.
CurOrderMoney
>
item
.
MonthGoalMoney
?
1
:
0
;
...
@@ -712,7 +713,6 @@ namespace Edu.Module.Course
...
@@ -712,7 +713,6 @@ namespace Edu.Module.Course
private
EmpStaticItem
GetYearDataModule
(
UserInfo
user
,
int
Year
)
private
EmpStaticItem
GetYearDataModule
(
UserInfo
user
,
int
Year
)
{
{
int
CurrentYear
=
DateTime
.
Now
.
Year
;
int
CurrentYear
=
DateTime
.
Now
.
Year
;
int
CurrentMonth
=
DateTime
.
Now
.
Month
;
EmpStaticItem
yearData
=
new
EmpStaticItem
();
EmpStaticItem
yearData
=
new
EmpStaticItem
();
var
list
=
personnel_BonusRepository
.
GetPersonnelBonusListRepository
(
new
RB_Personnel_Bonus_Extend
()
var
list
=
personnel_BonusRepository
.
GetPersonnelBonusListRepository
(
new
RB_Personnel_Bonus_Extend
()
{
{
...
...
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