二次绩效详情修改

performance/Performance.Services/SecondAllotService.cs

@@ -365,35 +365,31 @@ public SecondResponse GetSecondDetail(UseTempRequest request)
                 headItems.AddRange(workDtos);
             }
 
-            var result = new SecondResponse { HeadItems = headItems };
+            var result = new SecondResponse { HeadItems = headItems, BodyItems = new List<BodyItem>() };
             //获取数据
-            var fixatList = perforAgfixatitemRepository.GetEntities(t => t.SecondId == request.SecondId);
+            var fixatList = perforAgfixatitemRepository.GetEntities(t => t.SecondId == request.SecondId && t.RowNumber.HasValue);
             if (fixatList != null || fixatList.Count > 0)
             {
                 //补充数据
-                var groupList = fixatList.GroupBy(t => t.RowNumber);
-                foreach (var item in groupList)
+                var rows = fixatList.Select(t => t.RowNumber.Value).Distinct();
+                foreach (var row in rows)
                 {
-                    var newItem = headItems.Select(t => t.FiledName).Except(item?.Select(i => i.ItemName));
-                    if (newItem != null && newItem.Count() > 0)
+                    foreach (var item in headItems)
                     {
-                        fixatList.AddRange(newItem.Select(t => new ag_fixatitem
+                        var bodyItem = new BodyItem
                         {
-                            ItemName = t,
-                            ItemValue = null,
-                            RowNumber = item.Key,
-                            AllotId = fixatList.First().AllotId,
-                            SecondId = fixatList.First().SecondId,
-                            UnitType = fixatList.First().UnitType,
-                            Type = headItems?.FirstOrDefault(s => s.FiledName == t)?.Type,
-                            SourceType = headItems?.FirstOrDefault(s => s.FiledName == t)?.SourceType,
-                            Sort = headItems?.FirstOrDefault(s => s.FiledName == t)?.Sort,
-                            FactorValue = headItems?.FirstOrDefault(s => s.FiledName == t)?.FactorValue,
-                        }));
+                            RowNumber = row,
+                            FiledId = item.FiledId,
+                            FiledName = item.FiledName,
+                            FactorValue = item.FactorValue,
+                            SourceType = item.SourceType,
+                            Type = item.Type,
+                            Sort = item.Sort,
+                            Value = fixatList.FirstOrDefault(t => t.RowNumber == row && t.ItemName == item.FiledName)?.ItemValue
+                        };
+                        result.BodyItems.Add(bodyItem);
                     }
                 }
-                result.BodyItems = Mapper.Map<List<BodyItem>>(fixatList);
-                result.BodyItems.ForEach(t => { t.FiledId = result.HeadItems.FirstOrDefault(s => s.FiledName == t.FiledName)?.FiledId; });
             }
             return result;
         }