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
efc41e64
Commit
efc41e64
authored
Oct 09, 2020
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
岗位系数空计算null值BUG修复
parent
87e757fc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
5 deletions
+18
-5
performance/Performance.DtoModels/Response/DeptResponse.cs
+13
-0
performance/Performance.Services/PerExcelService/ComputeEmpolyee/ComputeDirector.cs
+5
-5
No files found.
performance/Performance.DtoModels/Response/DeptResponse.cs
View file @
efc41e64
...
@@ -147,5 +147,18 @@ public class DeptResponse
...
@@ -147,5 +147,18 @@ public class DeptResponse
/// 备注
/// 备注
/// </summary>
/// </summary>
public
string
Remark
{
get
;
set
;
}
public
string
Remark
{
get
;
set
;
}
/// <summary>
/// 考核前其他绩效
/// </summary>
public
Nullable
<
decimal
>
AssessBeforeOtherFee
{
get
;
set
;
}
/// <summary>
/// 考核后其他绩效
/// </summary>
public
Nullable
<
decimal
>
AssessLaterOtherFee
{
get
;
set
;
}
/// <summary>
/// 调节后其他绩效
/// </summary>
public
Nullable
<
decimal
>
AdjustLaterOtherFee
{
get
;
set
;
}
}
}
}
}
performance/Performance.Services/PerExcelService/ComputeEmpolyee/ComputeDirector.cs
View file @
efc41e64
...
@@ -464,13 +464,13 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, per_allot
...
@@ -464,13 +464,13 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, per_allot
AccountingUnit
=
item
.
AccountingUnit
,
AccountingUnit
=
item
.
AccountingUnit
,
EmployeeName
=
item
.
DoctorName
,
EmployeeName
=
item
.
DoctorName
,
FitPeople
=
item
.
FitPeople
,
FitPeople
=
item
.
FitPeople
,
FitPeopleRatio
=
item
.
FitPeopleRatio
,
FitPeopleRatio
=
item
.
FitPeopleRatio
??
0
,
FitPeopleValue
=
item
.
FitPeopleValue
,
FitPeopleValue
=
item
.
FitPeopleValue
??
0
,
Grant
=
isBudget
?
grant
:
(
item
.
Management
??
1
),
Grant
=
isBudget
?
grant
:
(
item
.
Management
??
1
),
//WorkTime = item.WorkTime,
//WorkTime = item.WorkTime,
PostCoefficient
=
item
.
PostCoefficient
,
PostCoefficient
=
item
.
PostCoefficient
??
0
,
Attendance
=
item
.
Attendance
,
Attendance
=
item
.
Attendance
??
0
,
ScoreAverageRate
=
item
.
ScoreAverageRate
,
ScoreAverageRate
=
item
.
ScoreAverageRate
??
0
,
Punishment
=
extra
??
0
,
Punishment
=
extra
??
0
,
OtherPerfor
=
item
.
OtherPerfor
??
0
,
OtherPerfor
=
item
.
OtherPerfor
??
0
,
JobTitle
=
item
.
JobTitle
,
JobTitle
=
item
.
JobTitle
,
...
...
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