Commit a2f075bd by ruyun.zhang@suvalue.com

Merge branch 'hotfix/特殊核算组显示' into develop

parents 1bd3618d 3c87c568
...@@ -1655,6 +1655,7 @@ public DeptDataDetails SpecialDeptDetail(ag_secondallot second) ...@@ -1655,6 +1655,7 @@ public DeptDataDetails SpecialDeptDetail(ag_secondallot second)
AssessBeforeOtherFee = special.FirstOrDefault()?.AssessBeforeOtherFee ?? 0, AssessBeforeOtherFee = special.FirstOrDefault()?.AssessBeforeOtherFee ?? 0,
AssessLaterOtherFee = special.FirstOrDefault()?.AssessLaterOtherFee ?? 0, AssessLaterOtherFee = special.FirstOrDefault()?.AssessLaterOtherFee ?? 0,
AdjustLaterOtherFee = special.FirstOrDefault()?.AdjustLaterOtherFee ?? 0, AdjustLaterOtherFee = special.FirstOrDefault()?.AdjustLaterOtherFee ?? 0,
AssessLaterPerforTotal = special.FirstOrDefault()?.GiveFee ?? 0, // 考核后绩效 特殊情况,为了前端统一
}, },
Detail = new List<DetailDtos>(), Detail = new List<DetailDtos>(),
}; };
......
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