From 236336e70a66d2aeab83ddbf6bd80a26537ba100 Mon Sep 17 00:00:00 2001
From: yz <3614508250@qq.com>
Date: Thu, 19 Dec 2024 15:15:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9F=A5=E8=AF=86=E6=A6=82?=
 =?UTF-8?q?=E8=A6=81=E7=AE=97=E5=88=86=EF=BC=8C=E6=A1=88=E4=BE=8B=E9=A2=98?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/stu/StuKnowledgeNote.java                 | 9 +++++----
 .../service/tea/impl/TeaCaseStepServiceImpl.java         | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

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;
         }
     }
 }