科室详情设置加载

performance/Performance.Api/Controllers/ComputeController.cs

@@ -211,6 +211,9 @@ public ApiResponse UniteDeptDetail([FromBody] UniteDeptDetailRequest request)
             return new ApiResponse(ResponseType.OK, response);
         }
 
+
+
+
         #region 20230531 即将弃用，由新接口替代
         /// <summary>
         /// 科室绩效详情

performance/Performance.DtoModels/Response/UniteDeptDetailResponse.cs

@@ -4,6 +4,7 @@ namespace Performance.DtoModels
 {
     public class UniteDeptDetailResponse
     {
+        public string Title { get; set; }
         public string UnitType { get; set; }
         public string AccountingUnit { get; set; }
         /// <summary> 0 不显示 1 显示 </summary>

performance/Performance.DtoModels/UniteDeptSetting.cs

@@ -5,13 +5,12 @@ namespace Performance.DtoModels
 {
     public class UniteDeptDetailItem
     {
-        public int Type { get; set; }
         public int SheetType { get; set; }
         public string Title { get; set; }
         public string Remark { get; set; }
         public string Format { get; set; }
         public int Sort { get; set; }
         public string Display { get; set; }
-        public List<UniteDeptDetailItem> Items { get; set; }
+        public List<UniteDeptDetailItem> Children { get; set; }
     }
 }

performance/Performance.Repository/Repository/PerforCofDeptDetailRepository.cs

@@ -8,7 +8,7 @@
 namespace Performance.Repository
 {
     /// <summary>
-    /// cof_cmi Repository
+    /// cof_dept_detail
     /// </summary>
     public partial class PerforCofDeptDetailRepository : PerforRepository<cof_dept_detail>
     {

performance/Performance.Services/ComputeService.UniteDeptDetail.cs

@@ -50,7 +50,13 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
             var headers = _perforImheaderRepository.GetEntities(t => t.AllotID == account.AllotID) ?? new List<im_header>();
             var basicData = _perforImDataRepository.GetEntities(t => t.AllotID == account.AllotID && t.AccountingUnit == account.AccountingUnit) ?? new List<im_data>();
 
-            var response = new UniteDeptDetailResponse { UnitType = unitType.ToString(), AccountingUnit = accountingUnit, DetailItems = new List<DeptDetailItem>() };
+            var response = new UniteDeptDetailResponse
+            {
+                Title = $"{allot.Name ?? $"{allot.Year}年{allot.Month}月"} {unitType} {accountingUnit}",
+                UnitType = unitType.ToString(),
+                AccountingUnit = accountingUnit,
+                DetailItems = new List<DeptDetailItem>()
+            };
             // 行政工勤
             if (UnitTypeUtil.IsOffice(response.UnitType))
             {
@@ -244,6 +250,16 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
                             row.Add("金额", ValueFormating(itemValue, ""));
                             items.Add(row);
                         }
+                        // 保证Key数量一致
+                        var keys = items.SelectMany(dict => dict.Keys).Distinct();
+                        foreach (var k in keys)
+                        {
+                            foreach (var item in items)
+                            {
+                                if (!item.ContainsKey(k))
+                                    item.Add(k, "");
+                            }
+                        }
                         items.Add(new Dictionary<string, object>
                         {
                             {  "项目", "核算分值合计"},
@@ -431,11 +447,6 @@ private string BeautifulName(string sheetName)
         /// <exception cref="PerformanceException"></exception>
         public List<UniteDeptDetailItem> GetUniteDeptDetailSetting(int allotId)
         {
-            var entity = _perforCofDeptDetailRepository.GetEntity(w => w.AllotId == allotId);
-            if (!string.IsNullOrEmpty(entity?.Settings))
-            {
-                return JsonHelper.Deserialize<List<UniteDeptDetailItem>>(entity.Settings);
-            }
 
             var allot = perforPerallotRepository.GetEntity(t => t.ID == allotId);
             if (allot == null) throw new PerformanceException("绩效月信息错误");
@@ -484,11 +495,17 @@ public List<UniteDeptDetailItem> GetUniteDeptDetailSetting(int allotId)
                             if (ignore.Contains(post.Key.TypeName)) continue;
                             items.Add(new UniteDeptDetailItem { Title = post.Key.TypeName });
                         }
-                        detail.Items = items;
+                        detail.Children = items;
                     }
                 }
             }
             #endregion
+
+            var entity = _perforCofDeptDetailRepository.GetEntity(w => w.AllotId == allotId);
+            var cofDeptDetail = string.IsNullOrEmpty(entity?.Settings)
+                ? new List<UniteDeptDetailItem>()
+                : JsonHelper.Deserialize<List<UniteDeptDetailItem>>(entity.Settings);
+
             var enumItems = EnumHelper.GetItems<UniteDept.Title>();
             foreach (var detail in response)
             {
@@ -496,9 +513,30 @@ public List<UniteDeptDetailItem> GetUniteDeptDetailSetting(int allotId)
                 var cfg = enumItems.FirstOrDefault(w => w.Name == detail.Title);
                 // 只对右侧设置排序
                 detail.Sort = cfg == null ? detail.Sort : cfg.Value;
+                // 读取数据库保存内容
+                detail.Children ??= new List<UniteDeptDetailItem>();
+                var temp1 = cofDeptDetail.FirstOrDefault(w => w.Title == detail.Title);
+                if (temp1 == null) continue;
+                detail.SheetType = temp1.SheetType;
+                detail.Remark = temp1.Remark;
+                detail.Title = temp1.Title;
+                detail.Format = temp1.Format;
+                detail.Sort = temp1.Sort;
+                detail.Display = temp1.Display;
+                foreach (var item in detail.Children)
+                {
+                    var temp2 = cofDeptDetail.FirstOrDefault(w => w.Title == item.Title);
+                    if (temp2 == null) continue;
+                    detail.SheetType = temp2.SheetType;
+                    detail.Remark = temp2.Remark;
+                    detail.Title = temp2.Title;
+                    detail.Format = temp2.Format;
+                    detail.Sort = temp2.Sort;
+                    detail.Display = temp2.Display;
+                }
             }
 
-            response = response.OrderBy(w => w.Type).ThenBy(w => w.Sort).ToList();
+            response = response.OrderBy(w => w.Sort).ToList();
 
             return response;
         }