Merge branch 'fixed/jsonbug' into v2020calculate

performance/Performance.Services/ComputeService.cs

@@ -542,11 +542,27 @@ private List<ComputeResponse> AddAprAmount(int allotId, List<ComputeResponse> co
             if (list == null || !list.Any())
                 return computes;
 
-            foreach (var emp in computes)
+            foreach (var item in computes.GroupBy(w => new { w.AccountingUnit, w.JobNumber }))
             {
-                var apramount = list.Where(t => t.AccountingUnit == emp.AccountingUnit && !string.IsNullOrEmpty(t.PersonnelNumber) && emp.JobNumber?.Trim() == t.PersonnelNumber?.Trim());
-                emp.OthePerfor = apramount?.Sum(w => w.Amount);
+                // 补充过一次就不在补充了 
+                var emp = computes.Where(w => w.AccountingUnit == item.Key.AccountingUnit && w.JobNumber == item.Key.JobNumber)
+                    .OrderByDescending(w => w.Source).FirstOrDefault();
+                var apramount = list.Where(t => t.AccountingUnit == emp.AccountingUnit
+                     && !string.IsNullOrEmpty(t.PersonnelNumber) && emp.JobNumber?.Trim() == t.PersonnelNumber?.Trim());
+                emp.OthePerfor = apramount?.Sum(w => w.Amount) ?? 0;
+
+                //foreach (var emp in computes)
+                //{
+                //    if (!emp.OthePerfor.HasValue || emp.OthePerfor == 0)
+                //    {
+                //        var apramount = list.Where(t => t.AccountingUnit == emp.AccountingUnit
+                //            && !string.IsNullOrEmpty(t.PersonnelNumber) && emp.JobNumber?.Trim() == t.PersonnelNumber?.Trim());
+                //        emp.OthePerfor = apramount?.Sum(w => w.Amount) ?? 0;
+                //    }
+                //}
             }
+
+
             return computes;
         }