Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
performance
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zry
performance
Commits
9bde245c
Commit
9bde245c
authored
Oct 12, 2020
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
二次分配依据录入数据后优先使用录入
parent
f42f79e5
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
performance/Performance.Services/SecondAllotService.cs
+5
-2
No files found.
performance/Performance.Services/SecondAllotService.cs
View file @
9bde245c
...
...
@@ -1509,7 +1509,8 @@ public List<ag_othersource> OtherList(int secondId, int userId)
WorkPost
=
t
.
JobTitle
,
}).
ToList
();
}
SupplementSecondDetail
(
second
,
employees
,
result
);
var
isSupplementTitlePerformance
=
otherSecondList
==
null
||
!
otherSecondList
.
Any
();
SupplementSecondDetail
(
second
,
employees
,
result
,
isSupplementTitlePerformance
);
return
result
;
}
...
...
@@ -1568,7 +1569,8 @@ public List<ag_othersource> OtherAutoComplete(SecondEmpRequest request, int user
/// <param name="second"></param>
/// <param name="employees"></param>
/// <param name="result"></param>
private
void
SupplementSecondDetail
(
ag_secondallot
second
,
List
<
per_employee
>
employees
,
List
<
ag_othersource
>
result
)
/// <param name="isTitlePerformance">是否补全职称绩效</param>
private
void
SupplementSecondDetail
(
ag_secondallot
second
,
List
<
per_employee
>
employees
,
List
<
ag_othersource
>
result
,
bool
isTitlePerformance
=
true
)
{
// 补充医院其他绩效 及 预留比例
var
perapramounts
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
second
.
AllotId
);
...
...
@@ -1590,6 +1592,7 @@ private void SupplementSecondDetail(ag_secondallot second, List<per_employee> em
{
item
.
ReservedRatio
=
empl
.
ReservedRatio
;
item
.
OtherPerformance
=
getAprAmount
(
empl
);
if
(
isTitlePerformance
)
item
.
TitlePerformance
=
getDistPerformance
(
empl
);
}
}
...
...
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