update

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/LoginController.java

@@ -1,20 +1,23 @@
 package cn.com.qmth.stmms.api.controller;
 
-import cn.com.qmth.stmms.biz.exam.service.SubjectUserService;
-import cn.com.qmth.stmms.common.annotation.RoleRequire;
-import cn.com.qmth.stmms.common.domain.ApiUser;
-import cn.com.qmth.stmms.common.enums.Role;
-import cn.com.qmth.stmms.common.utils.RequestUtils;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.http.HttpServletRequest;
+import cn.com.qmth.stmms.biz.exam.service.SubjectUserService;
+import cn.com.qmth.stmms.common.annotation.RoleRequire;
+import cn.com.qmth.stmms.common.domain.ApiUser;
+import cn.com.qmth.stmms.common.enums.Role;
+import cn.com.qmth.stmms.common.utils.RequestUtils;
 
 @Controller("loginApiController")
 @RequestMapping("/api")
@@ -36,9 +39,15 @@ public class LoginController extends BaseApiController {
         obj.accumulate("userRole", user.getRole().toString());
         obj.accumulate("campusId", 0);
         obj.accumulate("schoolId", user.getSchoolId());
+        JSONArray array = new JSONArray();
         if (user.getUserData() != null && Role.SUBJECT_HEADER.equals(user.getRole())) {
-            obj.accumulate("subjectCode", StringUtils.join(
-                    subjectUserService.findSubjectCode(user.getUserData().getId()), SUBJECT_CODE_SPLIT));
+            Set<String> set = subjectUserService.findSubjectCode(user.getUserData().getId());
+            for (String subjectCode : set) {
+                array.add(subjectCode);
+            }
+            obj.accumulate("subjectCode", array);
+        } else {
+            obj.accumulate("subjectCode", array);
         }
         return obj;
     }

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

@@ -962,43 +962,9 @@ CREATE TABLE `s_basic_subject_teacher_class`
     KEY `index1` (`exam_id`, `subject_code`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='任课老师班级统计表';
-
-
-# Dump of table s_range_subject
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `s_range_subject`;
-CREATE TABLE `s_range_subject`
-(
-    `id`            int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
-    `exam_id`       int(11)     DEFAULT NULL COMMENT '考试ID',
-    `subject_code`  varchar(32) DEFAULT NULL COMMENT '科目代码',
-    `subject_name`  varchar(32) DEFAULT NULL COMMENT '科目名称',
-    `subject_level` varchar(64) DEFAULT NULL COMMENT '科目层次',
-    `totalCount`    int(11)     DEFAULT NULL COMMENT '总人数',
-    `count0_49`     int(11)     DEFAULT NULL COMMENT '0-49',
-    `count50_59`    int(11)     DEFAULT NULL COMMENT '50-59',
-    `count60_69`    int(11)     DEFAULT NULL COMMENT '60-69',
-    `count70_79`    int(11)     DEFAULT NULL COMMENT '70-79',
-    `count80_89`    int(11)     DEFAULT NULL COMMENT '80-89',
-    `count90_100`   int(11)     DEFAULT NULL COMMENT '90-100',
-    `lt60`          int(11)     DEFAULT NULL COMMENT '<60',
-    `mte60`         int(11)     DEFAULT NULL COMMENT '>=60',
-    `percent0_49`   double  NOT NULL COMMENT '0-49占比',
-    `percent50_59`  double  NOT NULL COMMENT '50-59占比',
-    `percent60_69`  double  NOT NULL COMMENT '60-69占比',
-    `percent70_79`  double  NOT NULL COMMENT '70-79占比',
-    `percent80_89`  double  NOT NULL COMMENT '80-89占比',
-    `percent90_100` double  NOT NULL COMMENT '90-100占比',
-    `percent_lt60`  double  NOT NULL COMMENT '<60占比',
-    `percent_mte60` double  NOT NULL COMMENT '>=60占比',
-    PRIMARY KEY (`id`),
-    KEY `index1` (`exam_id`, `subject_code`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='分段统计表';
   
 
-# Dump of table b_school
+# Dump of table eb_import_query
 # ------------------------------------------------------------
 
 DROP TABLE IF EXISTS `eb_import_query`;