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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC

This commit is contained in:
gaofei 2022-06-14 18:22:16 +08:00
parent 0d681e07ac b913f49cd8
commit aac119e751
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DataBase/版本日志/SGGLDB_V2022-06-14-001.sql Normal file
View File

@ -0,0 +1,7 @@
--修复试卷统计与成绩不符
UPDATE Training_TestRecord SET Training_TestRecord.TestScores =item.SCore
from (SELECT SUM(SubjectScore) AS SCore,TestRecordId FROM Training_TestRecordItem
GROUP BY TestRecordId) item
where Training_TestRecord.TestRecordId=item.TestRecordId AND Training_TestRecord.TestEndTime IS NOT NULL
AND item.SCore != Training_TestRecord.TestScores AND item.SCore IS NOT NULL
GO

3
DataBase/版本日志/SGGLDB_V2022-06-14-001修改明细.txt Normal file
View File

@ -0,0 +1,3 @@
--ADD BY Yanghongwei 2022-06-14
1、修复考试成绩与试卷分值不符情况
--END

3
SGGL/BLL/API/APIPersonService.cs
View File

@ -470,7 +470,8 @@ namespace BLL
List<string> unitIdList = Funs.GetStrListByStr(unitIds, ',');
var getPersons = from x in db.View_SitePerson_Person
where x.ProjectId == projectId && unitIdList.Contains(x.UnitId) && x.IsUsed == true
&& x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime >= DateTime.Now)
//&& x.InTime <= DateTime.Now
&& (!x.OutTime.HasValue || x.OutTime >= DateTime.Now)
select new Model.PersonItem
{
PersonId = x.PersonId,

5
SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs
View File

@ -321,6 +321,7 @@ namespace WebAPI.Controllers
var getItem = TestRecordItemService.GetTestRecordItemTestRecordItemId(testRecordItemId);
if (getItem != null)
{
APITestRecordService.getTestRecordItemAnswerBySelectedItem(getItem, selectedItem);
//更新没有结束时间且超时的考试记录
int closeCount = TestRecordService.UpdateTestEndTimeNull(getItem.TestRecordId);
if (closeCount > 0)
@ -328,10 +329,6 @@ namespace WebAPI.Controllers
responeData.code = 2;
responeData.message = "本次考试已结束，系统自动交卷！";
}
else
{
APITestRecordService.getTestRecordItemAnswerBySelectedItem(getItem, selectedItem);
}
}
else
{