Commit 0142f2e3 by Licx

返回科室考核前奖励字段

parent 102ca9e4
...@@ -3975,6 +3975,11 @@ ...@@ -3975,6 +3975,11 @@
科室单项奖励 科室单项奖励
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.SecPrintResponse.PreDeptReward">
<summary>
科室考核前奖励
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintResponse.DistPerformance"> <member name="P:Performance.DtoModels.SecPrintResponse.DistPerformance">
<summary> <summary>
可分配绩效 可分配绩效
......
...@@ -35,6 +35,10 @@ public class SecPrintResponse ...@@ -35,6 +35,10 @@ public class SecPrintResponse
/// </summary> /// </summary>
public decimal? DeptReward { get; set; } public decimal? DeptReward { get; set; }
/// <summary> /// <summary>
/// 科室考核前奖励
/// </summary>
public decimal? PreDeptReward { get; set; }
/// <summary>
/// 可分配绩效 /// 可分配绩效
/// </summary> /// </summary>
public decimal? DistPerformance { get; set; } public decimal? DistPerformance { get; set; }
......
...@@ -2236,6 +2236,7 @@ public dynamic Print(int secondId) ...@@ -2236,6 +2236,7 @@ public dynamic Print(int secondId)
TitlePerfor = w.TitlePerformance, TitlePerfor = w.TitlePerformance,
WorkPerformance = bodyDynamic?.Where(b => b.BodyId == w.Id && b.ItemId.StartsWith("WorkPerformance_")).Sum(b => b.Value) ?? 0, WorkPerformance = bodyDynamic?.Where(b => b.BodyId == w.Id && b.ItemId.StartsWith("WorkPerformance_")).Sum(b => b.Value) ?? 0,
DeptReward = w.DeptReward, DeptReward = w.DeptReward,
PreDeptReward = w.PreDeptReward,
DistPerformance = w.DistPerformance, DistPerformance = w.DistPerformance,
OtherPerformance = w.OtherPerformance, OtherPerformance = w.OtherPerformance,
NightWorkPerformance = w.NightWorkPerformance, NightWorkPerformance = w.NightWorkPerformance,
...@@ -2309,6 +2310,7 @@ public dynamic Print(int secondId) ...@@ -2309,6 +2310,7 @@ public dynamic Print(int secondId)
TitlePerfor = w.TitlePerformance, TitlePerfor = w.TitlePerformance,
WorkPerformance = w.WorkPerformance, WorkPerformance = w.WorkPerformance,
DeptReward = w.DeptReward, DeptReward = w.DeptReward,
PreDeptReward = w.PreDeptReward,
DistPerformance = w.DistPerformance, DistPerformance = w.DistPerformance,
OtherPerformance = w.OtherPerformance, OtherPerformance = w.OtherPerformance,
NightWorkPerformance = w.NightWorkPerformance, NightWorkPerformance = w.NightWorkPerformance,
......
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