打回分数显示

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/model/Task.java

@@ -119,6 +119,12 @@ public class Task implements Serializable {
      * 打回上次分数
      */
     private String rejectScoreList;
+    
+    
+    /**
+     * 打回后的分数
+     */
+    private String afterRejectScoreList;
 
     /**
      * 评卷员登录名
@@ -335,4 +341,12 @@ public class Task implements Serializable {
         this.headerTagList = headerTagList;
     }
 
+	public String getAfterRejectScoreList() {
+		return afterRejectScoreList;
+	}
+
+	public void setAfterRejectScoreList(String afterRejectScoreList) {
+		this.afterRejectScoreList = afterRejectScoreList;
+	}
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/TaskServiceImpl.java

@@ -8,8 +8,6 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,7 +23,6 @@ import cn.com.qmth.stmms.biz.exam.service.ExamService;
 import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
 import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
 import cn.com.qmth.stmms.biz.exam.service.MarkGroupService;
-import cn.com.qmth.stmms.biz.exam.service.MarkerService;
 import cn.com.qmth.stmms.biz.exam.service.SelectiveGroupService;
 import cn.com.qmth.stmms.biz.exam.service.SubjectiveScoreService;
 import cn.com.qmth.stmms.biz.file.service.FileService;
@@ -54,7 +51,6 @@ import cn.com.qmth.stmms.biz.mark.service.MarkTrackService;
 import cn.com.qmth.stmms.biz.mark.service.RejectHistoryService;
 import cn.com.qmth.stmms.biz.mark.service.TaskService;
 import cn.com.qmth.stmms.biz.mark.service.TrialService;
-import cn.com.qmth.stmms.biz.user.service.UserService;
 import cn.com.qmth.stmms.biz.utils.ScoreItem;
 import cn.com.qmth.stmms.common.enums.ExamType;
 import cn.com.qmth.stmms.common.enums.LibraryStatus;
@@ -69,8 +65,6 @@ import cn.com.qmth.stmms.common.enums.SubjectiveStatus;
 @Service("taskService")
 public class TaskServiceImpl implements TaskService {
 
-    private static Logger log = LoggerFactory.getLogger(TaskServiceImpl.class);
-
     public static final double UN_SELECTIVE_SCORE = -1;
 
     @Autowired
@@ -97,18 +91,12 @@ public class TaskServiceImpl implements TaskService {
     @Autowired
     private HeaderTagDao headerTagDao;
 
-    @Autowired
-    private MarkerService markerService;
-
     @Autowired
     private TrialService trialService;
 
     @Autowired
     private ExamSubjectService subjectService;
 
-    @Autowired
-    private UserService userService;
-
     @Autowired
     private FileService fileService;
 
@@ -230,6 +218,7 @@ public class TaskServiceImpl implements TaskService {
             task.setRejectReason(library.getRejectReason());
             if (exam.isShowReject()) {
                 task.setRejectScoreList(rejectHistory == null ? null : rejectHistory.getScoreList());
+                task.setAfterRejectScoreList(rejectHistory == null ? null : rejectHistory.getRejectScoreList());
             }
         }
         if (library.getStatus() == LibraryStatus.MARKED || library.getStatus() == LibraryStatus.INSPECTED) {