Commit ef3334f6 by ruyun.zhang@suvalue.com

Merge branch 'hotfix/二次分配打印多工作量职称显示错误问题' into develop

parents 919bd101 238d8d73
...@@ -1788,7 +1788,7 @@ public bool ConfirmAudit(int userId, SecondAuditRequest request) ...@@ -1788,7 +1788,7 @@ public bool ConfirmAudit(int userId, SecondAuditRequest request)
SecondId = second.Id, SecondId = second.Id,
UnitType = second.UnitType, UnitType = second.UnitType,
Department = second.Department, Department = second.Department,
WorkPost = item.Post, WorkPost = item.JobTitle,
JobNumber = item.WorkNumber, JobNumber = item.WorkNumber,
PersonName = item.Name, PersonName = item.Name,
PerforSumFee = item.DistPerformance, PerforSumFee = item.DistPerformance,
...@@ -2232,7 +2232,7 @@ public dynamic Print(int secondId) ...@@ -2232,7 +2232,7 @@ public dynamic Print(int secondId)
PersonName = w.Name, PersonName = w.Name,
Department = w.Department, Department = w.Department,
RealAmount = w.RealAmount, RealAmount = w.RealAmount,
WorkPost = w.Post, WorkPost = w.JobTitle,
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,
......
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