Commit dc3e0c1ce4e3bb6f0e12ba7157ce9c6d2f9f8fcc
1 parent
01cd603c
fix: 修复健康师业绩LaborCost的计算逻辑
- 修复Create方法中健康师业绩LaborCost的计算，确保正确计算最终值（原始值+加班值） - 保持与科技部老师业绩计算逻辑一致
Showing
1 changed file
with
3 additions
and
1 deletions
netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs
| @@ -372,7 +372,9 @@ namespace NCC.Extend.LqXhHyhk | @@ -372,7 +372,9 @@ namespace NCC.Extend.LqXhHyhk | ||
| 372 | Yjsj = DateTime.Now, | 372 | Yjsj = DateTime.Now, |
| 373 | JsjId = ijks_tem.jsjId, | 373 | JsjId = ijks_tem.jsjId, |
| 374 | Kdpxid = lqXhPxmxEntity.Id, | 374 | Kdpxid = lqXhPxmxEntity.Id, |
| 375 | - LaborCost = ijks_tem.laborCost, | 375 | + OriginalLaborCost = ijks_tem.laborCost, |
| 376 | + OvertimeLaborCost = (decimal)(entity.OvertimeCoefficient * (ijks_tem.laborCost ?? 0)), | ||
| 377 | + LaborCost = (decimal)((ijks_tem.laborCost ?? 0) + (entity.OvertimeCoefficient * (ijks_tem.laborCost ?? 0))), | ||
| 376 | OriginalKdpxNumber = ijks_tem.kdpxNumber, | 378 | OriginalKdpxNumber = ijks_tem.kdpxNumber, |
| 377 | OvertimeKdpxNumber = (decimal)(entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0)), | 379 | OvertimeKdpxNumber = (decimal)(entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0)), |
| 378 | KdpxNumber = (decimal)((ijks_tem.kdpxNumber ?? 0) + (entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0))), | 380 | KdpxNumber = (decimal)((ijks_tem.kdpxNumber ?? 0) + (entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0))), |