Merge branch 'dev' into pre

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/impl/MockApplyServiceImpl.java

@@ -375,7 +375,7 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
     @Override
     public List<MockApplyVo> queryApplyList(MockApplyQueryBo bo){
         if (Validator.isNotEmpty(bo.getTimeLimit())) {
-            bo.setTimeLimitMillisecond(bo.getTimeLimit() * 60000);
+            bo.setTimeLimitMillisecond(bo.getTimeLimit() * 60);
         }
         List<MockApplyVo> mockApplyVoList = baseMapper.queryApplyList(bo);
         if (BeanUtil.isNotEmpty(mockApplyVoList)) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1447,7 +1447,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setSystemStatus(1);
                     informUserAddBo.setRemind("模考提醒");
                     informUserAddBo.setText("祥粤云学堂提醒：您学习【" + courseSubject.getSubjectName() + "】科目中的【" + mockApply.getApplyName() + "模考】已将于60分钟后开始考试，请及时在【祥粤云小程序】或【web.xyyxt.net】进行考试。");
-                    /*iInformUserService.insertByAddBo(informUserAddBo);*/
+                    iInformUserService.insertByAddBo(informUserAddBo);
                 }
                 if (informRemindVo.getNoteStatus().equals(1)) {
                     InformUserAddBo informUserAddBo = new InformUserAddBo();

zhongzheng-system/src/main/resources/mapper/modules/mock/MockApplyMapper.xml

@@ -122,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           <if test="timeLimitMillisecond != null">
               + #{timeLimitMillisecond}
           </if>
+          and ma.`status` = 1
         <if test="projectId != null and projectId != ''">
             and ma.project_id = #{projectId}
         </if>