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/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() + "】。";
}