Merge branch 'fixed/bug' into v2020calculate

0090cfe6 · ruyun.zhang@suvalue.com · d37d7cda · e86c6bf9 · 0090cfe6
Commit 0090cfe6 authored Oct 13, 2020 by ruyun.zhang@suvalue.com
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 17 deletions

performance/Performance.Services/AllotCompute/ResultComputeService.cs
+23 -17

No files found.
--- a/performance/Performance.Services/AllotCompute/ResultComputeService.cs
+++ b/performance/Performance.Services/AllotCompute/ResultComputeService.cs
@@ -496,30 +496,36 @@ public void GenerateSecondAllot(per_allot allot)
            {
                foreach (var item in accountUnit)
                {
-                    tempSecond.Add(new ag_secondallot
+                    if (!tempSecond.Any(f => f.UnitType == ((UnitType)item.UnitType).ToString() && f.Department == item.AccountingUnit))
                    {
-                        AllotId = allot.ID,
+                        tempSecond.Add(new ag_secondallot
-                        Year = allot.Year,
+                        {
-                        Month = allot.Month,
+                            AllotId = allot.ID,
-                        UnitType = ((UnitType)item.UnitType).ToString(),
+                            Year = allot.Year,
-                        Department = item.AccountingUnit,
+                            Month = allot.Month,
-                        RealGiveFee = item.RealGiveFee,
+                            UnitType = ((UnitType)item.UnitType).ToString(),
-                    });
+                            Department = item.AccountingUnit,
+                            RealGiveFee = item.RealGiveFee,
+                        });
+                    }
                }
            }
            if (specialList != null)
            {
-                foreach (var item in specialList)
+                foreach (var item in specialList.Select(w => new { w.AccountingUnit, w.RealGiveFee }).Distinct())
                {
-                    tempSecond.Add(new ag_secondallot
+                    if (!tempSecond.Any(f => f.UnitType == UnitType.特殊核算组.ToString() && f.Department == item.AccountingUnit))
                    {
-                        AllotId = allot.ID,
+                        tempSecond.Add(new ag_secondallot
-                        Year = allot.Year,
+                        {
-                        Month = allot.Month,
+                            AllotId = allot.ID,
-                        UnitType = UnitType.特殊核算组.ToString(),
+                            Year = allot.Year,
-                        Department = item.AccountingUnit,
+                            Month = allot.Month,
-                        RealGiveFee = item.RealGiveFee,
+                            UnitType = UnitType.特殊核算组.ToString(),
-                    });
+                            Department = item.AccountingUnit,
+                            RealGiveFee = item.RealGiveFee,
+                        });
+                    }
                }
            }