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
e1673a20
Commit
e1673a20
authored
Apr 02, 2021
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'hotfix/删除人员字典问题修复' into v2020morge-graphql
parents
e65694a9
cb4c72ec
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
performance/Performance.Repository/PerforCofdirectorRepository.cs
+0
-1
performance/Performance.Services/SecondAllotService.cs
+7
-7
No files found.
performance/Performance.Repository/PerforCofdirectorRepository.cs
View file @
e1673a20
...
...
@@ -29,7 +29,6 @@ public int DeleteData(int allotId)
"im_header"
,
"im_specialunit"
,
"log_check"
,
"per_employee"
,
"per_sheet"
,
"res_account"
,
"res_accountdoctor"
,
...
...
performance/Performance.Services/SecondAllotService.cs
View file @
e1673a20
...
...
@@ -1300,9 +1300,9 @@ bool method(decimal? submitDataAmount, decimal? realGiveFee)
if
(
data
==
null
||
!
data
.
Any
())
throw
new
PerformanceException
(
"提交时未检测到数据!"
);
var
total
=
data
.
Sum
(
t
=>
t
.
RealAmount
);
if
(!
method
(
total
,
second
.
RealGiveFee
))
throw
new
PerformanceException
(
"总金额与考核后金额不一致!"
);
//
var total = data.Sum(t => t.RealAmount);
//
if (!method(total, second.RealGiveFee))
//
throw new PerformanceException("总金额与考核后金额不一致!");
}
else
{
...
...
@@ -1310,10 +1310,10 @@ bool method(decimal? submitDataAmount, decimal? realGiveFee)
if
(
data
==
null
||
!
data
.
Any
())
throw
new
PerformanceException
(
"提交时未检测到数据!"
);
var
total
=
data
.
Where
(
t
=>
t
.
ItemName
==
"实发绩效工资金额"
&&
t
.
RowNumber
>
-
1
).
GroupBy
(
t
=>
t
.
RowNumber
)
.
Sum
(
t
=>
ConvertHelper
.
To
<
decimal
>(
t
.
OrderByDescending
(
o
=>
o
.
ID
).
FirstOrDefault
().
ItemValue
));
if
(!
method
(
total
,
second
.
RealGiveFee
))
throw
new
PerformanceException
(
"总金额与考核后金额不一致!"
);
//
var total = data.Where(t => t.ItemName == "实发绩效工资金额" && t.RowNumber > -1).GroupBy(t => t.RowNumber)
//
.Sum(t => ConvertHelper.To<decimal>(t.OrderByDescending(o => o.ID).FirstOrDefault().ItemValue));
//
if (!method(total, second.RealGiveFee))
//
throw new PerformanceException("总金额与考核后金额不一致!");
}
second
.
UseTempId
=
temp
.
UseTempId
;
second
.
Status
=
2
;
...
...
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