Merge branch 'refs/heads/zcwy0622-yang' into dev0525

This commit is contained in:
yang
2024-07-11 11:07:44 +08:00
2 changed files with 6 additions and 6 deletions

View File

@@ -101,10 +101,10 @@ public class SaveExamScoreDto {
private LocalDateTime endTime;
/**
* 完成状态
*/
private Integer status;
// /**
// * 完成状态
// */
// private Integer status;
// /**
// * 考试次数

View File

@@ -522,7 +522,7 @@ public class AloneExamServiceImpl implements IAloneExamService{
if(examTest.getScoringType()!=null && examTest.getScoringType()==2) {
//最后一次的分数为准
aeDao.update(UpdateBuilder.from(AloneExam.class)
.addUpdateField("status", examScoreDto.getStatus())
.addUpdateField("status", AloneExamAnswer.STATUS_FINISH)
.addUpdateField("score", examScoreDto.getScore())
.addUpdateField("times", currentTimes+1)
.addFilter(FieldFilters.eq("aid", userId))
@@ -534,7 +534,7 @@ public class AloneExamServiceImpl implements IAloneExamService{
aeDao.updateMultiFieldById(aloneExam.getId(), UpdateBuilder.create("score", examScoreDto.getScore()), UpdateBuilder.create("times", currentTimes+1));
}
} else {
aeDao.updateMultiFieldById(aloneExam.getId(), UpdateBuilder.create("status", examScoreDto.getStatus()), UpdateBuilder.create("score", examScoreDto.getScore()), UpdateBuilder.create("times", currentTimes+1));
aeDao.updateMultiFieldById(aloneExam.getId(), UpdateBuilder.create("status", AloneExamAnswer.STATUS_FINISH), UpdateBuilder.create("score", examScoreDto.getScore()), UpdateBuilder.create("times", currentTimes+1));
}
}