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
094634d6
Commit
094634d6
authored
Sep 16, 2021
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
二次绩效审核中、审核通过的可分配绩效不在重新赋值
parent
0a00dad4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
performance/Performance.Services/SecondAllot/SecondAllotDetails.cs
+4
-1
performance/Performance.Services/SecondAllotService.cs
+4
-1
No files found.
performance/Performance.Services/SecondAllot/SecondAllotDetails.cs
View file @
094634d6
...
...
@@ -412,9 +412,12 @@ private void SupplementFixedData(ag_secondallot secondAllot, List<BodyItem> body
var
keyValue
=
new
Dictionary
<
string
,
string
>
{
{
"发放月份"
,
$"
{
secondAllot
.
Year
}
年
{
secondAllot
.
Month
.
ToString
().
PadLeft
(
2
,
'0'
)}
月"
},
{
"可分配绩效"
,
secondAllot
.
RealGiveFee
.
ToString
()
},
//
{ "可分配绩效", secondAllot.RealGiveFee.ToString() },
};
if
(
new
int
[]
{
1
,
4
}.
Contains
(
secondAllot
.
Status
??
0
))
keyValue
.
Add
(
"可分配绩效"
,
secondAllot
.
RealGiveFee
.
ToString
());
var
pairs
=
new
Dictionary
<
string
,
string
>
{
{
"职称绩效"
,
"年资职称绩效占比"
},
...
...
performance/Performance.Services/SecondAllotService.cs
View file @
094634d6
...
...
@@ -573,10 +573,13 @@ private void FillData(ag_secondallot second, List<BodyItem> bodyItems)
var
keyValue
=
new
Dictionary
<
string
,
string
>
{
{
"发放月份"
,
$"
{
second
.
Year
}
年
{
second
.
Month
.
ToString
().
PadLeft
(
2
,
'0'
)}
月"
},
{
"可分配绩效"
,
second
.
RealGiveFee
.
ToString
()},
//
{"可分配绩效", second.RealGiveFee.ToString()},
//{"主任基础绩效", account?.Avg?.ToString()}
};
if
(
new
int
[]
{
1
,
4
}.
Contains
(
second
.
Status
??
0
))
keyValue
.
Add
(
"可分配绩效"
,
second
.
RealGiveFee
.
ToString
());
//二次绩效配置 列头数据始终用最新分配结果
foreach
(
var
item
in
keyValue
)
{
...
...
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