Commit bf6223a2 by ruyun.zhang

二次分配工作量单项自动带出

parent 0149b627
...@@ -426,21 +426,10 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D ...@@ -426,21 +426,10 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
var dict = JsonHelper.Deserialize<Dictionary<string, object>>(JsonHelper.Serialize(employee)); var dict = JsonHelper.Deserialize<Dictionary<string, object>>(JsonHelper.Serialize(employee));
foreach (var workitem in workloads) foreach (var workitem in workloads)
{ {
decimal? value; /* 如果是已保存数据,则加载原始数据,否则加载工作量自动带出 */
if (workitem.ItemId.StartsWithIgnoreCase($"SingleAwards_")) decimal? value = isSave && overrideMode != EmployeeSource.Workload
{
/* 如果是已保存数据,则加载原始数据,否则加载工作量自动带出 */
value = isSave
? bodyDynamic?.FirstOrDefault(w => w.BodyId == employee.Id && w.WorkloadId == workitem.Id)?.Value ? bodyDynamic?.FirstOrDefault(w => w.BodyId == employee.Id && w.WorkloadId == workitem.Id)?.Value
: secondWorkload.FirstOrDefault(w => w.PersonnelNumber == employee.WorkNumber && workitem.ItemId.EqualsIgnoreCase(w.ItemId))?.Value; : secondWorkload.FirstOrDefault(w => w.PersonnelNumber == employee.WorkNumber && workitem.ItemId.EqualsIgnoreCase(w.ItemId))?.Value;
}
else
{
/* 如果是已保存数据,则加载原始数据,否则加载工作量自动带出 */
value = isSave && overrideMode != EmployeeSource.Workload
? bodyDynamic?.FirstOrDefault(w => w.BodyId == employee.Id && w.WorkloadId == workitem.Id)?.Value
: secondWorkload.FirstOrDefault(w => w.PersonnelNumber == employee.WorkNumber && workitem.ItemId.EqualsIgnoreCase(w.ItemId))?.Value;
}
dict.AddOrUpdate(workitem.ItemId, value); dict.AddOrUpdate(workitem.ItemId, value);
} }
result.Add(dict); result.Add(dict);
......
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