diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuKnowledgeNote.java b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuKnowledgeNote.java index 8d792be..7fbe415 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuKnowledgeNote.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuKnowledgeNote.java @@ -182,14 +182,12 @@ public class StuKnowledgeNote { @RequestParam String systemOwner, @RequestParam String trainingId) { StuTrainingWithBLOBs stuTrainingWithBLOBs = stuTrainingMapper.selectByPrimaryKey(trainingId); - if (stuTrainingWithBLOBs.getKnowledgeSummaryCompleteStatus() != null) { - //不为空直接返回 - return new ResultEntity<>(stuTrainingWithBLOBs.getKnowledgeSummaryScore()); - } //为空设置 SysWeight sysWeight = iTeaGradeManageService.getSysWeightResultEntity(courseId, schoolId, systemOwner); BigDecimal knowledgeSummaryDefaultRule = sysWeight.getKnowledgeSummaryDefaultRule(); + Integer knowledgeSummaryCompleteStatus = stuTrainingWithBLOBs.getKnowledgeSummaryCompleteStatus()==null?0:stuTrainingWithBLOBs.getKnowledgeSummaryCompleteStatus(); + minutes=minutes+knowledgeSummaryCompleteStatus; if (minutes < 1) { stuTrainingWithBLOBs.setKnowledgeSummaryScore(BigDecimal.ZERO); } else if (minutes == 1) { @@ -198,6 +196,9 @@ public class StuKnowledgeNote { int extraMinutes = minutes - 1; int totalScore = 60 + extraMinutes * 10; knowledgeSummaryDefaultRule = BigDecimal.valueOf(totalScore); + if(knowledgeSummaryDefaultRule.compareTo(BigDecimal.valueOf(100))>0){ + knowledgeSummaryDefaultRule= BigDecimal.valueOf(100); + } stuTrainingWithBLOBs.setKnowledgeSummaryScore(knowledgeSummaryDefaultRule); } stuTrainingWithBLOBs.setKnowledgeSummaryCompleteStatus(minutes); diff --git a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaCaseStepServiceImpl.java b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaCaseStepServiceImpl.java index bdef376..57a3d44 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaCaseStepServiceImpl.java +++ b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaCaseStepServiceImpl.java @@ -148,7 +148,7 @@ public class TeaCaseStepServiceImpl implements ITeaCaseStepService { StuTrainingStepRecord stepRecord = stuTrainingStepRecords.get(0); stepRecord.setStuAnswer(commitCaseDto.getStuAnswer()); trainingStepRecordMapper.updateByPrimaryKeyWithBLOBs(stepRecord); - return false; + return true; } } }