FEATURE 代码提交

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/PointCheckServiceImpl.java

@@ -192,7 +192,7 @@ public class PointCheckServiceImpl extends ServiceImpl<PointCheckDao, PointCheck
      * 点检任务保存
      * @param pointCheckVo
      */
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void pointCheckSave(PointCheckVo pointCheckVo){
         // 点检任务保存

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/ThemeCheckItemServiceImpl.java

@@ -115,7 +115,7 @@ public class ThemeCheckItemServiceImpl extends ServiceImpl<ThemeCheckItemDao, Th
      * 日常检查保存
      * @param themeCheckItemVo
      */
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void themeCheckSave(ThemeCheckItemVo themeCheckItemVo){
         this.updateById(themeCheckItemVo);

rw-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/SubjectServiceImpl.java

@@ -37,7 +37,7 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectDao, SubjectDo> imple
     private SubjectService subjectService;
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public R checkInfo(List<String> subjectIds) {
         /*******************************根据考题ID获取 分别获取作为固定考题和随机考题的试卷信息**************************/
         log.info("开始获取固定考题对应的试卷信息");

rw-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/TrainingDemandServiceImpl.java

@@ -344,7 +344,7 @@ public class TrainingDemandServiceImpl implements TrainingDemandService {
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public R submit(List<TrainingDemandVo> trainingDemandVoList) {
         //  当前登录用户
         SysUserVo currentUser = TrainingUtils.getCurrentUser();
@@ -429,7 +429,7 @@ public class TrainingDemandServiceImpl implements TrainingDemandService {
      * @param saveDemandSurveyContentDos
      * @param saveDemandTempBackupsDo
      */
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void saveData(TrainingDemandSurveyBackupsDo saveDemandSurveyBackupsDo,
                          List<TrainingDemandSurveyCustomDetailBackupsDo> saveDemandSurveyCustomDetailBackupsDos,
                          List<TrainingDemandQuestionBackupsDo> saveDemandQuestionBackupsDos,

rw-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/TrainingSendNotifyServiceImpl.java

@@ -216,7 +216,8 @@ public class TrainingSendNotifyServiceImpl implements TrainingSendNotifyService
     public void questionnaireSurvey() {
         List<TrainingDemandSurveyBackupsDo> list = demandSurveyBackupsService.list(new LambdaQueryWrapper<TrainingDemandSurveyBackupsDo>()
                 .eq(BaseDo::getDeleted, 0)
-                .isNotNull(TrainingDemandSurveyBackupsDo::getNoparticipatinguserid));
+                .isNotNull(TrainingDemandSurveyBackupsDo::getNoparticipatinguserid)
+                .apply("DATE(DEADLINE) >= curdate()"));
         sendQuestionnaireSurveyNotify(list);
     }