瀏覽代碼

暂时修复globalResult方法报错的bug

4228306 5 年之前
父節點
當前提交
7a13689532

+ 0 - 9
src/main/java/edu/math/diagnosis/model/ChapterAbilityVo.java

@@ -4,7 +4,6 @@ package edu.math.diagnosis.model;
 public class ChapterAbilityVo {
     private String chapter;
     private String knowledgeCode;
-    private String knowledgeContent;
     private Integer keep;
     private String abilityCodes;
 
@@ -24,14 +23,6 @@ public class ChapterAbilityVo {
         this.knowledgeCode = knowledgeCode;
     }
 
-    public String getKnowledgeContent() {
-        return knowledgeContent;
-    }
-
-    public void setKnowledgeContent(String knowledgeContent) {
-        this.knowledgeContent = knowledgeContent;
-    }
-
     public Integer getKeep() {
         return keep;
     }

+ 4 - 3
src/main/java/edu/math/diagnosis/service/PaperResultService.java

@@ -487,7 +487,7 @@ public class PaperResultService {
             ChapterAbilityVo vo = new ChapterAbilityVo();
             vo.setChapter(k.getChapter());
             vo.setKnowledgeCode(k.getCode());
-            vo.setKnowledgeContent(k.getContent());
+//            vo.setKnowledgeContent(k.getContent());
             // 设置该知识点掌握程度
             vo.setKeep(tagKeep.getOrDefault(k.getCode(), 0));
             vo.setAbilityCodes(k.getAbilityCodes());
@@ -541,7 +541,7 @@ public class PaperResultService {
             String code = entry.getKey();
             AbilityEvaluateVo vo = new AbilityEvaluateVo();
             vo.setAbilityCode(code);
-            vo.setScore(scores.get(code));
+            vo.setScore(scores.getOrDefault(code,0D));
 
             ScoreSegment scoreSegment = scoreSegmentService.getLevel(vo.getScore(), scoreSegments, abilities.get(code), subject);
             vo.setEvaluate(scoreSegment.getEvaluate());
@@ -549,7 +549,8 @@ public class PaperResultService {
 
             Set<String> ks = entry.getValue();
             List<Integer> keep = new ArrayList<>();
-            ks.forEach(k -> keep.add(tagKeep.get(k)));
+            //未掌握的为0
+            ks.forEach(k -> keep.add(tagKeep.getOrDefault(k,0)));
             vo.setKeep(keep);
             evaluates.put(abilities.get(code), vo);
         }