lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20221119优化出入经历

Browse Source
This commit is contained in:
杨红卫
2022-11-19 16:17:11 +08:00
parent 940df6ea3d
commit db59f0641b
3 changed files with 35 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs
+6 -11
View File
@@ -192,17 +192,12 @@ namespace BLL
newitem.PersonName = getPerson.PersonName;
newitem.IdentityCard = getPerson.IdentityCard;
}
var getPersonItem = db.SitePerson_PersonItem.FirstOrDefault(x => x.PersonId == getPerson.PersonId && x.InTime <= newitem.InTime && x.OutTime > newitem.InTime);
var getPersonItem = db.SitePerson_PersonItem.FirstOrDefault(x => x.PersonId == getPerson.PersonId
&& x.InTime <= newitem.InTime && (x.OutTime > newitem.InTime || !x.OutTime.HasValue));
if (getPersonItem != null)
{
if (newitem.OutTime.HasValue)
{
if ((getPersonItem.OutTime.HasValue && newitem.OutTime > getPersonItem.OutTime) || !getPersonItem.OutTime.HasValue)
{
getPersonItem.OutTime = newitem.OutTime.Value;
db.SubmitChanges();
}
}
getPersonItem.OutTime = null;
db.SubmitChanges();
}
else
{
@@ -213,8 +208,8 @@ namespace BLL
PersonName = newitem.PersonName,
IdentityCard = newitem.IdentityCard,
InTime = newitem.InTime,
OutTime = newitem.OutTime,
OutResult = newitem.OutResult,
// OutTime = newitem.OutTime,
// OutResult = newitem.OutResult,
};
if (!string.IsNullOrEmpty(newitem.ProjectId))
{