工作量绩效，其他绩效等数据完善

performance/Performance.DtoModels/PerExcel/ComputeResult.cs

@@ -119,5 +119,15 @@ public class ComputeResult
         /// 职称
         /// </summary>
         public string JobTitle { get; set; }
+
+        /// <summary>
+        /// 调节系数
+        /// </summary>
+        public decimal? Adjust { get; set; }
+
+        /// <summary>
+        /// 工作量绩效
+        /// </summary>
+        public decimal? Workload { get; set; }
     }
 }

performance/Performance.Services/AllotCompute/ImportDataService.cs

@@ -130,6 +130,7 @@ private void SaveEmployee(PerSheet sheet, int allotId)
                 var imdata = Mapper.Map<im_employee>(data);
                 imdata.SheetID = imsheet.ID;
                 imdata.AllotID = allotId;
+                imdata.OtherPerfor = data.OthePerfor;
                 addList.Add(imdata);
             }
             perforImEmployeeRepository.AddRange(addList.ToArray());

performance/Performance.Services/PerExcelService/ComputeEmpolyee/ComputeDirector.cs

@@ -60,7 +60,9 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<Comp
                         Grant = item.Grant,
                         ScoreAverageRate = item.ScoreAverageRate,
                         Punishment = item.Punishment,
-                        OtherPerfor = item.OtherPerfor
+                        OtherPerfor = item.OtherPerfor,
+                        Adjust = item.Adjust,
+                        Workload = item.Workload
                     };
                     //应发管理绩效
                     compute.ShouldGiveFee = (efficiency?.Value * resAccount?.Avg + scale?.Value * resAccount?.PerforTotal) * item.Grant;
@@ -156,7 +158,11 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<res_
                         Attendance = item.Attendance,
                         ScoreAverageRate = item.ScoreAverageRate,
                         Punishment = item.Punishment,
-                        OtherPerfor = item.OtherPerfor
+                        OtherPerfor = item.OtherPerfor,
+                        JobTitle = item.JobTitle,
+                        Adjust = item.Adjust,
+                        Workload = item.Workload
+
                     };
                     //年资系数
                     if (yearTypes.Contains(type) && item.WorkTime.HasValue && item.WorkTime.Value > new DateTime(1970, 1, 1))
@@ -168,7 +174,8 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<res_
                     //应发绩效
                     compute.GiveFee = baiscnorm * compute.PostCoefficient * compute.Attendance * compute.ScoreAverageRate * (compute.WorkYear ?? 1) + (compute.OtherPerfor ?? 0) + (item.Workload ?? 0) + (compute.Punishment ?? 0);
                     //实发绩效
-                    compute.RealGiveFee = compute.GiveFee * item.Adjust * item.Grant;
+                    var adjust = item.Adjust ?? 1m;
+                    compute.RealGiveFee = compute.GiveFee * adjust * item.Grant;
                     computeList.Add(compute);
                 }
             }