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
ef3334f6
Commit
ef3334f6
authored
Jul 19, 2021
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'hotfix/二次分配打印多工作量职称显示错误问题' into develop
parents
919bd101
238d8d73
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
performance/Performance.Services/SecondAllotService.cs
+2
-2
No files found.
performance/Performance.Services/SecondAllotService.cs
View file @
ef3334f6
...
@@ -1788,7 +1788,7 @@ public bool ConfirmAudit(int userId, SecondAuditRequest request)
...
@@ -1788,7 +1788,7 @@ public bool ConfirmAudit(int userId, SecondAuditRequest request)
SecondId
=
second
.
Id
,
SecondId
=
second
.
Id
,
UnitType
=
second
.
UnitType
,
UnitType
=
second
.
UnitType
,
Department
=
second
.
Department
,
Department
=
second
.
Department
,
WorkPost
=
item
.
Post
,
WorkPost
=
item
.
JobTitle
,
JobNumber
=
item
.
WorkNumber
,
JobNumber
=
item
.
WorkNumber
,
PersonName
=
item
.
Name
,
PersonName
=
item
.
Name
,
PerforSumFee
=
item
.
DistPerformance
,
PerforSumFee
=
item
.
DistPerformance
,
...
@@ -2232,7 +2232,7 @@ public dynamic Print(int secondId)
...
@@ -2232,7 +2232,7 @@ public dynamic Print(int secondId)
PersonName
=
w
.
Name
,
PersonName
=
w
.
Name
,
Department
=
w
.
Department
,
Department
=
w
.
Department
,
RealAmount
=
w
.
RealAmount
,
RealAmount
=
w
.
RealAmount
,
WorkPost
=
w
.
Post
,
WorkPost
=
w
.
JobTitle
,
TitlePerfor
=
w
.
TitlePerformance
,
TitlePerfor
=
w
.
TitlePerformance
,
WorkPerformance
=
bodyDynamic
?.
Where
(
b
=>
b
.
BodyId
==
w
.
Id
&&
b
.
ItemId
.
StartsWith
(
"WorkPerformance_"
)).
Sum
(
b
=>
b
.
Value
)
??
0
,
WorkPerformance
=
bodyDynamic
?.
Where
(
b
=>
b
.
BodyId
==
w
.
Id
&&
b
.
ItemId
.
StartsWith
(
"WorkPerformance_"
)).
Sum
(
b
=>
b
.
Value
)
??
0
,
DeptReward
=
w
.
DeptReward
,
DeptReward
=
w
.
DeptReward
,
...
...
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