Merge branch 'develop' of https://gitlab.suvalue.com/zry/performance into develop

# Conflicts:
#	performance/Performance.Services/ComputeService.UniteDeptDetail.cs

performance/Performance.Api/Controllers/ComputeController.cs

@@ -212,37 +212,6 @@ public ApiResponse UniteDeptDetail([FromBody] UniteDeptDetailRequest request)
             return new ApiResponse(ResponseType.OK, response);
         }
 
-        /// <summary>
-        /// 科室绩效详情下载
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("download/unite/deptdetail")]
-        //public IActionResult DownloadUniteDeptdetail([FromBody] UniteDeptDetailRequest request)
-        //{
-        //    request.UnitType = request.UnitType.Replace("行政后勤", "行政工勤");
-        //    if (!Enum.TryParse(request.UnitType, ignoreCase: true, out UnitType unitType))
-        //        return BadRequest("核算组别错误");
-        //    var userid = _claim.GetUserId();
-        //    var result = _computeService.UniteDeptDetail(request.AllotId, unitType, request.AccountingUnit, userid);
-        //    var ser = JsonConvert.SerializeObject(result);
-        //    var rows = JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(ser);
-        //    return BadRequest("核算组别错误");
-        //    //var filepath = _computeService.ExcelDownload(rows, "科室绩效详情", request.AllotId);
-
-        //    //var memoryStream = new MemoryStream();
-        //    //using (var stream = new FileStream(filepath, FileMode.Open))
-        //    //{
-        //    //    stream.CopyToAsync(memoryStream).Wait();
-        //    //}
-        //    //memoryStream.Seek(0, SeekOrigin.Begin);
-        //    //var provider = new FileExtensionContentTypeProvider();
-        //    //FileInfo fileInfo = new FileInfo(filepath);
-        //    //var memi = provider.Mappings[".xlsx"];
-        //    //return File(memoryStream, memi, Path.GetFileName(fileInfo.Name));
-        //}
-
 
 
 

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

@@ -1069,7 +1069,7 @@
         </member>
         <member name="M:Performance.Api.Controllers.ComputeController.DeptDetail(Performance.DtoModels.DeptDetailRequest)">
             <summary>
-            科室绩效详情下载
+            科室绩效详情
             </summary>
             <param name="request"></param>
             <returns></returns>

performance/Performance.DtoModels/UniteDeptSetting.cs

@@ -5,6 +5,8 @@ namespace Performance.DtoModels
 {
     public class UniteDeptDetailItem
     {
+        public string Id { get; set; }
+        public string ParentId { get; set; }
         public int SheetType { get; set; }
         public string Title { get; set; }
         public string Remark { get; set; }

performance/Performance.Services/ComputeService.UniteDeptDetail.cs

@@ -5,6 +5,7 @@
 using System.Text.RegularExpressions;
 using Masuit.Tools;
 using Newtonsoft.Json;
+using Masuit.Tools.Systems;
 using NPOI.Util;
 using OfficeOpenXml;
 using OfficeOpenXml.Style;
@@ -30,6 +31,8 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
         {
             var allot = perforPerallotRepository.GetEntity(t => t.ID == allotId);
             if (allot == null) throw new PerformanceException("绩效月信息错误");
+            //当角色对应时过滤
+            var userInfo = _userRepository.GetUser(userId);
 
             var account = perforResaccountRepository.GetEntity(t => t.AllotID == allotId && t.UnitType == (int)unitType && t.AccountingUnit == accountingUnit);
             account ??= new res_account
@@ -313,6 +316,8 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
             response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.调节系数.ToString(), Total = account.AdjustFactor ?? 1 });
             response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.实发绩效.ToString(), Total = account.RealGiveFee ?? 0 });
 
+            // 加载用户设置
+            var settings = GetUniteDeptDetailSetting(allotId);
             // 显示详情 
             #region 补全公共附属表明细
             {
@@ -341,14 +346,20 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
                         {
                             if (ignore.Contains(post.Key.TypeName)) continue;
 
+                            var settingItem = settings.FirstOrDefault(w => w.Title == detail.Title) ?? new UniteDeptDetailItem() { Children = new List<UniteDeptDetailItem>() };
+                            var gs = settingItem.Children.FirstOrDefault(w => w.Title == post.Key.TypeName) ?? new UniteDeptDetailItem { Format = "" };
+
+                            if (!userInfo.IsSecondAdmin || allot.States == (int)AllotStates.绩效下发 || allot.States == (int)AllotStates.归档)
+                            {
                                 var fz = post.Sum(group => group.IsFactor == 1 ? (group.CellValue * (group.FactorValue ?? 0)) : group.CellValue);
                                 var row = new Dictionary<string, object>
                                 {
                                     { "指标", post.Key.TypeName },
-                                { "分值", ValueFormating(fz, "") }
+                                    { "分值", ValueFormating(fz, gs.Format) }
                                 };
                                 items.Add(row);
                             }
+                        }
                         var amount = basicData?.Where(t => t.SheetID == sheet.ID && t.UnitType == (int)type && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0;
                         detail.Total = amount;
                         detail.Items = items;
@@ -357,10 +368,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
             }
             #endregion
 
-            //当角色对应时过滤
-            var userInfo = _userRepository.GetUser(userId);
             // 应用用户设置的显示规则
-            var settings = GetUniteDeptDetailSetting(allotId);
             foreach (var detail in response.DetailItems)
             {
                 detail.Display = true;
@@ -489,7 +497,6 @@ public List<UniteDeptDetailItem> GetUniteDeptDetailSetting(int allotId)
 
             // 显示详情 
             #region 补全公共附属表明细  
-            {
             var rightSheetTypeMaps = new List<UniteDeptDetailItem>()
             {
                 new UniteDeptDetailItem { Title = UniteDept.Title.预算比例.ToString(), SheetType = (int)SheetType.BudgetRatio, Format = UniteDept.Format.两位小数百分比.ToString(), },
@@ -517,7 +524,6 @@ public List<UniteDeptDetailItem> GetUniteDeptDetailSetting(int allotId)
                     detail.Children = items;
                 }
             }
-            }
             #endregion
 
             var entity = _perforCofDeptDetailRepository.GetEntity(w => w.AllotId == allotId);
@@ -528,38 +534,44 @@ public List<UniteDeptDetailItem> GetUniteDeptDetailSetting(int allotId)
             var enumItems = EnumHelper.GetItems<UniteDept.Title>();
             foreach (var detail in response)
             {
+                detail.Id = SnowFlake.GetInstance().GetLongId().ToString();
                 detail.Display = UniteDept.DisplayRule.始终显示.ToString();
+                detail.Children ??= new List<UniteDeptDetailItem>();
+                foreach (var item in detail.Children)
+                {
+                    item.Id = SnowFlake.GetInstance().GetLongId().ToString();
+                    item.ParentId = detail.Id;
+                }
+
                 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;
+                if (temp1 != null)
+                {
                     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 temp1children = temp1.Children.FirstOrDefault(w => w.Title == item.Title);
-                    if (temp1children == null) continue;
-                    item.SheetType = temp1children.SheetType;
-                    item.Remark = temp1children.Remark;
-                    item.Title = temp1children.Title;
-                    item.Format = temp1children.Format;
-                    item.Sort = temp1children.Sort;
-                    item.Display = temp1children.Display;
+                        var temp2 = cofDeptDetail.FirstOrDefault(w => w.Title == item.Title);
+                        if (temp2 != null)
+                        {
+                            item.Remark = temp2.Remark;                            
+                            item.Format = temp2.Format;
+                            item.Sort = temp2.Sort;
+                            item.Display = temp2.Display;
+                        }
                     }
                     foreach (var item2 in temp1.Children)
                     {
-                    var detailChildren = detail.Children.FirstOrDefault(w => w.Title == item2.Title);
-                    if (detailChildren == null)
+                        if (!detail.Children.Any(w => w.Title == item2.Title))
                             detail.Children.Add(item2);
                     }
                 }
+            }
 
             response = response.OrderBy(w => w.Sort).ToList();
 

performance/Performance.Services/Queues/IHubNotificationQueue.cs

@@ -47,7 +47,7 @@ private void Consumer()
                     item.UserId.ToString(),
                     item.Method,
                     JsonHelper.Serialize(item.Body));
-                _hubContext.Clients.Group(item.UserId.ToString()).SendAsync(item.Method, item.Body);
+                _hubContext.Clients.All.SendAsync(item.Method, item.Body);
             }
         }
     }