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
a70ece24
Commit
a70ece24
authored
Jan 20, 2021
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG修复
parent
e1f5161f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletions
+4
-1
performance/Performance.Api/Controllers/AllotController.cs
+1
-1
performance/Performance.Services/AllotService.cs
+1
-0
performance/Performance.Services/ComputeService.cs
+2
-0
No files found.
performance/Performance.Api/Controllers/AllotController.cs
View file @
a70ece24
...
...
@@ -220,7 +220,7 @@ public ApiResponse Generate([CustomizeValidator(RuleSet = "Delete"), FromBody] A
[
HttpPost
]
public
ApiResponse
Recalculation
([
FromBody
]
RecalculationRequest
request
)
{
if
(
request
.
Money
.
HasValue
&&
request
.
Money
.
Value
>
0
)
if
(
request
.
Money
.
HasValue
)
_allotService
.
Recalculation
(
request
.
AllotId
,
request
.
Money
.
Value
);
return
new
ApiResponse
(
ResponseType
.
OK
);
}
...
...
performance/Performance.Services/AllotService.cs
View file @
a70ece24
...
...
@@ -481,6 +481,7 @@ public void Recalculation(int allotId, decimal money)
if
(
computResult
==
null
)
return
;
baiscnormList
=
baiscNormService
.
ComputeOtherAvg
(
baiscnormList
,
computResult
,
empolyeeList
);
baiscnormList
.
ForEach
(
t
=>
t
.
AllotID
=
allot
.
ID
);
var
historyRescompute
=
_perforRescomputeRepository
.
GetEntities
(
w
=>
w
.
AllotID
==
allotId
&&
w
.
AccountType
==
AccountUnitType
.
行政高层
.
ToString
());
if
(
historyRescompute
!=
null
&&
historyRescompute
.
Any
())
...
...
performance/Performance.Services/ComputeService.cs
View file @
a70ece24
...
...
@@ -821,6 +821,8 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
private
decimal
?
GetFactors
(
List
<
per_sheet
>
persheet
,
List
<
im_data
>
basicData
,
UnitType
type
,
SheetType
sheetType
)
{
var
sheet
=
persheet
.
FirstOrDefault
(
w
=>
w
.
SheetType
==
(
int
)
sheetType
);
if
(
sheet
==
null
)
return
null
;
return
basicData
.
FirstOrDefault
(
t
=>
t
.
SheetID
==
sheet
.
ID
&&
t
.
UnitType
==
(
int
)
type
&&
t
.
IsTotal
==
1
)?.
CellValue
;
}
...
...
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