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
c53339fb
Commit
c53339fb
authored
Oct 27, 2021
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
个人绩效查询明细调整
parent
5971bbc3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
performance/Performance.EntityModels/Other/view_allot_result.cs
+1
-0
performance/Performance.Services/AllotService.cs
+1
-0
performance/Performance.Services/ComputeService.cs
+1
-4
No files found.
performance/Performance.EntityModels/Other/view_allot_result.cs
View file @
c53339fb
...
@@ -9,6 +9,7 @@ public class view_allot_result
...
@@ -9,6 +9,7 @@ public class view_allot_result
/// 来源
/// 来源
/// </summary>
/// </summary>
public
string
Source
{
get
;
set
;
}
public
string
Source
{
get
;
set
;
}
public
string
SourceItem
{
get
;
set
;
}
public
int
AllotId
{
get
;
set
;
}
public
int
AllotId
{
get
;
set
;
}
public
int
States
{
get
;
set
;
}
public
int
States
{
get
;
set
;
}
public
int
?
SecondId
{
get
;
set
;
}
public
int
?
SecondId
{
get
;
set
;
}
...
...
performance/Performance.Services/AllotService.cs
View file @
c53339fb
...
@@ -712,6 +712,7 @@ public List<OwnerPerformanceDto> GetOwnerPerformance(int userid)
...
@@ -712,6 +712,7 @@ public List<OwnerPerformanceDto> GetOwnerPerformance(int userid)
.
Select
(
detial
=>
.
Select
(
detial
=>
{
{
var
dto
=
Mapper
.
Map
<
OwnerPerformanceDto
>(
detial
);
var
dto
=
Mapper
.
Map
<
OwnerPerformanceDto
>(
detial
);
dto
.
Source
=
string
.
IsNullOrEmpty
(
detial
.
SourceItem
)
?
detial
.
Source
:
$"
{
detial
.
Source
}
-
{
detial
.
SourceItem
}
"
;
// 应发绩效
// 应发绩效
dto
.
ShouldGiveFee
=
Math
.
Round
((
dto
.
RealPerformance
??
0
)
+
(
dto
.
OtherPerfor
??
0
)
+
(
dto
.
HideOtherPerfor
??
0
)
+
(
dto
.
NightWorkPerfor
??
0
),
2
,
MidpointRounding
.
AwayFromZero
);
dto
.
ShouldGiveFee
=
Math
.
Round
((
dto
.
RealPerformance
??
0
)
+
(
dto
.
OtherPerfor
??
0
)
+
(
dto
.
HideOtherPerfor
??
0
)
+
(
dto
.
NightWorkPerfor
??
0
),
2
,
MidpointRounding
.
AwayFromZero
);
dto
.
ReservedRatio
=
employees
?.
FirstOrDefault
(
emp
=>
emp
.
AllotId
==
dto
.
AllotId
&&
emp
.
PersonnelNumber
==
jobNumber
)?.
ReservedRatio
??
0
;
// 预留比例
dto
.
ReservedRatio
=
employees
?.
FirstOrDefault
(
emp
=>
emp
.
AllotId
==
dto
.
AllotId
&&
emp
.
PersonnelNumber
==
jobNumber
)?.
ReservedRatio
??
0
;
// 预留比例
...
...
performance/Performance.Services/ComputeService.cs
View file @
c53339fb
...
@@ -491,9 +491,6 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
...
@@ -491,9 +491,6 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
{
{
if
(
isShowManage
==
2
)
if
(
isShowManage
==
2
)
{
{
var
employee
=
clinicalEmployees
.
FirstOrDefault
(
e
=>
e
.
PersonnelNumber
==
t
.
JobNumber
&&
e
.
AccountingUnit
==
t
.
AccountingUnit
);
var
scoreAverageRate
=
t
.
ScoreAverageRate
??
employee
.
ScoreAverageRate
??
1
;
var
attendance
=
t
.
Attendance
??
employee
.
Attendance
??
0
;
t
.
RealGiveFee
=
Math
.
Round
(
t
.
AssessLaterManagementFee
*
(
t
.
Adjust
??
1
m
)
+
(
t
.
AdjustLaterOtherFee
??
0
)
??
0
,
2
);
t
.
RealGiveFee
=
Math
.
Round
(
t
.
AssessLaterManagementFee
*
(
t
.
Adjust
??
1
m
)
+
(
t
.
AdjustLaterOtherFee
??
0
)
??
0
,
2
);
}
}
});
});
...
@@ -602,7 +599,7 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
...
@@ -602,7 +599,7 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
AdjustFactor
=
t
.
FirstOrDefault
()?.
Adjust
??
1
,
AdjustFactor
=
t
.
FirstOrDefault
()?.
Adjust
??
1
,
AdjustLaterOtherFee
=
t
.
Sum
(
w
=>
w
.
AdjustLaterOtherFee
),
AdjustLaterOtherFee
=
t
.
Sum
(
w
=>
w
.
AdjustLaterOtherFee
),
RealGiveFee
=
t
.
Sum
(
w
=>
Math
.
Round
((
w
.
GiveFee
*
w
.
Adjust
+
w
.
AdjustLaterOtherFee
)
??
0
,
MidpointRounding
.
AwayFromZero
)),
RealGiveFee
=
t
.
Sum
(
w
=>
Math
.
Round
((
w
.
GiveFee
*
w
.
Adjust
+
w
.
AdjustLaterOtherFee
)
??
0
,
MidpointRounding
.
AwayFromZero
)),
AssessLaterManagementFee
=
0
,
AssessLaterManagementFee
=
0
,
});
;
});
;
result
.
AddRange
(
officeResult
);
result
.
AddRange
(
officeResult
);
#
endregion
#
endregion
...
...
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