个人绩效查询明细调整

parent 5971bbc3
......@@ -9,6 +9,7 @@ public class view_allot_result
/// 来源
/// </summary>
public string Source { get; set; }
public string SourceItem { get; set; }
public int AllotId { get; set; }
public int States { get; set; }
public int? SecondId { get; set; }
......
......@@ -712,6 +712,7 @@ public List<OwnerPerformanceDto> GetOwnerPerformance(int userid)
.Select(detial =>
{
var dto = Mapper.Map<OwnerPerformanceDto>(detial);
dto.Source = string.IsNullOrEmpty(detial.SourceItem) ? detial.Source : $"{detial.Source}-{detial.SourceItem}";
// 应发绩效
dto.ShouldGiveFee = Math.Round((dto.RealPerformance ?? 0) + (dto.OtherPerfor ?? 0) + (dto.HideOtherPerfor ?? 0) + (dto.NightWorkPerfor ?? 0), 2, MidpointRounding.AwayFromZero);
dto.ReservedRatio = employees?.FirstOrDefault(emp => emp.AllotId == dto.AllotId && emp.PersonnelNumber == jobNumber)?.ReservedRatio ?? 0; // 预留比例
......
......@@ -491,9 +491,6 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
{
if (isShowManage == 2)
{
var employee = clinicalEmployees.FirstOrDefault(e => e.PersonnelNumber == t.JobNumber && e.AccountingUnit == t.AccountingUnit);
var scoreAverageRate = t.ScoreAverageRate ?? employee.ScoreAverageRate ?? 1;
var attendance = t.Attendance ?? employee.Attendance ?? 0;
t.RealGiveFee = Math.Round(t.AssessLaterManagementFee * (t.Adjust ?? 1m) + (t.AdjustLaterOtherFee ?? 0) ?? 0, 2);
}
});
......
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