1、优化考勤记录导入,优化出入记录写实名制推送记录表。2、优化考试答题,交卷接口方法。3、优化写入培训记录。
This commit is contained in:
@@ -188,15 +188,20 @@ namespace WebAPI.Controllers
|
||||
db.SubmitChanges();
|
||||
///// 根据出入记录 写入考勤记录
|
||||
facerecord.IDCardNo = facerecord.EmployNO;
|
||||
DoorServerService.InsertEmployInOutRecord(facerecord);
|
||||
if (facerecord.DateTimeRecord.HasValue)
|
||||
|
||||
var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.ProjectId == newFacerecord.ProjectId && x.IdentityCard == newFacerecord.EmployNO);
|
||||
if (getPerson != null)
|
||||
{
|
||||
int isIn = 0;
|
||||
if (facerecord.InOrOut == "进门")
|
||||
DoorServerService.InsertEmployInOutRecord(facerecord, getPerson);
|
||||
if (facerecord.DateTimeRecord.HasValue)
|
||||
{
|
||||
isIn = 1;
|
||||
int isIn = 0;
|
||||
if (facerecord.InOrOut == "进门")
|
||||
{
|
||||
isIn = 1;
|
||||
}
|
||||
APIPersonService.getPersonInOut(getPerson, isIn, facerecord.DateTimeRecord.Value);
|
||||
}
|
||||
APIPersonService.getPersonInOut(facerecord.ProjectId, facerecord.EmployNO, isIn, facerecord.DateTimeRecord.Value);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -288,15 +293,19 @@ namespace WebAPI.Controllers
|
||||
DateTimeRecord = validcardevent.RecordDateTime,
|
||||
InOrOut = validcardevent.InOrOut == 1 ? "进门" : "出门",
|
||||
};
|
||||
DoorServerService.InsertEmployInOutRecord(newFacerecord);
|
||||
if (validcardevent.RecordDateTime.HasValue)
|
||||
var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.ProjectId == validcardevent.ProjectId && x.IdentityCard == validcardevent.IDCardNo);
|
||||
if (getPerson != null)
|
||||
{
|
||||
int isIn = 0;
|
||||
if (validcardevent.InOrOut == 1)
|
||||
DoorServerService.InsertEmployInOutRecord(newFacerecord, getPerson);
|
||||
if (validcardevent.RecordDateTime.HasValue)
|
||||
{
|
||||
isIn = 1;
|
||||
int isIn = 0;
|
||||
if (validcardevent.InOrOut == 1)
|
||||
{
|
||||
isIn = 1;
|
||||
}
|
||||
APIPersonService.getPersonInOut(getPerson, isIn, validcardevent.RecordDateTime.Value);
|
||||
}
|
||||
APIPersonService.getPersonInOut(validcardevent.ProjectId, validcardevent.IDCardNo, isIn, validcardevent.RecordDateTime.Value);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -333,7 +342,11 @@ namespace WebAPI.Controllers
|
||||
{
|
||||
///// 根据出入记录 写入考勤记录
|
||||
facerecord.IDCardNo = facerecord.EmployNO;
|
||||
DoorServerService.InsertEmployInOutRecord(facerecord);
|
||||
var getPerson = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == facerecord.ProjectId && x.IdentityCard == facerecord.EmployNO);
|
||||
if (getPerson != null)
|
||||
{
|
||||
DoorServerService.InsertEmployInOutRecord(facerecord, getPerson);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user