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
135e22c5
Commit
135e22c5
authored
Nov 10, 2020
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
允许业务中层空测试
parent
9893add7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletions
+2
-1
performance/Performance.Services/AllotCompute/BaiscNormService.cs
+1
-1
performance/Performance.Services/PerExcelService/ComputeEmpolyee/ComputeDirector.cs
+1
-0
No files found.
performance/Performance.Services/AllotCompute/BaiscNormService.cs
View file @
135e22c5
...
...
@@ -30,7 +30,7 @@ public List<res_baiscnorm> ComputeAvg(List<res_baiscnorm> baiscnormList, List<Co
};
foreach
(
var
item
in
keyList
)
{
var
count
=
computeEmployees
.
Where
(
t
=>
t
.
UnitType
==
item
.
UnitType
.
ToString
()).
Sum
(
t
=>
t
.
Basics
)
;
var
count
=
computeEmployees
?.
Where
(
t
=>
t
.
UnitType
==
item
.
UnitType
.
ToString
()).
Sum
(
t
=>
t
.
Basics
)
??
0
;
var
dataList
=
computes
.
Where
(
t
=>
t
.
UnitType
==
item
.
UnitType
.
ToString
());
var
baiscnorm
=
new
res_baiscnorm
{
...
...
performance/Performance.Services/PerExcelService/ComputeEmpolyee/ComputeDirector.cs
View file @
135e22c5
...
...
@@ -300,6 +300,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
dataList
.
AddRange
(
AutoMapper
.
Mapper
.
Map
<
List
<
res_account
>>(
account
.
PerData
.
Select
(
t
=>
(
PerDataAccountBaisc
)
t
)));
}
List
<
ComputeResult
>
computeList
=
new
List
<
ComputeResult
>();
if
(
empolyeeList
==
null
)
return
computeList
;
var
isBudget
=
budgetService
.
GetAdjustAndGrant
(
allot
,
out
decimal
adjust
,
out
decimal
grant
);
...
...
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