Commit 094634d6 by lcx

二次绩效审核中、审核通过的可分配绩效不在重新赋值

parent 0a00dad4
...@@ -412,9 +412,12 @@ private void SupplementFixedData(ag_secondallot secondAllot, List<BodyItem> body ...@@ -412,9 +412,12 @@ private void SupplementFixedData(ag_secondallot secondAllot, List<BodyItem> body
var keyValue = new Dictionary<string, string> var keyValue = new Dictionary<string, string>
{ {
{ "发放月份", $"{secondAllot.Year}{secondAllot.Month.ToString().PadLeft(2, '0')}月" }, { "发放月份", $"{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> var pairs = new Dictionary<string, string>
{ {
{ "职称绩效", "年资职称绩效占比" }, { "职称绩效", "年资职称绩效占比" },
......
...@@ -573,10 +573,13 @@ private void FillData(ag_secondallot second, List<BodyItem> bodyItems) ...@@ -573,10 +573,13 @@ private void FillData(ag_secondallot second, List<BodyItem> bodyItems)
var keyValue = new Dictionary<string, string> var keyValue = new Dictionary<string, string>
{ {
{"发放月份", $"{second.Year}{second.Month.ToString().PadLeft(2, '0')}月"}, {"发放月份", $"{second.Year}{second.Month.ToString().PadLeft(2, '0')}月"},
{"可分配绩效", second.RealGiveFee.ToString()}, //{"可分配绩效", second.RealGiveFee.ToString()},
//{"主任基础绩效", account?.Avg?.ToString()} //{"主任基础绩效", account?.Avg?.ToString()}
}; };
if (new int[] { 1, 4 }.Contains(second.Status ?? 0))
keyValue.Add("可分配绩效", second.RealGiveFee.ToString());
//二次绩效配置 列头数据始终用最新分配结果 //二次绩效配置 列头数据始终用最新分配结果
foreach (var item in keyValue) foreach (var item in keyValue)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment