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
8070070d
Commit
8070070d
authored
Mar 12, 2021
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
二次绩效其他列表接口异常,获取人员时人员数据为null
parent
06b5675c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
1 deletions
+21
-1
performance/Performance.Api/wwwroot/Performance.Api.xml
+15
-0
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
+5
-0
performance/Performance.Services/Details/SecondAllotDetails.cs
+1
-1
No files found.
performance/Performance.Api/wwwroot/Performance.Api.xml
View file @
8070070d
...
...
@@ -600,6 +600,21 @@
<param
name=
"request"
></param>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.ConfigController.GetHrpDeptHands(System.Int32,System.Int32)"
>
<summary>
获取HRP人员科室
</summary>
<param
name=
"hospitalId"
></param>
<param
name=
"allotId"
></param>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.ConfigController.SaveHrpDept(System.Int32,System.Int32,Performance.DtoModels.SaveCollectData)"
>
<summary>
保存HRP人员科室
</summary>
<param
name=
""
></param>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.EmployeeController.GetEmployeeList(Performance.DtoModels.EmployeeRequest)"
>
<summary>
获取人员列表
...
...
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
View file @
8070070d
...
...
@@ -988,6 +988,11 @@
护理部审核状态 2 等待审核 3 审核通过 4 驳回
</summary>
</member>
<member
name=
"P:Performance.EntityModels.ag_secondallot.NightShiftWorkPerforFee"
>
<summary>
夜班绩效
</summary>
</member>
<member
name=
"T:Performance.EntityModels.ag_temp"
>
<summary>
二次绩效模板
...
...
performance/Performance.Services/Details/SecondAllotDetails.cs
View file @
8070070d
...
...
@@ -863,7 +863,7 @@ private void SupplementSecondDetail(ag_secondallot second, List<per_employee> em
foreach
(
var
item
in
groupData
)
{
if
(
employees
.
Any
(
t
=>
t
.
PersonnelNumber
==
item
.
WorkNumber
)
if
(
employees
!=
null
&&
employees
.
Any
(
t
=>
t
.
PersonnelNumber
==
item
.
WorkNumber
)
&&
employees
.
FirstOrDefault
(
t
=>
t
.
PersonnelNumber
==
item
.
WorkNumber
)
is
per_employee
employee
&&
employee
.
UnitType
==
second
.
UnitType
)
{
...
...
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