二次绩效补充主任基础绩效值

performance/Performance.Services/SecondAllotService.cs

@@ -408,10 +408,13 @@ private void FillData(ag_secondallot second, List<BodyItem> bodyItems)
         {
             if (bodyItems == null || !bodyItems.Any()) return;
 
+            var account = perforResaccountRepository.GetEntity(t => t.AllotID == second.AllotId && t.AccountingUnit == second.Department && ((UnitType)t.UnitType).ToString() == second.UnitType);
+
             var keyValue = new Dictionary<string, string>
             {
                 {"发放月份",  $"{second.Year}年{second.Month.ToString().PadLeft(2, '0')}月"},
                 {"绩效合计(考核后)",  second.RealGiveFee.ToString()},
+                {"主任基础绩效", account?.Avg?.ToString()}
             };
             var config = perforCofagainRepository.GetEntities(t => t.AllotID == second.AllotId);
             if (config != null && config.Any())
@@ -423,7 +426,7 @@ private void FillData(ag_secondallot second, List<BodyItem> bodyItems)
             foreach (var item in keyValue)
             {
                 var header = bodyItems.FirstOrDefault(t => t.FiledName == item.Key);
-                if (header != null && string.IsNullOrEmpty(header.Value))
+                if (header != null && (string.IsNullOrEmpty(header.Value) || header.Value == "0"))
                     bodyItems.FirstOrDefault(t => t.FiledName == item.Key).Value = item.Value;
             }
         }
@@ -482,7 +485,7 @@ private void SupplyHeaderByWorkItem(UseTempRequest request, SecondResponse resul
                 {
                     var headItem = (HeadItem)headers[i].Clone();
                     headItem.FiledName = (i % 2 == 0) ? item.TypeName : item.TypeName.Replace("占比", "金额");
-                    if (i % 2 != 0 && !headItem.FiledName.EndsWith("金额")) 
+                    if (i % 2 != 0 && !headItem.FiledName.EndsWith("金额"))
                         headItem.FiledName += "金额";
                     headItem.FiledId += item.Id;
                     headItem.Sort = maxSortValue + sortindex;