YuanPan 7 years ago
parent
commit
69e8be2374

+ 15 - 3
stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/assembler/ScoreAssembler.java

@@ -2,8 +2,10 @@ package cn.com.qmth.stmms.ms.admin.assembler;
 
 import cn.com.qmth.stmms.ms.admin.dto.ScoreCheckDTO;
 import cn.com.qmth.stmms.ms.admin.dto.ScoreItem;
+import cn.com.qmth.stmms.ms.commons.config.SystemConfig;
 import cn.com.qmth.stmms.ms.core.domain.Paper;
 import cn.com.qmth.stmms.ms.core.domain.Student;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -14,21 +16,31 @@ import java.util.List;
 @Component
 public class ScoreAssembler {
 
-    public ScoreCheckDTO toDTO(Student student, List<Paper> papers){
+    @Autowired
+    private SystemConfig systemConfig;
+
+    public ScoreCheckDTO toDTO(Student student, List<Paper> papers) {
         ScoreCheckDTO scoreDTO = null;
-        if(student != null){
+        if (student != null) {
             scoreDTO = new ScoreCheckDTO();
             scoreDTO.setName(student.getName());
             scoreDTO.setId(student.getId());
             scoreDTO.setAreaName(student.getAreaName());
             scoreDTO.setExamRoom(student.getExamRoom());
             scoreDTO.setExamNumber(student.getExamNumber());
-            for(Paper p : papers){
+            for (Paper p : papers) {
                 ScoreItem scoreItem = new ScoreItem();
                 scoreItem.setPaperId(p.getId());
                 scoreItem.setSubjectName(p.getSubject().getName());
                 scoreItem.setScore(p.getScore());
                 scoreItem.setSubject(p.getSubject());
+
+                String imgSrc = systemConfig.getImageUrl(p.getWorkId(), p.getSubject().toString(), p.getAreaCode(), p.getExamNumber());
+                String thumbSrc = systemConfig.getThumbUrl(p.getWorkId(), p.getSubject().toString(), p.getAreaCode(), p.getExamNumber());
+
+                scoreItem.setImgSrc(imgSrc);
+                scoreItem.setThumbSrc(thumbSrc);
+
                 scoreDTO.getScoreItems().add(scoreItem);
             }
         }

+ 18 - 0
stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/dto/ScoreItem.java

@@ -11,6 +11,8 @@ public class ScoreItem {
     private String subjectName;
     private Double score;
     private Long paperId;
+    private String imgSrc;
+    private String thumbSrc;
 
     public Subject getSubject() {
         return subject;
@@ -43,4 +45,20 @@ public class ScoreItem {
     public void setSubjectName(String subjectName) {
         this.subjectName = subjectName;
     }
+
+    public String getImgSrc() {
+        return imgSrc;
+    }
+
+    public void setImgSrc(String imgSrc) {
+        this.imgSrc = imgSrc;
+    }
+
+    public String getThumbSrc() {
+        return thumbSrc;
+    }
+
+    public void setThumbSrc(String thumbSrc) {
+        this.thumbSrc = thumbSrc;
+    }
 }