更新文件 SmartEvaluateStudentController.java

src/main/java/com/template/controller/SmartEvaluateStudentController.java

@@ -221,7 +221,7 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
                 double min = Double.parseDouble(range[0]);
                 double max = Double.parseDouble(range[1]);
                 if (smartEvaluateSdetail.getScoreNum()>=min && smartEvaluateSdetail.getScoreNum()<=max){
-                    scoreLevel = rule.get(i).getLevel();
+                    scoreLevel = rule.get(j).getLevel();
                     break;
                 }
             }
@@ -234,7 +234,7 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
             }
         }
         student.setScoreComment(smartEvaluateSdetailList.getScoreComment());
-        student.setScoreNum(total);
+        student.setScoreNum(total/scoreList.size());
         String scoreLevel = "";
         QueryWrapper<SmartSubjectRule> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("deleted", 0);
@@ -244,7 +244,7 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
             String[] range = rule.get(i).getScoreRange().split("-");
             double min = Double.parseDouble(range[0]);
             double max = Double.parseDouble(range[1]);
-            if (total>=min && total<=max){
+            if (student.getScoreNum()>=min && student.getScoreNum()<=max){
                 scoreLevel = rule.get(i).getLevel();
                 break;
             }
@@ -253,4 +253,25 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
         smartEvaluateStudentService.updateSmartEvaluateStudent(student);
         return CommonResult.ok();
     }
+
+    @PassToken
+    public CommonResult queryDetailScore(Integer id){
+        if (id==null){
+            return CommonResult.fail("请传入id");
+        }
+        SmartEvaluateStudent smartEvaluateStudent = smartEvaluateStudentService.getSmartEvaluateStudentById(id);
+        if (smartEvaluateStudent==null){
+            return CommonResult.fail("未查询到相关信息");
+        }
+        QueryWrapper<SmartEvaluateSdetail> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("deleted", 0);
+        queryWrapper1.eq("term", smartEvaluateStudent.getTerm());
+        queryWrapper1.eq("card_no", smartEvaluateStudent.getCardNo());
+        List<SmartEvaluateSdetail> list = smartEvaluateSdetailService.getSmartEvaluateSdetailByKey(queryWrapper1);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("id", smartEvaluateStudent.getId());
+        jsonObject.put("scoreComment",smartEvaluateStudent.getScoreComment());
+        jsonObject.put("scoreList", list);
+        return CommonResult.ok(jsonObject);
+    }
 }