fix bugs

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

@@ -1,15 +1,16 @@
 package cn.com.qmth.stmms.biz.mark.service.Impl;
 
-import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import cn.com.qmth.stmms.biz.mark.query.MarkLibrarySearchQuery;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -42,6 +43,7 @@ import cn.com.qmth.stmms.biz.mark.model.MarkTrack;
 import cn.com.qmth.stmms.biz.mark.model.ProblemHistory;
 import cn.com.qmth.stmms.biz.mark.model.TrialHistory;
 import cn.com.qmth.stmms.biz.mark.model.TrialLibrary;
+import cn.com.qmth.stmms.biz.mark.query.MarkLibrarySearchQuery;
 import cn.com.qmth.stmms.biz.mark.service.MarkService;
 import cn.com.qmth.stmms.biz.mark.service.ProblemHistoryService;
 import cn.com.qmth.stmms.biz.utils.FormalTaskUtil;

stmms-web/src/main/java/cn/com/qmth/stmms/admin/utils/UpyunConfig.java

@@ -24,6 +24,9 @@ public class UpyunConfig {
     @Value("${upyun.slice.password}")
     private String slicePassword;
 
+    @Value("${upyun.media.bucket}")
+    private String mediaBucket;
+
     public String getSheetBucket() {
         return sheetBucket;
     }
@@ -47,4 +50,9 @@ public class UpyunConfig {
     public String getSlicePassword() {
         return slicePassword;
     }
+
+    public String getMediaBucket() {
+        return mediaBucket;
+    }
+
 }

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/jsonView.jsp

@@ -30,7 +30,11 @@ $(document).ready(function() {
 });
 
 function initJsonPopover(url,questionNumbers){
-
+	questionNumbers = questionNumbers.split(",");
+	let questionArr = {};
+	questionNumbers.forEach(questionNumber => {
+		questionArr[questionNumber] = true;
+    });
 	$('#json-view-content').empty();
     $.ajax({  
         type:"GET",  
@@ -42,7 +46,7 @@ function initJsonPopover(url,questionNumbers){
          	let questions = data || [];
          	questions.forEach(question => {
                  // 按题号过滤
-                 if (questionNumbers[question.mainNumber + "." + question.subNumber] === true || questionNumbers=="") {
+                 if (questionArr[question.mainNumber + "." + question.subNumber] === true || questionNumbers=="") {
                      let numberTitle = {
                          "blocks": [{
                              "type": "text",

stmms-web/src/main/webapp/sql/stmms_ft.sql

@@ -518,13 +518,13 @@ DROP TABLE IF EXISTS `m_problem_history`;
 CREATE TABLE `m_problem_history` (
   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增主键',
   `exam_id` int(11) NOT NULL COMMENT '考试ID',
-  `subject_code` varchar(32) NOT NULL COMMENT '科目代码',
+  `subject_code` varchar(64) NOT NULL COMMENT '科目代码',
   `group_number` int(11) NOT NULL COMMENT '大题号',
   `student_id` int(11) NOT NULL COMMENT '考生ID',
   `exam_number` varchar(64) NOT NULL COMMENT '准考证号',
   `library_id` int(11) NOT NULL COMMENT '评卷任务ID',
   `problem_id` int(11) NOT NULL COMMENT '问题ID',
-  `status` int(11) NOT NULL COMMENT '状态',
+  `status` varchar(32) NOT NULL COMMENT '状态',
   `user_id` int(11) DEFAULT NULL COMMENT '处理人ID',
   `total_score` double DEFAULT NULL COMMENT '总分',
   `score_list` varchar(255) DEFAULT NULL COMMENT '给分明细',