fix

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

@@ -156,9 +156,10 @@ public class TaskServiceImpl implements TaskService {
         if (history != null) {
             sItems = history.getScoreItemList();
         }
+        ExamSubject subject = subjectService.find(group.getExamId(), group.getSubjectCode());
         for (int i = 0; i < sList.size(); i++) {
             ExamQuestion question = sList.get(i);
-            MarkStepDTO step = buildStep(question);
+            MarkStepDTO step = buildStep(question, subject.getDisplayQuestionName());
             if (history != null) {
                 if (!sItems.isEmpty() && sItems.size() == sList.size()) {
                     step.setScore(sItems.get(i).getScore());
@@ -276,9 +277,10 @@ public class TaskServiceImpl implements TaskService {
         if (rejectHistory != null) {
             rItems = rejectHistory.getRejectScoreItems();
         }
+        ExamSubject subject = subjectService.find(group.getExamId(), group.getSubjectCode());
         for (int i = 0; i < sList.size(); i++) {
             ExamQuestion question = sList.get(i);
-            MarkStepDTO step = buildStep(question);
+            MarkStepDTO step = buildStep(question, subject.getDisplayQuestionName());
             if (library != null) {
                 if (!sItems.isEmpty() && sItems.size() == sList.size()) {
                     step.setScore(sItems.get(i).getScore());
@@ -320,9 +322,10 @@ public class TaskServiceImpl implements TaskService {
             tracks = trialService.findTrack(library.getId());
             sItems = library.getScoreList();
         }
+        ExamSubject subject = subjectService.find(group.getExamId(), group.getSubjectCode());
         for (int i = 0; i < sList.size(); i++) {
             ExamQuestion question = sList.get(i);
-            MarkStepDTO step = buildStep(question);
+            MarkStepDTO step = buildStep(question, subject.getDisplayQuestionName());
             if (!sItems.isEmpty() && sItems.size() == sList.size()) {
                 step.setScore(sItems.get(i).getScore());
             }
@@ -341,11 +344,13 @@ public class TaskServiceImpl implements TaskService {
         return list;
     }
 
-    private MarkStepDTO buildStep(ExamQuestion question) {
+    private MarkStepDTO buildStep(ExamQuestion question, Boolean displayQuestionName) {
         MarkStepDTO step = new MarkStepDTO();
         step.setMainNumber(question.getMainNumber());
         step.setSubNumber(question.getSubNumber());
-        step.setQuestionName(question.getName());
+        if (displayQuestionName) {
+            step.setQuestionName(question.getName());
+        }
         step.setGroupNumber(question.getGroupNumber());
         step.setTitle(question.getMainTitle());
         step.setDefaultScore(0d);
@@ -457,6 +462,7 @@ public class TaskServiceImpl implements TaskService {
         for (SelectiveGroup selectiveGroup : selectiveGroups) {
             map.put(selectiveGroup.getMainNumber(), selectiveGroup);
         }
+        ExamSubject subject = subjectService.find(student.getExamId(), student.getSubjectCode());
         List<SubjectiveScore> scoreList = scoreService.findByStudentId(student.getId());
         // List<ScoreItem> sItems = student.getScoreList(false);
         for (int i = 0; i < scoreList.size(); i++) {
@@ -465,7 +471,7 @@ public class TaskServiceImpl implements TaskService {
             if (map.containsKey(question.getMainNumber())) {
                 question.setSelectiveIndex(map.get(question.getMainNumber()).getSelectiveIndex());
             }
-            MarkStepDTO step = buildStep(question);
+            MarkStepDTO step = buildStep(question, subject.getDisplayQuestionName());
             if (!scoreList.isEmpty() && scoreList.size() == sList.size()) {
                 step.setScore(scoreList.get(i).getScore());
                 if (mainList.contains(step.getMainNumber())) {

stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -750,7 +750,6 @@ public class MarkController extends BaseController {
                 examSubject.getEnableSplit() == null ? exam.isEnableSplit() : examSubject.getEnableSplit());
         setting.accumulate("autoScroll",
                 examSubject.getAutoScroll() == null ? exam.isAutoScroll() : examSubject.getAutoScroll());
-        setting.accumulate("display_question_name", examSubject.getDisplayQuestionName());
         JSONObject subject = new JSONObject();
         subject.accumulate("name", examSubject.getName());
         subject.accumulate("code", examSubject.getCode());