caozixuan пре 2 година
родитељ
комит
398991c815

+ 9 - 0
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TBExamServiceImpl.java

@@ -10,10 +10,12 @@ import com.qmth.teachcloud.common.service.BasicSemesterService;
 import com.qmth.teachcloud.common.util.RedisUtil;
 import com.qmth.teachcloud.report.business.bean.params.TBExamDeleteParam;
 import com.qmth.teachcloud.report.business.bean.params.TBExamParam;
+import com.qmth.teachcloud.report.business.entity.TAExamTotal;
 import com.qmth.teachcloud.report.business.entity.TBCloudExam;
 import com.qmth.teachcloud.report.business.entity.TBExam;
 import com.qmth.teachcloud.report.business.entity.TBExamCourse;
 import com.qmth.teachcloud.report.business.mapper.TBExamMapper;
+import com.qmth.teachcloud.report.business.service.TAExamTotalService;
 import com.qmth.teachcloud.report.business.service.TBCloudExamService;
 import com.qmth.teachcloud.report.business.service.TBExamCourseService;
 import com.qmth.teachcloud.report.business.service.TBExamService;
@@ -43,6 +45,8 @@ public class TBExamServiceImpl extends ServiceImpl<TBExamMapper, TBExam> impleme
     private TBExamCourseService tbExamCourseService;
     @Resource
     private RedisUtil redisUtil;
+    @Resource
+    private TAExamTotalService taExamTotalService;
 
     @Override
     public TBExam findByCloudExamId(Long cloudExamId) {
@@ -131,6 +135,11 @@ public class TBExamServiceImpl extends ServiceImpl<TBExamMapper, TBExam> impleme
                 if (tbExamCourseList.size() > 0) {
                     throw ExceptionResultEnum.ERROR.exception("考试下还有分析课程不能删除");
                 }
+                // 删除考试概况分析表
+                taExamTotalService.remove(new QueryWrapper<TAExamTotal>()
+                        .lambda()
+                        .eq(TAExamTotal::getSchoolId,schoolId)
+                        .eq(TAExamTotal::getExamId,examId));
                 this.removeById(examId);
             } finally {
                 redisUtil.releaseLock(lockKey);

+ 1 - 0
teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/BasicDatasourceController.java

@@ -789,6 +789,7 @@ public class BasicDatasourceController {
         Set<Long> examStudentRemoveIdSet = new HashSet<>();
         for (String s : courseInfoList) {
             Set<Long> ids = tbExamStudentService.list(new QueryWrapper<TBExamStudent>().lambda()
+                            .eq(TBExamStudent::getExamId,examId)
                             .eq(TBExamStudent::getCourseCode, s))
                     .stream().map(TBExamStudent::getId).collect(Collectors.toSet());
             examStudentRemoveIdSet.addAll(ids);