ting.yin 1 年間 前
コミット
49005e5c2e

+ 2 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/ExamInfoController.java

@@ -90,7 +90,8 @@ public class ExamInfoController extends BaseApiController {
                         fileService.getFileServer() + fileService.getCardUri(exam.getId(), exam.getCardType()));
             }
             obj.accumulate("sliceConfig", StringUtils.trimToEmpty(exam.getSliceConfig()));
-            obj.accumulate("updateTime", exam.getUpdateTime().getTime());
+            obj.accumulate("updateTime", exam.getUpdateTime() == null ? exam.getCreateTime().getTime() : exam
+                    .getUpdateTime().getTime());
             array.add(obj);
         }
         return array;

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

@@ -1210,9 +1210,9 @@ CREATE TABLE `eb_answer_card_subject`
 	`id`           		int(11)     	NOT NULL AUTO_INCREMENT COMMENT '主键',
     `exam_id`			int(11)     	NOT NULL COMMENT '考试ID',
     `card_number`		int(11)     	NOT NULL COMMENT '卡格式号',
-  	`subjectCode`		varchar(128)	NOT NULL COMMENT '科目代码',
+  	`subject_code`		varchar(128)	NOT NULL COMMENT '科目代码',
   PRIMARY KEY (`id`),
-  UNIQUE KEY `index1` (`exam_id`,`card_number`,`subjectCode`)
+  UNIQUE KEY `index1` (`exam_id`,`card_number`,`subject_code`)
 )  ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='卡格式科目关联关系';
   

+ 2 - 2
stmms-web/src/main/webapp/sql/upgrade/1.3.14.sql

@@ -81,9 +81,9 @@ CREATE TABLE `eb_answer_card_subject`
 	`id`           		int(11)     	NOT NULL AUTO_INCREMENT COMMENT '主键',
     `exam_id`			int(11)     	NOT NULL COMMENT '考试ID',
     `card_number`		int(11)     	NOT NULL COMMENT '卡格式号',
-  	`subjectCode`		varchar(128)	NOT NULL COMMENT '科目代码',
+  	`subject_code`		varchar(128)	NOT NULL COMMENT '科目代码',
   PRIMARY KEY (`id`),
-  UNIQUE KEY `index1` (`exam_id`,`card_number`,`subjectCode`)
+  UNIQUE KEY `index1` (`exam_id`,`card_number`,`subject_code`)
 )  ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='卡格式科目关联关系';