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

11

This commit is contained in:
李超 2026-04-30 19:09:08 +08:00
parent 92f86a586f
commit b9b254956f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs
View File

@ -198,6 +198,7 @@ namespace BLL
InOutWay = personInOut.InOutWay ?? Const.InOutWay_Other, InOutWay = personInOut.InOutWay ?? Const.InOutWay_Other,
WorkAreaId = personInOut.WorkAreaId, WorkAreaId = personInOut.WorkAreaId,
WorkAreaName = personInOut.WorkAreaName, WorkAreaName = personInOut.WorkAreaName,
IdentityCard = personInOut.IdentityCard,
OldID = personInOut.OldID, OldID = personInOut.OldID,
Address = personInOut.Address, Address = personInOut.Address,
Remark = personInOut.Remark, Remark = personInOut.Remark,
@ -210,7 +211,7 @@ namespace BLL
{ {
personIds.Add(personInOut.IdentityCard); personIds.Add(personInOut.IdentityCard);
} }
newPersonInOutList.Add(personInOut); newPersonInOutList.Add(newPersonInOut);
} }
List<Model.SitePerson_Person> person_Peoples = new List<Model.SitePerson_Person>(); List<Model.SitePerson_Person> person_Peoples = new List<Model.SitePerson_Person>();
@ -244,7 +245,7 @@ namespace BLL
} }
} }
if (!getPerson.OutTime.HasValue || getPerson.OutTime > DateTime.Now) if (getPerson!=null && (!getPerson.OutTime.HasValue || getPerson.OutTime > DateTime.Now))
{ {
//// 插入当日记录表 //// 插入当日记录表
needInsertPersonInOutList.Add(newPersonInOut); needInsertPersonInOutList.Add(newPersonInOut);

5
SGGL/WebAPI/Controllers/PersonController.cs
View File

@ -476,8 +476,9 @@ namespace WebAPI.Controllers
{ {
var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == person.IdentityCard.Trim() && x.ProjectId == person.ProjectId); var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == person.IdentityCard.Trim() && x.ProjectId == person.ProjectId);
if (getPerson != null && getPerson.PersonId != person.PersonId) if (getPerson != null && getPerson.PersonId != person.PersonId)
//if (getPerson != null && getPerson.SitePersonId != person.SitePersonId)
{ {
responeData.code = 2; responeData.code = 2;
responeData.message = "人员身份证号码已存在！"; responeData.message = "人员身份证号码已存在！";
} }
else else
@ -785,7 +786,7 @@ namespace WebAPI.Controllers
catch (Exception ex) catch (Exception ex)
{ {
responeData.code = 0; responeData.code = 0;
responeData.message = ex.Message; responeData.message = ex.StackTrace;
} }
} }
return responeData; return responeData;