Merge branch 'v2020calculate' into v2020morge

performance/Performance.Api/Controllers/ComputeController.cs

@@ -223,11 +223,6 @@ public ApiResponse AllComputeAvg([FromBody] ComputerRequest request)
             }
 
             //List<res_baiscnorm> avgs = new List<res_baiscnorm>();
-
-
-            //var gc = list.Where(w => w.UnitType != UnitType.行政高层.ToString());
-
-
             //avgs.Add(new res_baiscnorm
             //{
             //    PositionName = "不含行政高层人均绩效",

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -255,7 +255,6 @@ public class ResultComputeService : IAutoInjection
                         Scale = sumValue * (empolyee.Scale ?? 0),
                     };
 
-
                     compute.Avg = (group.Number == 0 ? 0 : (sumValue / group.Number)) * (empolyee.Basics ?? 0) * compute.Attendance;
                     // 考核前管理绩效
                     compute.ShouldGiveFee = Math.Round((compute.Efficiency + compute.Scale) * compute.Grant + compute.OtherManagePerfor ?? 0);