其他收入BUG修复

parent 066aac5f
...@@ -2742,6 +2742,21 @@ ...@@ -2742,6 +2742,21 @@
备注 备注
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.DeptResponse.AssessBeforeOtherFee">
<summary>
考核前其他绩效
</summary>
</member>
<member name="P:Performance.DtoModels.DeptResponse.AssessLaterOtherFee">
<summary>
考核后其他绩效
</summary>
</member>
<member name="P:Performance.DtoModels.DeptResponse.AdjustLaterOtherFee">
<summary>
调节后其他绩效
</summary>
</member>
<member name="P:Performance.DtoModels.DirectorResponse.TypeName"> <member name="P:Performance.DtoModels.DirectorResponse.TypeName">
<summary> <summary>
绩效类型 绩效类型
......
...@@ -202,9 +202,9 @@ public class ResultComputeService : IAutoInjection ...@@ -202,9 +202,9 @@ public class ResultComputeService : IAutoInjection
MaterialsExtra = (materialsExtra ?? 0), MaterialsExtra = (materialsExtra ?? 0),
Adjust = isBudget ? adjust : (dept?.AdjustFactor ?? 1), Adjust = isBudget ? adjust : (dept?.AdjustFactor ?? 1),
AssessBeforeOtherFee = dept.AssessBeforeOtherFee ?? 0, AssessBeforeOtherFee = dept?.AssessBeforeOtherFee ?? 0,
AssessLaterOtherFee = dept.AssessLaterOtherFee ?? 0, AssessLaterOtherFee = dept?.AssessLaterOtherFee ?? 0,
AdjustLaterOtherFee = dept.AdjustLaterOtherFee ?? 0, AdjustLaterOtherFee = dept?.AdjustLaterOtherFee ?? 0,
}; };
res.PerforTotal = (sumValue ?? 0) + res.AssessBeforeOtherFee; res.PerforTotal = (sumValue ?? 0) + res.AssessBeforeOtherFee;
res.GiveFee = Math.Round(res.PerforTotal + res.AssessLaterOtherFee ?? 0); res.GiveFee = Math.Round(res.PerforTotal + res.AssessLaterOtherFee ?? 0);
......
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