Merge branch 'dev'

111

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

@@ -163,9 +163,9 @@
             and tee.enable = 1
             and teea.enable = 1
             and tees.enable = 1
-            <if test="mode != null and mode != '' and mode == 'TOGETHER'">
+            <!--<if test="mode != null and mode != '' and mode == 'TOGETHER'">
                 and teea.start_time <![CDATA[ >= ]]> date_sub(now(), interval IFNULL(teea.opening_seconds, tee.opening_seconds) second)
-            </if>
+            </if>-->
         </where>
     </select>
 </mapper>

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

@@ -134,8 +134,8 @@
                 <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 IF(tee.mode = 'TOGETHER', teea.start_time >= date_sub(now(),
+                interval IFNULL(teea.opening_seconds, tee.opening_seconds) second),1 = 1 )-->
         </where>
             ) t
         <where>