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
bf6223a2
Commit
bf6223a2
authored
Oct 25, 2023
by
ruyun.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
二次分配工作量单项自动带出
parent
0149b627
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
13 deletions
+2
-13
performance/Performance.Services/RedistributionService.cs
+2
-13
No files found.
performance/Performance.Services/RedistributionService.cs
View file @
bf6223a2
...
...
@@ -426,21 +426,10 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
var
dict
=
JsonHelper
.
Deserialize
<
Dictionary
<
string
,
object
>>(
JsonHelper
.
Serialize
(
employee
));
foreach
(
var
workitem
in
workloads
)
{
decimal
?
value
;
if
(
workitem
.
ItemId
.
StartsWithIgnoreCase
(
$"SingleAwards_"
))
{
/* 如果是已保存数据,则加载原始数据,否则加载工作量自动带出 */
value
=
isSave
/* 如果是已保存数据,则加载原始数据,否则加载工作量自动带出 */
decimal
?
value
=
isSave
&&
overrideMode
!=
EmployeeSource
.
Workload
?
bodyDynamic
?.
FirstOrDefault
(
w
=>
w
.
BodyId
==
employee
.
Id
&&
w
.
WorkloadId
==
workitem
.
Id
)?.
Value
:
secondWorkload
.
FirstOrDefault
(
w
=>
w
.
PersonnelNumber
==
employee
.
WorkNumber
&&
workitem
.
ItemId
.
EqualsIgnoreCase
(
w
.
ItemId
))?.
Value
;
}
else
{
/* 如果是已保存数据,则加载原始数据,否则加载工作量自动带出 */
value
=
isSave
&&
overrideMode
!=
EmployeeSource
.
Workload
?
bodyDynamic
?.
FirstOrDefault
(
w
=>
w
.
BodyId
==
employee
.
Id
&&
w
.
WorkloadId
==
workitem
.
Id
)?.
Value
:
secondWorkload
.
FirstOrDefault
(
w
=>
w
.
PersonnelNumber
==
employee
.
WorkNumber
&&
workitem
.
ItemId
.
EqualsIgnoreCase
(
w
.
ItemId
))?.
Value
;
}
dict
.
AddOrUpdate
(
workitem
.
ItemId
,
value
);
}
result
.
Add
(
dict
);
...
...
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