xiatian 11 saat önce
ebeveyn
işleme
a9a768a197

+ 2 - 2
install/mysql/init/stmms_ft.sql

@@ -108,8 +108,8 @@ CREATE TABLE `b_user`
     `description`               varchar(128) DEFAULT NULL COMMENT '描述',
     `empno`                     varchar(128) DEFAULT NULL COMMENT '工号',
     `random_password`           varchar(64)  DEFAULT NULL COMMENT '随机密码',
-    `student_export_cols`        varchar(500) DEFAULT NULL COMMENT '学生列表导出表头',
-    `score_export_cols`        varchar(500) DEFAULT NULL COMMENT '成绩列表导出表头',
+    `student_export_cols`        varchar(1000) DEFAULT NULL COMMENT '学生列表导出表头',
+    `score_export_cols`        varchar(1000) DEFAULT NULL COMMENT '成绩列表导出表头',
     PRIMARY KEY (`id`),
     UNIQUE KEY `index1` (`login_name`),
     UNIQUE KEY `index2` (`school_id`, `related_account`),

+ 2 - 2
install/mysql/upgrade/2.0.0.sql

@@ -12,8 +12,8 @@ ALTER TABLE eb_exam ADD COLUMN `answer_ai_check` tinyint(1)  NOT NULL DEFAULT 0
 ALTER TABLE eb_exam ADD COLUMN `ai_check_finish_time`           datetime     DEFAULT NULL COMMENT 'AI检测完成时间';
 ALTER TABLE eb_exam DROP COLUMN `exam_time`;
 
-ALTER TABLE b_user ADD COLUMN   `student_export_cols`        varchar(500) DEFAULT NULL COMMENT '学生列表导出表头',
-ALTER TABLE b_user ADD COLUMN   `score_export_cols`        varchar(500) DEFAULT NULL COMMENT '成绩列表导出表头',
+ALTER TABLE b_user ADD COLUMN   `student_export_cols`        varchar(1000) DEFAULT NULL COMMENT '学生列表导出表头',
+ALTER TABLE b_user ADD COLUMN   `score_export_cols`        varchar(1000) DEFAULT NULL COMMENT '成绩列表导出表头',
 
 ALTER TABLE eb_marker ADD COLUMN `wait_arbitrate_count` int(11)     DEFAULT NULL COMMENT '待仲裁数';
 

+ 31 - 0
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/bean/EnumVo.java

@@ -0,0 +1,31 @@
+package cn.com.qmth.stmms.biz.exam.bean;
+
+public class EnumVo {
+
+    private String code;
+
+    private String name;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public EnumVo(String code, String name) {
+        super();
+        this.code = code;
+        this.name = name;
+    }
+
+}

+ 4 - 0
stmms-common/pom.xml

@@ -15,6 +15,10 @@
     <url>http://maven.apache.org</url>
 
     <dependencies>
+                <dependency>
+                <groupId>net.sf.json-lib</groupId>
+                <artifactId>json-lib-ext-spring</artifactId>
+            </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>

+ 7 - 3
stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/admin/CheckStudentController.java

@@ -1,7 +1,6 @@
 package cn.com.qmth.stmms.api.controller.admin;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
@@ -14,6 +13,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.qmth.boot.core.collection.PageResult;
 
 import cn.com.qmth.stmms.api.controller.BaseApiController;
+import cn.com.qmth.stmms.biz.exam.bean.EnumVo;
 import cn.com.qmth.stmms.biz.exam.bean.StudentCheckVo;
 import cn.com.qmth.stmms.biz.exam.model.CheckStudent;
 import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
@@ -42,8 +42,12 @@ public class CheckStudentController extends BaseApiController {
     @ApiOperation(value = "确认类型")
     @RequestMapping(value = "types", method = RequestMethod.POST)
     @ResponseBody
-    public List<CheckType> typeList() {
-        return Arrays.asList(CheckType.values());
+    public List<EnumVo> typeList() {
+        List<EnumVo> ret = new ArrayList<>();
+        for (CheckType e : CheckType.values()) {
+            ret.add(new EnumVo(e.name(), e.getName()));
+        }
+        return ret;
     }
 
     @Logging(menu = "人工确认查询", type = LogType.QUERY)