二次分配依据录入数据后优先使用录入

parent f42f79e5
......@@ -1509,7 +1509,8 @@ public List<ag_othersource> OtherList(int secondId, int userId)
WorkPost = t.JobTitle,
}).ToList();
}
SupplementSecondDetail(second, employees, result);
var isSupplementTitlePerformance = otherSecondList == null || !otherSecondList.Any();
SupplementSecondDetail(second, employees, result, isSupplementTitlePerformance);
return result;
}
......@@ -1568,7 +1569,8 @@ public List<ag_othersource> OtherAutoComplete(SecondEmpRequest request, int user
/// <param name="second"></param>
/// <param name="employees"></param>
/// <param name="result"></param>
private void SupplementSecondDetail(ag_secondallot second, List<per_employee> employees, List<ag_othersource> result)
/// <param name="isTitlePerformance">是否补全职称绩效</param>
private void SupplementSecondDetail(ag_secondallot second, List<per_employee> employees, List<ag_othersource> result, bool isTitlePerformance = true)
{
// 补充医院其他绩效 及 预留比例
var perapramounts = perapramountRepository.GetEntities(t => t.AllotId == second.AllotId);
......@@ -1590,6 +1592,7 @@ private void SupplementSecondDetail(ag_secondallot second, List<per_employee> em
{
item.ReservedRatio = empl.ReservedRatio;
item.OtherPerformance = getAprAmount(empl);
if (isTitlePerformance)
item.TitlePerformance = getDistPerformance(empl);
}
}
......
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