调节后其他管理绩效

performance/Performance.Services/ComputeService.UniteDeptDetail.cs

@@ -765,11 +765,7 @@ public List<UniteDeptDetailItem> GetUniteDeptDetailSetting(int allotId)
 
             }
             #endregion
-
-
-
             InitRecursion(response, null);
-
             #region 排序
             var enumItems = EnumHelper.GetItems<UniteDept.Title>();
             foreach (var detail in response)
@@ -778,7 +774,6 @@ public List<UniteDeptDetailItem> GetUniteDeptDetailSetting(int allotId)
                 detail.Sort = cfg == null ? detail.Sort : cfg.Value;
             }
             #endregion
-
             // 读取数据库保存内容
             GetRecursionUseSettings(response, cofDeptDetail);
             RecursiveSort(response);
@@ -1037,7 +1032,6 @@ public List<UniteDeptDetailItem> GetEmpDetailSetting(int allotId)
             #region 管理绩效
             response.Add(new UniteDeptDetailItem { Title = ManagementDept.TitleManage.核算人数.ToString() });
             response.Add(new UniteDeptDetailItem { Title = ManagementDept.TitleManage.人均绩效.ToString() });
-            //response.Add(new UniteDeptDetailItem { Title = ManagementDept.TitleManage.基础绩效系数.ToString() });
             response.Add(new UniteDeptDetailItem { Title = ManagementDept.TitleManage.实际人均.ToString() });
             response.Add(new UniteDeptDetailItem { Title = ManagementDept.TitleManage.效率绩效人数.ToString() });
             response.Add(new UniteDeptDetailItem { Title = ManagementDept.TitleManage.效率系数.ToString(), Format = UniteDept.Format.两位小数.ToString() });
@@ -1056,8 +1050,6 @@ public List<UniteDeptDetailItem> GetEmpDetailSetting(int allotId)
             response.Add(new UniteDeptDetailItem { Title = ManagementDept.TitleManage.调节系数.ToString(), Format = UniteDept.Format.整数百分比.ToString() });
             response.Add(new UniteDeptDetailItem { Title = ManagementDept.TitleManage.绩效合计.ToString(), Display = UniteDept.DisplayRule.下发显示.ToString(), });
             #endregion
-
-
             #region 补全公共附属表明细  
             var rightSheetTypeMaps = new List<UniteDeptDetailItem>()
             {
@@ -1094,10 +1086,8 @@ public List<UniteDeptDetailItem> GetEmpDetailSetting(int allotId)
 
             }
             #endregion
-
             //初始化配置
             InitRecursion(response, null);
-
             #region 排序
             var enumItems = EnumHelper.GetItems<ManagementDept.TitleManage>();
             foreach (var detail in response)
@@ -1269,6 +1259,7 @@ public List<UniteDeptDetailResponse> EmpDetail(EmpDetailRequest request, int use
                                 ManagementDept.TitleManage.医院奖罚.ToString(),
                                 ManagementDept.TitleManage.调节系数.ToString(),
                                 ManagementDept.TitleManage.调节后其他绩效.ToString(),
+                                ManagementDept.TitleManage.调节后其他管理绩效.ToString(),
                                 ManagementDept.TitleManage.绩效合计.ToString()
                     };
 
@@ -1337,7 +1328,19 @@ public List<UniteDeptDetailResponse> EmpDetail(EmpDetailRequest request, int use
                             DeleteBlankColumn(items);
                             //var amount = basicData?.Where(t => t.SheetID == sheet.ID && t.UnitType == (int)type && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0;
                             //detail.Total = amount;
+                            var total = items
+                                .Where(w => w.ContainsKey("分值"))
+                                .Select(w =>
+                                {
+                                    if (w["分值"] == null || !decimal.TryParse(w["分值"].ToString(), out var value))
+                                    {
+                                        return 0m;
+                                    }
+                                    return value;
+                                })
+                                .Sum();
                             detail.Items = items;
+                            detail.Total = total;
                         }
                     }
                 }