评卷员显示由姓名改为用户名

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/assembler/MarkTaskAssembler.java

@@ -11,7 +11,9 @@ import cn.com.qmth.stmms.ms.core.domain.Paper;
 import cn.com.qmth.stmms.ms.core.domain.Student;
 import cn.com.qmth.stmms.ms.core.domain.enums.TrialEnum;
 import cn.com.qmth.stmms.ms.core.domain.task.MarkTask;
+import cn.com.qmth.stmms.ms.core.domain.user.MarkUser;
 import cn.com.qmth.stmms.ms.core.repository.MarkLogRepo;
+import cn.com.qmth.stmms.ms.core.repository.MarkUserRepo;
 import cn.com.qmth.stmms.ms.core.repository.StudentRepo;
 import cn.com.qmth.stmms.ms.marking.dto.MarkTaskDTO;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -38,6 +40,9 @@ public class MarkTaskAssembler {
     @Autowired
     MarkLogRepo markLogRepo;
 
+    @Autowired
+    MarkUserRepo markUserRepo;
+
     public MarkTaskDTO toDTO(MarkTask markTask) {
 
         MarkTaskDTO markTaskDTO = null;
@@ -46,6 +51,8 @@ public class MarkTaskAssembler {
             markTaskDTO.setId(markTask.getId());
             markTaskDTO.setRejected(markTask.isRejected());
             markTaskDTO.setMarkerId(markTask.getMarkerId());
+            MarkUser markUser = markUserRepo.findOne(markTask.getMarkerId());
+            markTaskDTO.setLoginName(markUser.getLoginName());
             markTaskDTO.setMarker(markTask.getMarkerName());
             markTaskDTO.setUpdatedOn(markTask.getUpdatedOn());
             markTaskDTO.setResult(markTask.getResult());

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/dto/MarkTaskDTO.java

@@ -19,6 +19,7 @@ public class MarkTaskDTO implements Serializable{
     private String originLevel;
     private boolean isRejected;
     private Long markerId;
+    private String loginName;
     private String marker;
     private Date updatedOn;
     private String imgSrc;
@@ -241,4 +242,12 @@ public class MarkTaskDTO implements Serializable{
     public void setRejectedCount(Integer rejectedCount) {
         this.rejectedCount = rejectedCount;
     }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
 }