Merge branch 'dev' into pre

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

@@ -1398,10 +1398,11 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
             }
         }
         mockApplyVos.forEach(mockApplyVo -> {
-            MockApplyEditBo bo1 = new MockApplyEditBo();
-            bo1.setApplyId(mockApplyVo.getApplyId());
-            bo1.setMockRemind(1);
-            iMockApplyService.updateByEditBo(bo1);
+            MockApply mockApply = new MockApply();
+            mockApply.setApplyId(mockApplyVo.getApplyId());
+            mockApply.setMockRemind(1);
+            mockApply.setUpdateTime(DateUtils.getNowTime());
+            iMockApplyService.updateById(mockApply);
         });
     }
 
@@ -1446,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();
@@ -1471,6 +1472,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 bo1.setSubscribeId(subscribeVo.getSubscribeId());
                 bo1.setHasMockRemind(1);
                 iUserMockSubscribeService.updateByEditBo(bo1);
+
             }
         }
     }