科室详情 设置条件调整

performance/Performance.Services/ComputeService.UniteDeptDetail.cs

@@ -368,15 +368,13 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
                 {
                     response.DetailItems.Add(detail);
 
-                    foreach (var sheet in persheet.Where(t => t.SheetType == (int)detail.SheetType))
+                    foreach (var sheet in persheet.Where(t => t.SheetType == (int)detail.SheetType).Select(s => s.ID))
                     {
                         var type = TypeConversion(account.UnitType);
-                        var sheetName = BeautifulName(sheet.SheetName);
-
                         var items = new List<Dictionary<string, object>>();
-                        var postDatas = basicData.Where(t => t.SheetID == sheet.ID && t.IsTotal != 1 && t.UnitType == (int)type);
+                        var postDatas = basicData.Where(t => t.SheetID == sheet && t.IsTotal != 1 && t.UnitType == (int)type);
 
-                        var headersDatas = headers.Where(t => t.SheetID == sheet.ID && t.IsTotal != 1).ToList();
+                        var headersDatas = headers.Where(t => t.SheetID == sheet && t.IsTotal != 1).ToList();
                         postDatas = from temp1 in postDatas
                                     join temp2 in headersDatas on temp1.TypeName equals temp2.CellValue
                                     orderby temp2.PointCell ascending
@@ -718,6 +716,10 @@ public List<UniteDeptDetailItem> GetUniteDeptDetailSetting(int allotId)
             response.Add(new UniteDeptDetailItem { Title = UniteDept.Title.调节系数.ToString(), Format = UniteDept.Format.四位小数百分比.ToString() });
             response.Add(new UniteDeptDetailItem { Title = UniteDept.Title.实发绩效.ToString(), Display = UniteDept.DisplayRule.下发显示.ToString(), StandOut = true, Remark = "考核后绩效 × 调节系数 + 调节后其他绩效" });
 
+            var entity = _perforCofDeptDetailRepository.GetEntity(w => w.AllotId == allotId);
+            var cofDeptDetail = string.IsNullOrEmpty(entity?.Settings)
+                ? new List<UniteDeptDetailItem>()
+                : JsonHelper.Deserialize<List<UniteDeptDetailItem>>(entity.Settings);
             // 显示详情 
             #region 补全公共附属表明细  
             var rightSheetTypeMaps = new List<UniteDeptDetailItem>()
@@ -734,23 +736,27 @@ public List<UniteDeptDetailItem> GetUniteDeptDetailSetting(int allotId)
             {
                 response.Add(detail);
                 var items = new List<UniteDeptDetailItem>();
+                var cofDisplay = UniteDept.DisplayRule.始终隐藏.ToString();
+                if (cofDeptDetail.Any())
+                {
+                    cofDisplay = cofDeptDetail.FirstOrDefault(s => s.Title == detail.Title).Display ?? UniteDept.DisplayRule.始终隐藏.ToString();
+                }
 
                 foreach (var sheet in persheet.Where(t => t.SheetType == detail.SheetType))
                 {
-                    var sheetName = BeautifulName(sheet.SheetName);
                     var postDatas = basicData.Where(t => t.SheetID == sheet.ID && t.IsTotal != 1);
 
                     if (detail.Title == UniteDept.Title.预算比例.ToString() || detail.Title == UniteDept.Title.考核得分率.ToString() || detail.Title == UniteDept.Title.调节系数.ToString())
                     {
                         items.AddRange(postDatas.GroupBy(t => new { t.TypeName })
                                                 .Where(post => !ignore.Contains(post.Key.TypeName))
-                                                .Select(post => new UniteDeptDetailItem { Title = post.Key.TypeName, IsAllowRemark = false, Format = UniteDept.Format.四位小数百分比.ToString() }));
+                                                .Select(post => new UniteDeptDetailItem { Title = post.Key.TypeName, IsAllowRemark = false, Format = UniteDept.Format.四位小数百分比.ToString(), Display = cofDisplay }));
                     }
                     else
                     {
                         items.AddRange(postDatas.GroupBy(t => new { t.TypeName })
                                                 .Where(post => !ignore.Contains(post.Key.TypeName))
-                                                .Select(post => new UniteDeptDetailItem { Title = post.Key.TypeName, IsAllowRemark = false }));
+                                                .Select(post => new UniteDeptDetailItem { Title = post.Key.TypeName, IsAllowRemark = false, Display = cofDisplay }));
                     }
                 }
                 detail.Children = items;
@@ -758,10 +764,7 @@ public List<UniteDeptDetailItem> GetUniteDeptDetailSetting(int allotId)
             }
             #endregion
 
-            var entity = _perforCofDeptDetailRepository.GetEntity(w => w.AllotId == allotId);
-            var cofDeptDetail = string.IsNullOrEmpty(entity?.Settings)
-                ? new List<UniteDeptDetailItem>()
-                : JsonHelper.Deserialize<List<UniteDeptDetailItem>>(entity.Settings);
+
 
             InitRecursion(response, null);
 
@@ -816,11 +819,11 @@ private void GetRecursionUseSettings(List<UniteDeptDetailItem> initDetailItems,
                     GetRecursionUseSettings(detail.Children, temp.Children);
                 }
             }
-            foreach (var item in userDetailItems)
-            {
-                if (!initDetailItems.Any(w => w.Title == item.Title))
-                    initDetailItems.Add(item);
-            }
+            //foreach (var item in userDetailItems)
+            //{
+            //    if (!initDetailItems.Any(w => w.Title == item.Title))
+            //        initDetailItems.Add(item);
+            //}
         }
 
         /// <summary>