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
9b9962ca
Commit
9b9962ca
authored
Dec 24, 2020
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
二次绩效自动补全数据时,去掉unittype验证
parent
c9334fe5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
performance/Performance.Services/Details/SecondAllotDetails.cs
+2
-2
performance/Performance.Services/SecondAllotService.cs
+3
-3
No files found.
performance/Performance.Services/Details/SecondAllotDetails.cs
View file @
9b9962ca
...
...
@@ -596,8 +596,8 @@ public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int is
/// <param name="isTitlePerformance">是否补全职称绩效</param>
private
void
SupplementSecondDetail
(
ag_secondallot
second
,
List
<
per_employee
>
employees
,
List
<
ag_othersource
>
result
,
bool
isTitlePerformance
=
true
)
{
if
(
employees
==
null
||
!
employees
.
Any
(
t
=>
t
.
UnitType
==
second
.
UnitType
))
return
;
//
if (employees == null || !employees.Any(t => t.UnitType == second.UnitType))
//
return;
// 补充医院其他绩效 及 预留比例
var
perapramounts
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
second
.
AllotId
&&
t
.
Status
==
3
);
Func
<
per_employee
,
decimal
?>
getAprAmount
=
(
t
)
=>
second
.
Department
==
t
.
AccountingUnit
?
perapramounts
...
...
performance/Performance.Services/SecondAllotService.cs
View file @
9b9962ca
...
...
@@ -394,7 +394,7 @@ private List<BodyItem> GetEmployees(List<per_employee> employees, ag_secondallot
var
list
=
new
List
<
BodyItem
>();
//var employees = personService.GetPersons(allotId, userId);
if
(
employees
==
null
||
!
employees
.
Any
(
t
=>
t
.
UnitType
==
unittype
))
return
list
;
//
if (employees == null || !employees.Any(t => t.UnitType == unittype)) return list;
var
hospital
=
hospitalRepository
.
GetEntity
(
t
=>
t
.
ID
==
employees
.
First
().
HospitalId
);
if
(
hospital
==
null
)
return
list
;
...
...
@@ -1610,8 +1610,8 @@ public List<ag_othersource> OtherAutoComplete(SecondEmpRequest request, int user
/// <param name="isTitlePerformance">是否补全职称绩效</param>
private
void
SupplementSecondDetail
(
ag_secondallot
second
,
List
<
per_employee
>
employees
,
List
<
ag_othersource
>
result
,
bool
isTitlePerformance
=
true
)
{
if
(
employees
==
null
||
!
employees
.
Any
(
t
=>
t
.
UnitType
==
second
.
UnitType
))
return
;
//
if (employees == null || !employees.Any(t => t.UnitType == second.UnitType))
//
return;
// 补充医院其他绩效 及 预留比例
var
perapramounts
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
second
.
AllotId
&&
t
.
Status
==
3
);
Func
<
per_employee
,
decimal
?>
getAprAmount
=
(
t
)
=>
second
.
Department
==
t
.
AccountingUnit
?
perapramounts
...
...
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