fixbugs

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

@@ -44,6 +44,7 @@ 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;
+import cn.com.qmth.stmms.common.enums.SubjectiveStatus;
 
 /**
  * 评卷任务服务实现
@@ -360,8 +361,10 @@ public class TaskServiceImpl implements TaskService {
             task.setSheetUrls(fileService.getSheetUris(student.getExamId(), student.getExamNumber(), 1,
                     student.getSheetCount()));
         }
-        task.setQuestionList(buildMarkStep(student));
-        task.setSpecialTagList(getMarkSpecialTagList(student));
+        if (!student.getSubjectiveStatus().equals(SubjectiveStatus.UNMARK)) {
+            task.setQuestionList(buildMarkStep(student));
+            task.setSpecialTagList(getMarkSpecialTagList(student));
+        }
         if (StringUtils.isNotBlank(student.getObjectiveScoreList())) {
             task.setObjectiveScore(student.getObjectiveScore());
         }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ProblemHistoryController.java

@@ -30,6 +30,7 @@ import cn.com.qmth.stmms.biz.mark.model.ProblemType;
 import cn.com.qmth.stmms.biz.mark.query.ProblemHistorySearchQuery;
 import cn.com.qmth.stmms.biz.mark.service.ProblemHistoryService;
 import cn.com.qmth.stmms.biz.mark.service.ProblemTypeService;
+import cn.com.qmth.stmms.biz.user.service.UserService;
 import cn.com.qmth.stmms.common.annotation.Logging;
 import cn.com.qmth.stmms.common.domain.WebUser;
 import cn.com.qmth.stmms.common.enums.HistoryStatus;
@@ -65,6 +66,9 @@ public class ProblemHistoryController extends BaseExamController {
     @Autowired
     private ExamQuestionService questionService;
 
+    @Autowired
+    private UserService userService;
+
     @Logging(menu = "问题卷查询", type = LogType.QUERY)
     @RequestMapping
     public String list(HttpServletRequest request, Model model, ProblemHistorySearchQuery query) {
@@ -91,6 +95,7 @@ public class ProblemHistoryController extends BaseExamController {
             student.setProblemType(problemMap.get(history.getProblemId()));
             student.setMarkTime(DateUtils.formatDateTime(history.getCreateTime()));
             student.setLibraryId(history.getLibraryId());
+            student.setMarkLogin(userService.findById(history.getUserId()).getLoginName());
             list.add(student);
         }
         model.addAttribute("resultList", list);