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
f1a8ae87
Commit
f1a8ae87
authored
Oct 12, 2020
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
其他收入BUG修复
parent
066aac5f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
3 deletions
+18
-3
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
+15
-0
performance/Performance.Services/AllotCompute/ResultComputeService.cs
+3
-3
No files found.
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
View file @
f1a8ae87
...
...
@@ -2742,6 +2742,21 @@
备注
</summary>
</member>
<member
name=
"P:Performance.DtoModels.DeptResponse.AssessBeforeOtherFee"
>
<summary>
考核前其他绩效
</summary>
</member>
<member
name=
"P:Performance.DtoModels.DeptResponse.AssessLaterOtherFee"
>
<summary>
考核后其他绩效
</summary>
</member>
<member
name=
"P:Performance.DtoModels.DeptResponse.AdjustLaterOtherFee"
>
<summary>
调节后其他绩效
</summary>
</member>
<member
name=
"P:Performance.DtoModels.DirectorResponse.TypeName"
>
<summary>
绩效类型
...
...
performance/Performance.Services/AllotCompute/ResultComputeService.cs
View file @
f1a8ae87
...
...
@@ -202,9 +202,9 @@ public class ResultComputeService : IAutoInjection
MaterialsExtra
=
(
materialsExtra
??
0
),
Adjust
=
isBudget
?
adjust
:
(
dept
?.
AdjustFactor
??
1
),
AssessBeforeOtherFee
=
dept
.
AssessBeforeOtherFee
??
0
,
AssessLaterOtherFee
=
dept
.
AssessLaterOtherFee
??
0
,
AdjustLaterOtherFee
=
dept
.
AdjustLaterOtherFee
??
0
,
AssessBeforeOtherFee
=
dept
?
.
AssessBeforeOtherFee
??
0
,
AssessLaterOtherFee
=
dept
?
.
AssessLaterOtherFee
??
0
,
AdjustLaterOtherFee
=
dept
?
.
AdjustLaterOtherFee
??
0
,
};
res
.
PerforTotal
=
(
sumValue
??
0
)
+
res
.
AssessBeforeOtherFee
;
res
.
GiveFee
=
Math
.
Round
(
res
.
PerforTotal
+
res
.
AssessLaterOtherFee
??
0
);
...
...
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