Commit 6ee7c7a5 by 799284587@qq.com

bug修复

parent 6b83695c
...@@ -265,7 +265,7 @@ private List<PerSheet> Compute(IEnumerable<PerDataAccountBaisc> dataList, List<P ...@@ -265,7 +265,7 @@ private List<PerSheet> Compute(IEnumerable<PerDataAccountBaisc> dataList, List<P
dept.PerforFee = dept.Income * (dept.BasicFactor + dept.SlopeFactor); dept.PerforFee = dept.Income * (dept.BasicFactor + dept.SlopeFactor);
dept.PerforTotal = dept.PerforFee + dept.WorkloadFee + dept.OtherPerfor1; dept.PerforTotal = dept.PerforFee + dept.WorkloadFee + dept.OtherPerfor1;
dept.RealGiveFee = (dept.PerforTotal * dept.ScoringAverage + dept.Extra + dept.OtherPerfor2) * dept.AdjustFactor; dept.RealGiveFee = (dept.PerforTotal * dept.ScoringAverage + dept.Extra + dept.OtherPerfor2) * dept.AdjustFactor;
dept.Avg = dept.Number == 0 ? 0 : dept.PerforTotal / (dept.ManagerNumber + dept.Number); dept.Avg = dept.ManagerNumber + dept.Number == 0 ? 0 : dept.PerforTotal / (dept.ManagerNumber + dept.Number);
} }
var multi = atDataList.GroupBy(t => new { t.UnitType, t.AccountingUnit }) var multi = atDataList.GroupBy(t => new { t.UnitType, t.AccountingUnit })
.Select(t => new .Select(t => new
...@@ -275,7 +275,7 @@ private List<PerSheet> Compute(IEnumerable<PerDataAccountBaisc> dataList, List<P ...@@ -275,7 +275,7 @@ private List<PerSheet> Compute(IEnumerable<PerDataAccountBaisc> dataList, List<P
Count = t.Count(), Count = t.Count(),
RealGiveFee = t.Sum(p => p.RealGiveFee), RealGiveFee = t.Sum(p => p.RealGiveFee),
PerforTotal = t.Sum(p => p.PerforTotal), PerforTotal = t.Sum(p => p.PerforTotal),
Avg = t.Sum(p => p.Number) == 0 ? 0 : t.Sum(p => p.RealGiveFee) / t.Sum(p => p.Number) Avg = t.Sum(p => p.ManagerNumber + p.Number) == 0 ? 0 : t.Sum(p => p.RealGiveFee) / t.Sum(p => p.ManagerNumber + p.Number)
}) })
.Where(t => t.Count > 1).ToArray(); .Where(t => t.Count > 1).ToArray();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment