lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、优化考勤记录导入，优化出入记录写实名制推送记录表。2、优化考试答题，交卷接口方法。3、优化写入培训记录。

Browse Source
This commit is contained in:
杨红卫
2022-06-16 17:34:24 +08:00
parent b913f49cd8
commit 85a8b510ac
29 changed files with 488 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/WebAPI/Controllers/DoorProject/uploadController.cs
+2 -2
View File
@@ -93,7 +93,7 @@ namespace WebAPI.Controllers
RecordDes = "白名单:允许通行",
InOrOut = (item.attendanceType == 1 ? "进门" : "出门"),
};
DoorServerService.InsertEmployInOutRecord(facerecord);
DoorServerService.InsertEmployInOutRecord(facerecord, getPerson);
if (facerecord.DateTimeRecord.HasValue)
{
int isIn = 0;
@@ -101,7 +101,7 @@ namespace WebAPI.Controllers
{
isIn = 1;
}
APIPersonService.getPersonInOut(facerecord.ProjectId, facerecord.EmployNO, isIn, facerecord.DateTimeRecord.Value);
APIPersonService.getPersonInOut(getPerson, isIn, facerecord.DateTimeRecord.Value);
}
}
responeData.message = "插入成功！";
SGGL/WebAPI/Controllers/DoorServerController.cs
+27 -19
View File
@@ -239,16 +239,16 @@ namespace WebAPI.Controllers
{
string projectId = facerecord.ProjectId;
string personName = facerecord.EmployName;
Model.SitePerson_Person getPerson = new Model.SitePerson_Person();
string ProjectId_19261 = "1be62038-2b94-4ac2-9b5f-80cef85deeb2";
string ProjectId_20041 = "e9fe4b89-f62d-4b3a-a40c-57c87010aa92";
if (projectId == ProjectId_19261 || projectId == ProjectId_20041)
{
var getPersonByIdCard = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == facerecord.EmployNO && (x.ProjectId == ProjectId_19261 || x.ProjectId == ProjectId_20041) && !x.OutTime.HasValue);
if (getPersonByIdCard != null)
getPerson = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == facerecord.EmployNO && (x.ProjectId == ProjectId_19261 || x.ProjectId == ProjectId_20041) && !x.OutTime.HasValue);
if (getPerson != null)
{
personName = getPersonByIdCard.PersonName;
projectId = getPersonByIdCard.ProjectId;
personName = getPerson.PersonName;
projectId = getPerson.ProjectId;
}
}
@@ -256,11 +256,11 @@ namespace WebAPI.Controllers
string ProjectId_21126 = "a7f692aa-4bd5-4fb3-87f8-ba1ab8f94cc2";
if (projectId == ProjectId_20197 || projectId == ProjectId_21126)
{
var getPersonByIdCard = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == facerecord.EmployNO && (x.ProjectId == ProjectId_20197 || x.ProjectId == ProjectId_21126) && !x.OutTime.HasValue);
if (getPersonByIdCard != null)
getPerson = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == facerecord.EmployNO && (x.ProjectId == ProjectId_20197 || x.ProjectId == ProjectId_21126) && !x.OutTime.HasValue);
if (getPerson != null)
{
personName = getPersonByIdCard.PersonName;
projectId = getPersonByIdCard.ProjectId;
personName = getPerson.PersonName;
projectId = getPerson.ProjectId;
}
}
@@ -294,7 +294,7 @@ namespace WebAPI.Controllers
db.SubmitChanges();
///// 根据出入记录 写入考勤记录
facerecord.IDCardNo = facerecord.EmployNO;
DoorServerService.InsertEmployInOutRecord(facerecord);
DoorServerService.InsertEmployInOutRecord(facerecord, getPerson);
if (facerecord.DateTimeRecord.HasValue)
{
int isIn = 0;
@@ -302,7 +302,7 @@ namespace WebAPI.Controllers
{
isIn = 1;
}
APIPersonService.getPersonInOut(projectId, facerecord.EmployNO, isIn, facerecord.DateTimeRecord.Value);
APIPersonService.getPersonInOut(getPerson, isIn, facerecord.DateTimeRecord.Value);
}
}
}
@@ -393,15 +393,20 @@ 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);
}
}
}
@@ -438,7 +443,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
{
@@ -455,7 +464,6 @@ namespace WebAPI.Controllers
return responeData;
}
#endregion
#region 获取门禁人员考勤统计
/// <summary>
/// 获取人员信息出入场记录
SGGL/WebAPI/Controllers/FaceController.cs
+26 -13
View File
@@ -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
{
SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs
+8
View File
@@ -224,6 +224,14 @@ namespace WebAPI.Controllers
TestPlanId = getTestPlan.TestPlanId,
TestManId = personId,
};
if (string.IsNullOrEmpty(newTestRecord.TestType))
{
var getTrainTypeName = Funs.DB.Training_TestPlan.FirstOrDefault(x => x.TestPlanId == newTestRecord.TestPlanId);
if (getTrainTypeName != null)
{
newTestRecord.TestType = getTrainTypeName.PlanName;
}
}
TestRecordService.AddTestRecord(newTestRecord);
responeData.code = 3;
responeData.message = "您已加入考试计划！";
SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs
+12 -8
View File
@@ -322,13 +322,17 @@ namespace WebAPI.Controllers
if (getItem != null)
{
APITestRecordService.getTestRecordItemAnswerBySelectedItem(getItem, selectedItem);
//更新没有结束时间且超时的考试记录
int closeCount = TestRecordService.UpdateTestEndTimeNull(getItem.TestRecordId);
if (closeCount > 0)
var testRecord = Funs.DB.Training_TestRecord.FirstOrDefault(x => x.TestRecordId == getItem.TestRecordId && x.TestStartTime.Value.AddMinutes(x.Duration) < DateTime.Now);
if (testRecord != null)
{
responeData.code = 2;
responeData.message = "本次考试已结束，系统自动交卷！";
}
//更新没有结束时间且超时的考试记录
int closeCount = TestRecordService.UpdateTestEndTimeNull(getItem.TestRecordId);
if (closeCount > 0)
{
responeData.code = 2;
responeData.message = "本次考试已结束，系统自动交卷！";
}
}
}
else
{
@@ -375,13 +379,13 @@ namespace WebAPI.Controllers
}
else
{
APITestRecordService.updateAll(getTestRecord.TestPlanId);
//APITestRecordService.updateAll(getTestRecord.TestPlanId);
responeData.message = "考试不合格！您的成绩为：【" + getTestScores.ToString() + "】，请再次参加培训后补考。";
}
}
else
{
APITestRecordService.updateAll(getTestRecord.TestPlanId);
//APITestRecordService.updateAll(getTestRecord.TestPlanId);
responeData.message = "恭喜考试通过！您的成绩为：【" + getTestScores.ToString() + "】。";
}
SGGL/WebAPI/Controllers/HSSE/TestingController.cs
+14 -13
View File
@@ -301,17 +301,18 @@ namespace WebAPI.Controllers
var getItem = TestRecordItemService.GetTestRecordItemTestRecordItemId(testRecordItemId);
if (getItem != null)
{
//更新没有结束时间且超时的考试记录
int closeCount = TestRecordService.UpdateTestEndTimeNull(getItem.TestRecordId);
if (closeCount > 0)
{
responeData.code = 2;
responeData.message = "本次考试已结束，系统自动交卷！";
}
else
{
APITestRecordService.getTestRecordItemAnswerBySelectedItem(getItem, selectedItem);
}
APITestRecordService.getTestRecordItemAnswerBySelectedItem(getItem, selectedItem);
var testRecord = Funs.DB.Training_TestRecord.FirstOrDefault(x => x.TestRecordId == getItem.TestRecordId && x.TestStartTime.Value.AddMinutes(x.Duration) < DateTime.Now);
if (testRecord != null)
{
//更新没有结束时间且超时的考试记录
int closeCount = TestRecordService.UpdateTestEndTimeNull(getItem.TestRecordId);
if (closeCount > 0)
{
responeData.code = 2;
responeData.message = "本次考试已结束，系统自动交卷！";
}
}
}
else
{
@@ -358,13 +359,13 @@ namespace WebAPI.Controllers
}
else
{
APITestRecordService.updateAll(getTestRecord.TestPlanId);
// APITestRecordService.updateAll(getTestRecord.TestPlanId);
responeData.message = "考试不合格！您的成绩为：【" + getTestScores.ToString() + "】，请再次参加培训后补考。";
}
}
else
{
APITestRecordService.updateAll(getTestRecord.TestPlanId);
// APITestRecordService.updateAll(getTestRecord.TestPlanId);
responeData.message = "恭喜考试通过！您的成绩为：【" + getTestScores.ToString() + "】。";
}