Commit 152ebb34 by 纪旭 韦

创建绩效时,JOBNUMBER不自动补充personalnumber

初次设置人员字典标签时初始states问题
parent dc7e98da
...@@ -2019,7 +2019,7 @@ public bool UpdateHeadersStatus(ComputerAliasUpdate request) ...@@ -2019,7 +2019,7 @@ public bool UpdateHeadersStatus(ComputerAliasUpdate request)
// 数据库中无数据 // 数据库中无数据
if (hasreq && !hasdata) if (hasreq && !hasdata)
{ {
var items = request.computerAliasHead.Select(t => t.Head.ToLower()); var items = request.computerAliasHead;
var data = heads.Select(t => new cof_alias var data = heads.Select(t => new cof_alias
{ {
Route = request.Route, Route = request.Route,
...@@ -2027,11 +2027,15 @@ public bool UpdateHeadersStatus(ComputerAliasUpdate request) ...@@ -2027,11 +2027,15 @@ public bool UpdateHeadersStatus(ComputerAliasUpdate request)
OriginalName = t.Alias, OriginalName = t.Alias,
HospitalId = request.HospitalId, HospitalId = request.HospitalId,
Name = t.Name, Name = t.Name,
States = items.Contains(t.Alias ?? "") ? 1 : 0,
SumStatus = t.SumStatus, SumStatus = t.SumStatus,
Sort = request.computerAliasHead.Any(w => w.Name == t.Name) Sort = request.computerAliasHead.Any(w => w.Name == t.Name)
? request.computerAliasHead.FirstOrDefault(w => w.Name == t.Name).Sort ? request.computerAliasHead.FirstOrDefault(w => w.Name == t.Name).Sort
: t.Sort : t.Sort
}).ToList();
data.ForEach(t =>
{
var state = items.FirstOrDefault(i => i.Head.ToLower().Contains(t.Alias));
t.States = state != null ? state.States : 1;
}); });
cofaliasRepository.AddRange(data.ToArray()); cofaliasRepository.AddRange(data.ToArray());
} }
......
...@@ -131,20 +131,15 @@ public void CreateAllotPersons(int hospitalId, int allotId, int prevAllotId = -1 ...@@ -131,20 +131,15 @@ public void CreateAllotPersons(int hospitalId, int allotId, int prevAllotId = -1
BankCard = t.BankCard, BankCard = t.BankCard,
Remark = t.Remark, Remark = t.Remark,
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
PersonnelNumber = t.PersonnelNumber,
JobNumber = t.JobNumber
}; };
if (!string.IsNullOrEmpty(t.PersonnelNumber) && !string.IsNullOrEmpty(t.JobNumber)) string number = !string.IsNullOrEmpty(t.PersonnelNumber) ? t.PersonnelNumber : t.JobNumber;
{ entity.PersonnelNumber = number;
entity.PersonnelNumber = t.PersonnelNumber;
entity.JobNumber = t.JobNumber;
}
else
{
string number = !string.IsNullOrEmpty(t.PersonnelNumber) ? t.PersonnelNumber : t.JobNumber;
entity.PersonnelNumber = number;
entity.JobNumber = number;
}
return entity; return entity;
}).ToList(); }).ToList();
SaveAllotPersons(data); SaveAllotPersons(data);
} }
......
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