计算结果BUG修复

parent de8be591
...@@ -659,12 +659,14 @@ public void ResultCompute(ComputeMode computeMode, Dictionary<string, object> he ...@@ -659,12 +659,14 @@ public void ResultCompute(ComputeMode computeMode, Dictionary<string, object> he
deptRewardCalculate(rows); deptRewardCalculate(rows);
// 计算顶部相关总和 // 计算顶部相关总和
overviewCalculate(head, rows); overviewCalculate(head, rows);
// 行内主任基础绩效
basisPerformanceCalculate(head, rows, specialPostName);
// 计算顶部相关总和(重算一遍,为了保证减去 主任基础绩效)
overviewCalculate(head, rows);
// 计算顶部工作量 // 计算顶部工作量
topWorkloadCalculate(head, workloadGroups); topWorkloadCalculate(head, workloadGroups);
// 计算顶部年资系数 // 计算顶部年资系数
topSeniorityCalculate(head); topSeniorityCalculate(head);
// 行内主任基础绩效
basisPerformanceCalculate(head, rows, specialPostName);
// 行内职称绩效计算 // 行内职称绩效计算
titleCoefficientCalculate(head, rows, specialPostName); titleCoefficientCalculate(head, rows, specialPostName);
// 行内工作量分组计算 // 行内工作量分组计算
...@@ -689,9 +691,6 @@ public void RedistributionCompute(ComputeMode computeMode, Dictionary<string, ob ...@@ -689,9 +691,6 @@ public void RedistributionCompute(ComputeMode computeMode, Dictionary<string, ob
otherPerformance(head, rows); otherPerformance(head, rows);
// 重算行内实发绩效 // 重算行内实发绩效
realAmountCalculate(rows); realAmountCalculate(rows);
// 重算顶部工作量
if (computeMode != ComputeMode.NotCalculate)
overviewCalculate(head, rows);
} }
/// <summary> /// <summary>
......
...@@ -489,7 +489,7 @@ public void SaveSecondAllotHeadData(int secondId, string json) ...@@ -489,7 +489,7 @@ public void SaveSecondAllotHeadData(int secondId, string json)
if (exist != null) if (exist != null)
agheadsourceRepository.Remove(exist); agheadsourceRepository.Remove(exist);
headsource.SecondId = exist.SecondId; headsource.SecondId = secondId;
agheadsourceRepository.Add(headsource); agheadsourceRepository.Add(headsource);
string[] prefix = new string[] { "Workload_Ratio_", "Workload_Amount_" }; string[] prefix = new string[] { "Workload_Ratio_", "Workload_Amount_" };
......
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