Browse Source

Merge branch 'dev_1.3.15' of http://git.qmth.com.cn/luoshi/stmms-ft.git into dev_1.3.15

xiatian 1 year ago
parent
commit
a8e6112a9f

+ 53 - 53
install/mysql/upgrade/1.3.14.sql

@@ -401,37 +401,37 @@ DROP TABLE IF EXISTS `b_role_temp`;
 
 use college_scan_multi;
 
-TRUNCATE TABLE absent;
-TRUNCATE TABLE append_scan;
-TRUNCATE TABLE baseinfo;
-TRUNCATE TABLE baseinfolog;
-TRUNCATE TABLE campus;
-TRUNCATE TABLE card_defcount;
+TRUNCATE TABLE college_scan_multi.absent;
+TRUNCATE TABLE college_scan_multi.append_scan;
+TRUNCATE TABLE college_scan_multi.baseinfo;
+TRUNCATE TABLE college_scan_multi.baseinfolog;
+TRUNCATE TABLE college_scan_multi.campus;
+TRUNCATE TABLE college_scan_multi.card_defcount;
 --  TRUNCATE TABLE import_sign_page;
-TRUNCATE TABLE kslb;
-TRUNCATE TABLE config;
-TRUNCATE TABLE registqty;
-TRUNCATE TABLE subject_code_kgt;
-TRUNCATE TABLE task_master;
-
--- DROP table check_omr;
--- drop table check_student;
--- drop table cliprect;
--- drop table objective;
--- drop table ocrdata;
--- drop table omrresult;
--- drop table registno;
--- drop table sign_page;
--- drop table task_child;
--- drop table upload_file_list;
--- drop table verify_check_info;
--- drop table import_sign_page;
+TRUNCATE TABLE college_scan_multi.kslb;
+TRUNCATE TABLE college_scan_multi.config;
+TRUNCATE TABLE college_scan_multi.registqty;
+TRUNCATE TABLE college_scan_multi.subject_code_kgt;
+TRUNCATE TABLE college_scan_multi.task_master;
+
+-- DROP table college_scan_multi.check_omr;
+-- drop table college_scan_multi.check_student;
+-- drop table college_scan_multi.cliprect;
+-- drop table college_scan_multi.objective;
+-- drop table college_scan_multi.ocrdata;
+-- drop table college_scan_multi.omrresult;
+-- drop table college_scan_multi.registno;
+-- drop table college_scan_multi.sign_page;
+-- drop table college_scan_multi.task_child;
+-- drop table college_scan_multi.upload_file_list;
+-- drop table college_scan_multi.verify_check_info;
+-- drop table college_scan_multi.import_sign_page;
 
 -- ----------------------------
 -- Table structure for upload_file_list
 -- ----------------------------
-DROP TABLE IF EXISTS `upload_file_list`;
-CREATE TABLE `upload_file_list` (
+DROP TABLE IF EXISTS college_scan_multi.`upload_file_list`;
+CREATE TABLE college_scan_multi.`upload_file_list` (
   `exam_id` int(11) NOT NULL,
   `subject_code` varchar(30) NOT NULL,
   `subject_name` varchar(50) DEFAULT NULL,
@@ -446,8 +446,8 @@ CREATE TABLE `upload_file_list` (
 -- ----------------------------
 -- Table structure for task_child
 -- ----------------------------
-DROP TABLE IF EXISTS `task_child`;
-CREATE TABLE `task_child` (
+DROP TABLE IF EXISTS college_scan_multi.`task_child`;
+CREATE TABLE college_scan_multi.`task_child` (
   `exam_id` int(11) NOT NULL,
   `exam_number` varchar(30) NOT NULL,
   `task_id` varchar(30) NOT NULL,
@@ -460,8 +460,8 @@ CREATE TABLE `task_child` (
 -- ----------------------------
 -- Table structure for sign_page
 -- ----------------------------
-DROP TABLE IF EXISTS `sign_page`;
-CREATE TABLE `sign_page` (
+DROP TABLE IF EXISTS college_scan_multi.`sign_page`;
+CREATE TABLE college_scan_multi.`sign_page` (
   `exam_id` int(11) NOT NULL,
   `exam_number` varchar(30) NOT NULL,
   `exam_site` varchar(50) DEFAULT NULL,
@@ -484,8 +484,8 @@ CREATE TABLE `sign_page` (
 -- ----------------------------
 -- Table structure for registno
 -- ----------------------------
-DROP TABLE IF EXISTS `registno`;
-CREATE TABLE `registno` (
+DROP TABLE IF EXISTS college_scan_multi.`registno`;
+CREATE TABLE college_scan_multi.`registno` (
   `DiskSerNo` varchar(30) DEFAULT NULL,
   `ExamId` int(11) NOT NULL,
   `RegistNo` varchar(30) NOT NULL,
@@ -505,8 +505,8 @@ CREATE TABLE `registno` (
 -- ----------------------------
 -- Table structure for omrresult
 -- ----------------------------
-DROP TABLE IF EXISTS `omrresult`;
-CREATE TABLE `omrresult` (
+DROP TABLE IF EXISTS college_scan_multi.`omrresult`;
+CREATE TABLE college_scan_multi.`omrresult` (
   `examid` int(11) DEFAULT '0',
   `subjectCode` varchar(30) DEFAULT NULL,
   `examNumber` varchar(30) DEFAULT '',
@@ -524,8 +524,8 @@ CREATE TABLE `omrresult` (
 -- ----------------------------
 -- Table structure for ocrdata
 -- ----------------------------
-DROP TABLE IF EXISTS `ocrdata`;
-CREATE TABLE `ocrdata` (
+DROP TABLE IF EXISTS college_scan_multi.`ocrdata`;
+CREATE TABLE college_scan_multi.`ocrdata` (
   `DiskSerNo` varchar(50) DEFAULT NULL,
   `DiskSerNo_KGT` varchar(50) DEFAULT NULL,
   `Batch` varchar(10) DEFAULT NULL,
@@ -590,8 +590,8 @@ CREATE TABLE `ocrdata` (
 -- ----------------------------
 -- Table structure for objective
 -- ----------------------------
-DROP TABLE IF EXISTS `objective`;
-CREATE TABLE `objective` (
+DROP TABLE IF EXISTS college_scan_multi.`objective`;
+CREATE TABLE college_scan_multi.`objective` (
   `DiskSerNo` varchar(50) DEFAULT NULL,
   `ExamID` int(11) NOT NULL,
   `SubjectCode` varchar(30) NOT NULL,
@@ -609,8 +609,8 @@ CREATE TABLE `objective` (
 -- ----------------------------
 -- Table structure for cliprect
 -- ----------------------------
-DROP TABLE IF EXISTS `cliprect`;
-CREATE TABLE `cliprect` (
+DROP TABLE IF EXISTS college_scan_multi.`cliprect`;
+CREATE TABLE college_scan_multi.`cliprect` (
   `ExamID` int(11) DEFAULT NULL,
   `DiskSerNo` varchar(30) DEFAULT NULL,
   `FormID` int(3) DEFAULT NULL,
@@ -621,8 +621,8 @@ CREATE TABLE `cliprect` (
 -- ----------------------------
 -- Table structure for check_student
 -- ----------------------------
-DROP TABLE IF EXISTS `check_student`;
-CREATE TABLE `check_student` (
+DROP TABLE IF EXISTS college_scan_multi.`check_student`;
+CREATE TABLE college_scan_multi.`check_student` (
   `exam_id` int(11) NOT NULL,
   `exam_site` varchar(50) DEFAULT NULL,
   `student_code` varchar(50) DEFAULT NULL,
@@ -649,8 +649,8 @@ CREATE TABLE `check_student` (
 -- ----------------------------
 -- Table structure for check_omr
 -- ----------------------------
-DROP TABLE IF EXISTS `check_omr`;
-CREATE TABLE `check_omr` (
+DROP TABLE IF EXISTS college_scan_multi.`check_omr`;
+CREATE TABLE college_scan_multi.`check_omr` (
   `exam_id` int(11) NOT NULL,
   `student_id` varchar(30) NOT NULL,
   `subject_code` varchar(30) NOT NULL,
@@ -674,8 +674,8 @@ CREATE TABLE `check_omr` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 
-DROP TABLE IF EXISTS `eb_exam_student`;
-CREATE TABLE `eb_exam_student` (
+DROP TABLE IF EXISTS college_scan_multi.`eb_exam_student`;
+CREATE TABLE college_scan_multi.`eb_exam_student` (
   `auid` int(11) NOT NULL AUTO_INCREMENT,
   `exam_id` int(11) NOT NULL COMMENT '考试ID',
   `school_id` int(11) NOT NULL COMMENT '学校ID',
@@ -706,10 +706,10 @@ CREATE TABLE `eb_exam_student` (
   KEY `package_code` (`package_code`),
   KEY `exam_site` (`exam_site`),
   KEY `exam_room` (`exam_room`)
-) ENGINE=InnoDB AUTO_INCREMENT=240437 DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-DROP TABLE IF EXISTS `ocrdata_history`;
-CREATE TABLE `ocrdata_history` (
+DROP TABLE IF EXISTS college_scan_multi.`ocrdata_history`;
+CREATE TABLE college_scan_multi.`ocrdata_history` (
   `remark` varchar(100) DEFAULT NULL,
   `DiskSerNo` varchar(50) DEFAULT NULL,
   `DiskSerNo_KGT` varchar(50) DEFAULT NULL,
@@ -757,8 +757,8 @@ CREATE TABLE `ocrdata_history` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 
-DROP TABLE IF EXISTS `import_sign_page`;
-CREATE TABLE `import_sign_page` (
+DROP TABLE IF EXISTS college_scan_multi.`import_sign_page`;
+CREATE TABLE college_scan_multi.`import_sign_page` (
   `exam_id` int(5) NOT NULL,
   `exam_site` varchar(50) DEFAULT NULL,
   `exam_room` varchar(100) DEFAULT NULL,
@@ -777,8 +777,8 @@ CREATE TABLE `import_sign_page` (
   KEY `subject_code` (`subject_code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-DROP TABLE IF EXISTS `verify_check_info`;
-CREATE TABLE `verify_check_info` (
+DROP TABLE IF EXISTS college_scan_multi.`verify_check_info`;
+CREATE TABLE college_scan_multi.`verify_check_info` (
   `exam_id` int(11) NOT NULL,
   `campus_code` int(30) DEFAULT NULL,
   `exam_number` varchar(30) NOT NULL,

+ 1 - 1
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/InspectHistoryDao.java

@@ -29,7 +29,7 @@ public interface InspectHistoryDao extends PagingAndSortingRepository<InspectHis
     InspectHistory findByStudentIdAndInspectRound(Integer studentId, Integer inspectRound);
 
     @Modifying
-    @Query(nativeQuery = true, value = "delete from eb_inspect_history m where m.student_id=?1 and m.inspect_round=(select es.inspect_round from eb_exam_subject es,eb_exam_student s where s.id=?1 and es.exam_id=s.exam_id and es.code=s.subject_code)")
+    @Query(nativeQuery = true, value = "delete from eb_inspect_history where student_id=?1 and inspect_round=(select es.inspect_round from eb_exam_subject es,eb_exam_student s where s.id=?1 and es.exam_id=s.exam_id and es.code=s.subject_code)")
     void deleteByStudentIdAndInspectRound(Integer studentId);
 
     @Modifying

+ 18 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/PaperController.java

@@ -243,6 +243,12 @@ public class PaperController extends BaseExamController {
                 for (MarkGroup markGroup : groups) {
                     maps.put(markGroup.getNumber(), markGroup);
                 }
+                List<SelectiveGroup> selectiveGroups = selectiveGroupService.findByExamIdAndSubjectCode(examId,
+                        subjectCode);
+                Map<Integer, SelectiveGroup> selectiveMap = new HashMap<Integer, SelectiveGroup>();
+                for (SelectiveGroup selectiveGroup : selectiveGroups) {
+                    selectiveMap.put(selectiveGroup.getMainNumber(), selectiveGroup);
+                }
                 List<ExamQuestion> subjectiveList = mainNumber == null ? questionService
                         .findByExamAndSubjectAndObjective(examId, subjectCode, false) : questionService
                         .findByExamAndSubjectAndObjectiveAndMainNumber(examId, subjectCode, false, mainNumber);
@@ -253,6 +259,18 @@ public class PaperController extends BaseExamController {
                     } else {
                         examQuestion.setEnableUpdate(true);
                     }
+                    // 选做题判分策略
+                    if (selectiveMap.containsKey(examQuestion.getMainNumber())) {
+                        examQuestion.setSelective(true);
+                        examQuestion.setSelectiveIndex(selectiveMap.get(examQuestion.getMainNumber())
+                                .getSelectiveIndex());
+                        examQuestion
+                                .setSelectivePart(selectiveMap.get(examQuestion.getMainNumber()).getSelectivePart());
+                        examQuestion.setScorePolicy(selectiveMap.get(examQuestion.getMainNumber()).getScorePolicy()
+                                .getValue());
+                    } else {
+                        examQuestion.setSelective(false);
+                    }
                 }
                 list.addAll(subjectiveList);
             }

+ 6 - 0
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/paperDetail.jsp

@@ -80,6 +80,12 @@
 				<td>
 					<c:if test="${question.objective && question.objectivePolicy==null}">无</c:if>
 					<c:if test="${question.objective && question.objectivePolicy!=null}">${question.objectivePolicy.name}</c:if>
+					<c:if test="${!question.objective && question.selective}">
+						${question.selectiveIndex}-
+						<c:if test="${question.scorePolicy==1}">平均分</c:if>
+						<c:if test="${question.scorePolicy==2}">取高分</c:if>
+						<c:if test="${question.scorePolicy==3}">取低分</c:if>
+					</c:if>
 				</td>
 				<td><c:if test="${!question.objective}">${question.groupNumber}</c:if>
 				</td>

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

@@ -9,7 +9,7 @@ ALTER TABLE eb_exam_student ADD COLUMN `score_verify_flagged`	tinyint(1) DEFAULT
 UPDATE eb_exam_student set inspected=1,subjective_status='MARKED' where subjective_status='INSPECTED';
 
 ALTER TABLE eb_exam_subject ADD COLUMN `inspect_round` 	int(11) NOT NULL DEFAULT 1 COMMENT '复核轮数';
-ALTER TABLE eb_inspect_history ADD COLUMN `inspect_round` 	int(11) NOT NULL COMMENT '复核轮数';
+ALTER TABLE eb_inspect_history ADD COLUMN `inspect_round` 	int(11) NOT NULL DEFAULT 1 COMMENT '复核轮数';
 ALTER TABLE eb_exam_subject ADD COLUMN `selective` 	tinyint(1) NOT NULL DEFAULT 0 COMMENT '选做题科目';
 
 ALTER TABLE b_school ADD COLUMN `double_track`  tinyint(1)  NOT NULL DEFAULT 0 COMMENT '双评轨迹';
@@ -401,37 +401,37 @@ DROP TABLE IF EXISTS `b_role_temp`;
 
 use college_scan_multi;
 
-TRUNCATE TABLE absent;
-TRUNCATE TABLE append_scan;
-TRUNCATE TABLE baseinfo;
-TRUNCATE TABLE baseinfolog;
-TRUNCATE TABLE campus;
-TRUNCATE TABLE card_defcount;
+TRUNCATE TABLE college_scan_multi.absent;
+TRUNCATE TABLE college_scan_multi.append_scan;
+TRUNCATE TABLE college_scan_multi.baseinfo;
+TRUNCATE TABLE college_scan_multi.baseinfolog;
+TRUNCATE TABLE college_scan_multi.campus;
+TRUNCATE TABLE college_scan_multi.card_defcount;
 --  TRUNCATE TABLE import_sign_page;
-TRUNCATE TABLE kslb;
-TRUNCATE TABLE config;
-TRUNCATE TABLE registqty;
-TRUNCATE TABLE subject_code_kgt;
-TRUNCATE TABLE task_master;
-
--- DROP table check_omr;
--- drop table check_student;
--- drop table cliprect;
--- drop table objective;
--- drop table ocrdata;
--- drop table omrresult;
--- drop table registno;
--- drop table sign_page;
--- drop table task_child;
--- drop table upload_file_list;
--- drop table verify_check_info;
--- drop table import_sign_page;
+TRUNCATE TABLE college_scan_multi.kslb;
+TRUNCATE TABLE college_scan_multi.config;
+TRUNCATE TABLE college_scan_multi.registqty;
+TRUNCATE TABLE college_scan_multi.subject_code_kgt;
+TRUNCATE TABLE college_scan_multi.task_master;
+
+-- DROP table college_scan_multi.check_omr;
+-- drop table college_scan_multi.check_student;
+-- drop table college_scan_multi.cliprect;
+-- drop table college_scan_multi.objective;
+-- drop table college_scan_multi.ocrdata;
+-- drop table college_scan_multi.omrresult;
+-- drop table college_scan_multi.registno;
+-- drop table college_scan_multi.sign_page;
+-- drop table college_scan_multi.task_child;
+-- drop table college_scan_multi.upload_file_list;
+-- drop table college_scan_multi.verify_check_info;
+-- drop table college_scan_multi.import_sign_page;
 
 -- ----------------------------
 -- Table structure for upload_file_list
 -- ----------------------------
-DROP TABLE IF EXISTS `upload_file_list`;
-CREATE TABLE `upload_file_list` (
+DROP TABLE IF EXISTS college_scan_multi.`upload_file_list`;
+CREATE TABLE college_scan_multi.`upload_file_list` (
   `exam_id` int(11) NOT NULL,
   `subject_code` varchar(30) NOT NULL,
   `subject_name` varchar(50) DEFAULT NULL,
@@ -446,8 +446,8 @@ CREATE TABLE `upload_file_list` (
 -- ----------------------------
 -- Table structure for task_child
 -- ----------------------------
-DROP TABLE IF EXISTS `task_child`;
-CREATE TABLE `task_child` (
+DROP TABLE IF EXISTS college_scan_multi.`task_child`;
+CREATE TABLE college_scan_multi.`task_child` (
   `exam_id` int(11) NOT NULL,
   `exam_number` varchar(30) NOT NULL,
   `task_id` varchar(30) NOT NULL,
@@ -460,8 +460,8 @@ CREATE TABLE `task_child` (
 -- ----------------------------
 -- Table structure for sign_page
 -- ----------------------------
-DROP TABLE IF EXISTS `sign_page`;
-CREATE TABLE `sign_page` (
+DROP TABLE IF EXISTS college_scan_multi.`sign_page`;
+CREATE TABLE college_scan_multi.`sign_page` (
   `exam_id` int(11) NOT NULL,
   `exam_number` varchar(30) NOT NULL,
   `exam_site` varchar(50) DEFAULT NULL,
@@ -484,8 +484,8 @@ CREATE TABLE `sign_page` (
 -- ----------------------------
 -- Table structure for registno
 -- ----------------------------
-DROP TABLE IF EXISTS `registno`;
-CREATE TABLE `registno` (
+DROP TABLE IF EXISTS college_scan_multi.`registno`;
+CREATE TABLE college_scan_multi.`registno` (
   `DiskSerNo` varchar(30) DEFAULT NULL,
   `ExamId` int(11) NOT NULL,
   `RegistNo` varchar(30) NOT NULL,
@@ -505,8 +505,8 @@ CREATE TABLE `registno` (
 -- ----------------------------
 -- Table structure for omrresult
 -- ----------------------------
-DROP TABLE IF EXISTS `omrresult`;
-CREATE TABLE `omrresult` (
+DROP TABLE IF EXISTS college_scan_multi.`omrresult`;
+CREATE TABLE college_scan_multi.`omrresult` (
   `examid` int(11) DEFAULT '0',
   `subjectCode` varchar(30) DEFAULT NULL,
   `examNumber` varchar(30) DEFAULT '',
@@ -524,8 +524,8 @@ CREATE TABLE `omrresult` (
 -- ----------------------------
 -- Table structure for ocrdata
 -- ----------------------------
-DROP TABLE IF EXISTS `ocrdata`;
-CREATE TABLE `ocrdata` (
+DROP TABLE IF EXISTS college_scan_multi.`ocrdata`;
+CREATE TABLE college_scan_multi.`ocrdata` (
   `DiskSerNo` varchar(50) DEFAULT NULL,
   `DiskSerNo_KGT` varchar(50) DEFAULT NULL,
   `Batch` varchar(10) DEFAULT NULL,
@@ -590,8 +590,8 @@ CREATE TABLE `ocrdata` (
 -- ----------------------------
 -- Table structure for objective
 -- ----------------------------
-DROP TABLE IF EXISTS `objective`;
-CREATE TABLE `objective` (
+DROP TABLE IF EXISTS college_scan_multi.`objective`;
+CREATE TABLE college_scan_multi.`objective` (
   `DiskSerNo` varchar(50) DEFAULT NULL,
   `ExamID` int(11) NOT NULL,
   `SubjectCode` varchar(30) NOT NULL,
@@ -609,8 +609,8 @@ CREATE TABLE `objective` (
 -- ----------------------------
 -- Table structure for cliprect
 -- ----------------------------
-DROP TABLE IF EXISTS `cliprect`;
-CREATE TABLE `cliprect` (
+DROP TABLE IF EXISTS college_scan_multi.`cliprect`;
+CREATE TABLE college_scan_multi.`cliprect` (
   `ExamID` int(11) DEFAULT NULL,
   `DiskSerNo` varchar(30) DEFAULT NULL,
   `FormID` int(3) DEFAULT NULL,
@@ -621,8 +621,8 @@ CREATE TABLE `cliprect` (
 -- ----------------------------
 -- Table structure for check_student
 -- ----------------------------
-DROP TABLE IF EXISTS `check_student`;
-CREATE TABLE `check_student` (
+DROP TABLE IF EXISTS college_scan_multi.`check_student`;
+CREATE TABLE college_scan_multi.`check_student` (
   `exam_id` int(11) NOT NULL,
   `exam_site` varchar(50) DEFAULT NULL,
   `student_code` varchar(50) DEFAULT NULL,
@@ -649,8 +649,8 @@ CREATE TABLE `check_student` (
 -- ----------------------------
 -- Table structure for check_omr
 -- ----------------------------
-DROP TABLE IF EXISTS `check_omr`;
-CREATE TABLE `check_omr` (
+DROP TABLE IF EXISTS college_scan_multi.`check_omr`;
+CREATE TABLE college_scan_multi.`check_omr` (
   `exam_id` int(11) NOT NULL,
   `student_id` varchar(30) NOT NULL,
   `subject_code` varchar(30) NOT NULL,
@@ -674,8 +674,8 @@ CREATE TABLE `check_omr` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 
-DROP TABLE IF EXISTS `eb_exam_student`;
-CREATE TABLE `eb_exam_student` (
+DROP TABLE IF EXISTS college_scan_multi.`eb_exam_student`;
+CREATE TABLE college_scan_multi.`eb_exam_student` (
   `auid` int(11) NOT NULL AUTO_INCREMENT,
   `exam_id` int(11) NOT NULL COMMENT '考试ID',
   `school_id` int(11) NOT NULL COMMENT '学校ID',
@@ -706,10 +706,10 @@ CREATE TABLE `eb_exam_student` (
   KEY `package_code` (`package_code`),
   KEY `exam_site` (`exam_site`),
   KEY `exam_room` (`exam_room`)
-) ENGINE=InnoDB AUTO_INCREMENT=240437 DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-DROP TABLE IF EXISTS `ocrdata_history`;
-CREATE TABLE `ocrdata_history` (
+DROP TABLE IF EXISTS college_scan_multi.`ocrdata_history`;
+CREATE TABLE college_scan_multi.`ocrdata_history` (
   `remark` varchar(100) DEFAULT NULL,
   `DiskSerNo` varchar(50) DEFAULT NULL,
   `DiskSerNo_KGT` varchar(50) DEFAULT NULL,
@@ -757,8 +757,8 @@ CREATE TABLE `ocrdata_history` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 
-DROP TABLE IF EXISTS `import_sign_page`;
-CREATE TABLE `import_sign_page` (
+DROP TABLE IF EXISTS college_scan_multi.`import_sign_page`;
+CREATE TABLE college_scan_multi.`import_sign_page` (
   `exam_id` int(5) NOT NULL,
   `exam_site` varchar(50) DEFAULT NULL,
   `exam_room` varchar(100) DEFAULT NULL,
@@ -777,8 +777,8 @@ CREATE TABLE `import_sign_page` (
   KEY `subject_code` (`subject_code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-DROP TABLE IF EXISTS `verify_check_info`;
-CREATE TABLE `verify_check_info` (
+DROP TABLE IF EXISTS college_scan_multi.`verify_check_info`;
+CREATE TABLE college_scan_multi.`verify_check_info` (
   `exam_id` int(11) NOT NULL,
   `campus_code` int(30) DEFAULT NULL,
   `exam_number` varchar(30) NOT NULL,

+ 8 - 0
stmms-web/src/main/webapp/sql/upgrade/1.3.15.sql

@@ -0,0 +1,8 @@
+-- 1.3.15
+
+USE `stmms_ft`;
+
+ALTER TABLE m_reject_history ADD INDEX index2(`library_id`);
+ALTER TABLE eb_inspect_history MODIFY column inspector_id INT (11) NOT NULL COMMENT '复核人ID';
+ALTER TABLE eb_inspect_history MODIFY column  student_id INT (11) NOT NULL COMMENT '考生ID';
+ALTER TABLE eb_selective_group MODIFY column score_policy	varchar(64) NOT NULL COMMENT '合分方式';