Merge branch 'feature/二次分配审核提示人均' into develop

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -2165,6 +2165,11 @@
             <param name="query"></param>
             <returns></returns>
         </member>
+        <member name="T:Performance.Api.ClearLoggerJob">
+            <summary>
+            删除历史日志
+            </summary>
+        </member>
         <member name="T:Performance.Api.ExpirationLimitMiddleware">
             <summary>
             过期限制

performance/Performance.EntityModels/Entity/ex_result.cs

@@ -76,9 +76,9 @@ public class ex_result
         /// </summary>
         public Nullable<DateTime> CreateTime { get; set; }
 
-        /// <summary>
-        /// 1 删除 0 未删除
-        /// </summary>
+        // /// <summary>
+        // /// 1 删除 0 未删除
+        // /// </summary>
         // public int IsDelete { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/ex_result_gather.cs

@@ -46,9 +46,9 @@ public class ex_result_gather
         /// 备注
         /// </summary>
         public string Remark { get; set; }
-        /// <summary>
-        /// 1 未通过 2 通过 
-        /// </summary>
+        // /// <summary>
+        // /// 1 未通过 2 通过 
+        // /// </summary>
         // public int States { get; set; }
     }
 }

performance/Performance.Services/RedistributionService.cs

@@ -27,6 +27,7 @@ public class RedistributionService : IAutoInjection
         private readonly PerforPerallotRepository _perallotRepository;
         private readonly PerforPeremployeeRepository _peremployeeRepository;
         private readonly PerforRescomputeRepository _rescomputeRepository;
+        private readonly PerforResaccountRepository _resaccountRepository;
         private readonly PerforAgsecondallotRepository _secondallotRepository;
         private readonly PerforPerapramountRepository _perapramountRepository;
         private readonly PerforAgothersourceRepository _agothersourceRepository;
@@ -45,6 +46,7 @@ public class RedistributionService : IAutoInjection
             PerforPerallotRepository perallotRepository,
             PerforPeremployeeRepository peremployeeRepository,
             PerforRescomputeRepository rescomputeRepository,
+            PerforResaccountRepository resaccountRepository,
             PerforAgsecondallotRepository secondallotRepository,
             PerforPerapramountRepository perapramountRepository,
             PerforAgothersourceRepository agothersourceRepository,
@@ -62,6 +64,7 @@ public class RedistributionService : IAutoInjection
             _perallotRepository = perallotRepository;
             _peremployeeRepository = peremployeeRepository;
             _rescomputeRepository = rescomputeRepository;
+            _resaccountRepository = resaccountRepository;
             _secondallotRepository = secondallotRepository;
             _perapramountRepository = perapramountRepository;
             _agothersourceRepository = agothersourceRepository;
@@ -369,6 +372,18 @@ public List<SecondColumnDictionary> GetTableHeaderDictionary(ComputeMode compute
             head.AddOrUpdate(nameof(ag_headsource.NightShiftWorkPerforTotal), (allot.States == (int)AllotStates.GenerateSucceed) ? (second.NightShiftWorkPerforFee ?? 0) : 0);
             head.AddOrUpdate(nameof(ag_headsource.TotalPerformance), head.GetDecimal(nameof(ag_headsource.TotalDistPerformance)) - head.GetDecimal(nameof(ag_headsource.NightShiftWorkPerforTotal)));
             head.AddOrUpdate("Remark", (allot.States == (int)AllotStates.GenerateSucceed) ? "" : "(非正式)");
+
+            #region 添加参考人均 lcr:参考人均那里直接取4.1的人均绩效
+            // 添加参考人均（二次分配审核时，提示业务中层测算表的基础绩效或实际人均） 
+            var refAvg = 0m;
+            if (Enum.TryParse(typeof(UnitType), second.UnitType, true, out object unittype))
+            {
+                var rescompute = _resaccountRepository.GetEntity(w => w.AccountingUnit == second.Department && w.UnitType == (int)((UnitType)unittype));
+                refAvg = rescompute?.Avg ?? 0;
+            }
+            head.AddOrUpdate("RefAvg", refAvg); 
+            #endregion
+
             // 横向 纵向 特有顶部信息
             if (computeMode != ComputeMode.NotCalculate)
             {