fix 章卷

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserBankRecordServiceImpl.java

@@ -162,74 +162,79 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         boolean b = this.updateById(update);
-        updateExam(update);
-        //判断有无学习结束
-        UserStudyRecord userStudyRecord = new UserStudyRecord();
-        userStudyRecord.setUserId(bo.getUserId());
-        userStudyRecord.setGoodsId(bo.getGoodsId());
-        userStudyRecord.setGradeId(bo.getGradeId());
-        userStudyRecord.setStatus(1);
-        iUserStudyRecordService.studyFinish(userStudyRecord);
+        UserBankRecordVo userBankRecordVo = this.queryById(update.getRecordId());
+        updateExam(userBankRecordVo,update);
+        if(userBankRecordVo.getType()==1){//章卷才进来
+            //判断有无学习结束
+            UserStudyRecord userStudyRecord = new UserStudyRecord();
+            userStudyRecord.setUserId(bo.getUserId());
+            userStudyRecord.setGoodsId(bo.getGoodsId());
+            userStudyRecord.setGradeId(bo.getGradeId());
+            userStudyRecord.setStatus(1);
+            iUserStudyRecordService.studyFinish(userStudyRecord);
+        }
         return b;
     }
 
-    private void updateExam(UserBankRecord add) {
+    private void updateExam(UserBankRecordVo userBankRecordVo,UserBankRecord add) {
         //试卷及格绑定成绩和记录做题，待审，通过不记录
-        UserBankRecordVo userBankRecordVo = this.queryById(add.getRecordId());
-        if (userStudyRecordMapper.selectStudyExamRecord(userBankRecordVo)  < 1 && Validator.isNotEmpty(add.getReportStatus())&& add.getReportStatus().equals(1)){
-            //增加一条审核记录
-            UserPeriod userPeriod = new UserPeriod();
-            userPeriod.setUserId(userBankRecordVo.getUserId());
-            userPeriod.setCourseId(userBankRecordVo.getCourseId());
-            userPeriod.setExamId(userBankRecordVo.getExamId());
-            userPeriod.setGoodsId(userBankRecordVo.getGoodsId());
-            userPeriod.setType(2);
-            userPeriod.setCreateTime(DateUtils.getNowTime());
-            userPeriod.setUpdateTime(DateUtils.getNowTime());
-            userPeriod.setModuleId(userBankRecordVo.getModuleId());
-            userPeriod.setChapterId(userBankRecordVo.getChapterId());
-            userPeriod.setGradeId(userBankRecordVo.getGradeId());
-            iUserPeriodService.save(userPeriod);
-            UserPeriodStatus userPeriodStatusAddBo = new UserPeriodStatus();
-            userPeriodStatusAddBo.setPeriodStatus(1);
-            userPeriodStatusAddBo.setStatus(2);
-            userPeriodStatusAddBo.setRecordStartTime(userBankRecordVo.getCreateTime());
-            userPeriodStatusAddBo.setRecordEndTime(userBankRecordVo.getUpdateTime());
-            userPeriodStatusAddBo.setPeriodId(userPeriod.getId());
-            userPeriodStatusAddBo.setCreateTime(DateUtils.getNowTime());
-            userPeriodStatusAddBo.setUpdateTime(DateUtils.getNowTime());
-            userPeriodStatusAddBo.setPerformance(userBankRecordVo.getPerformance());
-            iUserPeriodStatusService.save(userPeriodStatusAddBo);
-            //将照片绑定学时
-            LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
-            lqw.eq(UserStudyRecordPhoto::getRecordId, userBankRecordVo.getRecordId());
-            lqw.eq(UserStudyRecordPhoto::getStatus, 2);
-            lqw.eq(UserStudyRecordPhoto::getUserId, userBankRecordVo.getUserId());
-            UserStudyRecordPhoto userStudyRecordPhoto = new UserStudyRecordPhoto();
-            userStudyRecordPhoto.setPeriodId(userPeriodStatusAddBo.getId());
-            userStudyRecordPhoto.setUpdateTime(DateUtils.getNowTime());
-            userStudyRecordPhotoService.update(userStudyRecordPhoto,lqw);
-        }
 
-        //待重修
-        if (userStudyRecordMapper.selectStudyExamRecordOr(userBankRecordVo) > 0 && add.getReportStatus().equals(1)){
-            //将待重修改为待审核
-            UserPeriodStatus userPeriodStatus = userStudyRecordMapper.selectStudyExamRecordCount(userBankRecordVo);
-            userPeriodStatus.setStatus(2);
-            userPeriodStatus.setRecordStartTime(userBankRecordVo.getCreateTime());
-            userPeriodStatus.setRecordEndTime(userBankRecordVo.getUpdateTime());
-            userPeriodStatus.setPerformance(userBankRecordVo.getPerformance());
-            iUserPeriodStatusService.updateById(userPeriodStatus);
-
-            //将照片绑定学时
-            LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
-            lqw.eq(UserStudyRecordPhoto::getRecordId, userBankRecordVo.getRecordId());
-            lqw.eq(UserStudyRecordPhoto::getStatus, 2);
-            lqw.eq(UserStudyRecordPhoto::getUserId, userBankRecordVo.getUserId());
-            UserStudyRecordPhoto userStudyRecordPhoto = new UserStudyRecordPhoto();
-            userStudyRecordPhoto.setPeriodId(userPeriodStatus.getId());
-            userStudyRecordPhoto.setUpdateTime(DateUtils.getNowTime());
-            userStudyRecordPhotoService.update(userStudyRecordPhoto,lqw);
+        if(userBankRecordVo.getType()==1){ //章卷才进来
+            if (userStudyRecordMapper.selectStudyExamRecord(userBankRecordVo)  < 1 && Validator.isNotEmpty(add.getReportStatus())&& add.getReportStatus().equals(1)){
+                //增加一条审核记录
+                UserPeriod userPeriod = new UserPeriod();
+                userPeriod.setUserId(userBankRecordVo.getUserId());
+                userPeriod.setCourseId(userBankRecordVo.getCourseId());
+                userPeriod.setExamId(userBankRecordVo.getExamId());
+                userPeriod.setGoodsId(userBankRecordVo.getGoodsId());
+                userPeriod.setType(2);
+                userPeriod.setCreateTime(DateUtils.getNowTime());
+                userPeriod.setUpdateTime(DateUtils.getNowTime());
+                userPeriod.setModuleId(userBankRecordVo.getModuleId());
+                userPeriod.setChapterId(userBankRecordVo.getChapterId());
+                userPeriod.setGradeId(userBankRecordVo.getGradeId());
+                iUserPeriodService.save(userPeriod);
+                UserPeriodStatus userPeriodStatusAddBo = new UserPeriodStatus();
+                userPeriodStatusAddBo.setPeriodStatus(1);
+                userPeriodStatusAddBo.setStatus(2);
+                userPeriodStatusAddBo.setRecordStartTime(userBankRecordVo.getCreateTime());
+                userPeriodStatusAddBo.setRecordEndTime(userBankRecordVo.getUpdateTime());
+                userPeriodStatusAddBo.setPeriodId(userPeriod.getId());
+                userPeriodStatusAddBo.setCreateTime(DateUtils.getNowTime());
+                userPeriodStatusAddBo.setUpdateTime(DateUtils.getNowTime());
+                userPeriodStatusAddBo.setPerformance(userBankRecordVo.getPerformance());
+                iUserPeriodStatusService.save(userPeriodStatusAddBo);
+                //将照片绑定学时
+                LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
+                lqw.eq(UserStudyRecordPhoto::getRecordId, userBankRecordVo.getRecordId());
+                lqw.eq(UserStudyRecordPhoto::getStatus, 2);
+                lqw.eq(UserStudyRecordPhoto::getUserId, userBankRecordVo.getUserId());
+                UserStudyRecordPhoto userStudyRecordPhoto = new UserStudyRecordPhoto();
+                userStudyRecordPhoto.setPeriodId(userPeriodStatusAddBo.getId());
+                userStudyRecordPhoto.setUpdateTime(DateUtils.getNowTime());
+                userStudyRecordPhotoService.update(userStudyRecordPhoto,lqw);
+            }
+
+            //待重修
+            if (userStudyRecordMapper.selectStudyExamRecordOr(userBankRecordVo) > 0 && add.getReportStatus().equals(1)){
+                //将待重修改为待审核
+                UserPeriodStatus userPeriodStatus = userStudyRecordMapper.selectStudyExamRecordCount(userBankRecordVo);
+                userPeriodStatus.setStatus(2);
+                userPeriodStatus.setRecordStartTime(userBankRecordVo.getCreateTime());
+                userPeriodStatus.setRecordEndTime(userBankRecordVo.getUpdateTime());
+                userPeriodStatus.setPerformance(userBankRecordVo.getPerformance());
+                iUserPeriodStatusService.updateById(userPeriodStatus);
+
+                //将照片绑定学时
+                LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
+                lqw.eq(UserStudyRecordPhoto::getRecordId, userBankRecordVo.getRecordId());
+                lqw.eq(UserStudyRecordPhoto::getStatus, 2);
+                lqw.eq(UserStudyRecordPhoto::getUserId, userBankRecordVo.getUserId());
+                UserStudyRecordPhoto userStudyRecordPhoto = new UserStudyRecordPhoto();
+                userStudyRecordPhoto.setPeriodId(userPeriodStatus.getId());
+                userStudyRecordPhoto.setUpdateTime(DateUtils.getNowTime());
+                userStudyRecordPhotoService.update(userStudyRecordPhoto,lqw);
+            }
         }
     }
     /**