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/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);
             }
         }
     }