Merge branch 'develop' into feature/新二次分配

performance/Performance.DtoModels/Response/SecPrintResponse.cs

@@ -47,6 +47,10 @@ public class SecPrintResponse
         /// </summary>
         public decimal? NightWorkPerformance { get; set; }
         /// <summary>
+        /// 预留比例
+        /// </summary>
+        public decimal? ReservedRatio { get; set; }
+        /// <summary>
         /// 实发绩效工资金额
         /// </summary>
         public decimal? RealAmount { get; set; }

performance/Performance.Services/SecondAllotService.cs

@@ -2189,7 +2189,10 @@ public List<SecPrintResponse> Print(int secondId)
             // 重算实发绩效
             foreach (var item in result)
             {
-                item.RealAmount = (item.DistPerformance ?? 0) + (item.OtherPerformance ?? 0) + (item.NightWorkPerformance ?? 0);
+                per_employee employee = employees?.FirstOrDefault(t => t.PersonnelNumber == item.JobNumber);
+                if (employee != null)
+                    item.ReservedRatio = employee.ReservedRatio ?? 0;
+                item.RealAmount = (item.DistPerformance ?? 0) * (1 - (item.ReservedRatio ?? 0)) + (item.OtherPerformance ?? 0) + (item.NightWorkPerformance ?? 0);
             }