Merge branch 'dev' into release

1

1

@@ -0,0 +1,6 @@
+Merge branch 'dev'
+1
+# 请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支
+# 合并到主题分支。
+#
+# 以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。

themis-business/src/main/resources/db/init.sql

@@ -933,7 +933,7 @@ CREATE TABLE `t_e_exam` (
   `progress` double DEFAULT NULL COMMENT '算分进度',
   `mobile_photo_upload` tinyint DEFAULT NULL COMMENT '是否允许使用移动端拍照答题，0：不开启，1：开启',
   `invigilate_verify` varchar(30) DEFAULT NULL COMMENT '监考人工审核，now：实时审核，later：事后审核',
-  `monitor_status` varchar(30) DEFAULT NULL COMMENT '监考状态，NOT_START：未开始，START：监考中，FINISHED：已结束',
+  `monitor_status` varchar(30) DEFAULT 'NOT_START' COMMENT '监考状态，NOT_START：未开始，START：监考中，FINISHED：已结束',
   PRIMARY KEY (`id`),
   UNIQUE KEY `t_e_exam_orgId_code_Idx` (`org_id`,`code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考试批次';

themis-business/src/main/resources/mapper/TEExamMapper.xml

@@ -128,19 +128,19 @@
             <if test="studentId != null and studentId != ''">
                 and tees.student_id = #{studentId}
             </if>
-                and tee.enable = 1
-                and teea.enable = 1
-                and tees.enable = 1
-                <if test="orgId != null and orgId != ''">
-                    and tee.org_id = #{orgId}
-                </if>
-                <if test="examId != null and examId != ''">
-                    and tee.id = #{examId}
-                </if>
-                <!--and IF(tee.mode = 'TOGETHER', teea.start_time >= date_sub(now(),
-                interval IFNULL(teea.opening_seconds, tee.opening_seconds) second),1 = 1 )-->
+            and tee.enable = 1
+            and teea.enable = 1
+            and tees.enable = 1
+            <if test="orgId != null and orgId != ''">
+                and tee.org_id = #{orgId}
+            </if>
+            <if test="examId != null and examId != ''">
+                and tee.id = #{examId}
+            </if>
+            <!--and IF(tee.mode = 'TOGETHER', teea.start_time >= date_sub(now(),
+            interval IFNULL(teea.opening_seconds, tee.opening_seconds) second),1 = 1 )-->
         </where>
-            ) t
+        ) t
         <where>
             t.reallyTime <![CDATA[ <= ]]> diffSum + 15
             and t.reallyTime <![CDATA[ >= ]]> 0
@@ -149,9 +149,9 @@
 
     <select id="examPrivilegeQuery" resultType="com.qmth.themis.business.entity.TEExam">
         select
-            *
+        *
         from
-            t_e_exam tee
+        t_e_exam tee
         where
             EXISTS(
             select