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
2657f929
Commit
2657f929
authored
Feb 22, 2021
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
其他绩效文件上传补充核算单元
parent
1c2f87a7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
6 deletions
+21
-6
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
+20
-5
performance/Performance.Services/EmployeeService.cs
+1
-1
No files found.
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
View file @
2657f929
...
...
@@ -717,14 +717,14 @@
</summary>
</member>
<member
name=
"P:Performance.EntityModels.ag_othersource.Id"
>
<summary>
<summary>
</summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.ag_othersource.SecondId"
>
<summary>
<summary>
</summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.ag_othersource.WorkNumber"
>
<summary>
...
...
@@ -758,7 +758,7 @@
</member>
<member
name=
"P:Performance.EntityModels.ag_othersource.DeptReward"
>
<summary>
科室单项奖励
科室单项奖励
(只读)
</summary>
</member>
<member
name=
"P:Performance.EntityModels.ag_othersource.DistPerformance"
>
...
...
@@ -791,6 +791,21 @@
预留金额
</summary>
</member>
<member
name=
"P:Performance.EntityModels.ag_othersource.ManagementAllowance"
>
<summary>
管理津贴
</summary>
</member>
<member
name=
"P:Performance.EntityModels.ag_othersource.IndividualReward"
>
<summary>
单项奖励
</summary>
</member>
<member
name=
"P:Performance.EntityModels.ag_othersource.AllocationOfKeySpecialty"
>
<summary>
重点专科分配
</summary>
</member>
<member
name=
"T:Performance.EntityModels.ag_secondallot"
>
<summary>
二次绩效列表
...
...
performance/Performance.Services/EmployeeService.cs
View file @
2657f929
...
...
@@ -573,7 +573,7 @@ public void ImpoerAprEmployees(int allotid, string path, int userid)
throw
new
PerformanceException
(
"文件中存在“录入科室”为空的数据"
);
var
employees
=
peremployeeRepository
.
GetEntities
(
w
=>
w
.
AllotId
==
allotid
);
foreach
(
var
item
in
entities
.
Where
(
w
=>
!
string
.
IsNullOrEmpty
(
w
.
PersonnelNumber
)
&&
!
string
.
IsNullOrEmpty
(
w
.
AccountingUnit
)))
foreach
(
var
item
in
entities
.
Where
(
w
=>
!
string
.
IsNullOrEmpty
(
w
.
PersonnelNumber
)
&&
string
.
IsNullOrEmpty
(
w
.
AccountingUnit
)))
{
item
.
AccountingUnit
=
employees
?.
FirstOrDefault
(
w
=>
w
.
PersonnelNumber
==
item
.
PersonnelNumber
)?.
AccountingUnit
??
""
;
}
...
...
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