|
@@ -2,6 +2,7 @@ package com.qmth.distributed.print.business.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
@@ -886,8 +887,11 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
|
|
|
throw ExceptionResultEnum.ERROR.exception(status.getDesc() + "状态下的印刷计划不能删除考务数据");
|
|
|
}
|
|
|
// 准备删除的考务-场次表id
|
|
|
- List<Long> examDetailIds = this.list(new QueryWrapper<ExamDetail>().lambda().eq(ExamDetail::getPrintPlanId, printPlanId).eq(ExamDetail::getExamDataSource, source))
|
|
|
- .stream().map(ExamDetail::getId).collect(Collectors.toList());
|
|
|
+ LambdaQueryWrapper<ExamDetail> examDetailQueryWrapper = new QueryWrapper<ExamDetail>().lambda().eq(ExamDetail::getPrintPlanId, printPlanId);
|
|
|
+ if (Objects.nonNull(source)){
|
|
|
+ examDetailQueryWrapper.eq(ExamDetail::getExamDataSource, source);
|
|
|
+ }
|
|
|
+ List<Long> examDetailIds = this.list(examDetailQueryWrapper).stream().map(ExamDetail::getId).collect(Collectors.toList());
|
|
|
if (examDetailIds.size() == 0) {
|
|
|
return;
|
|
|
}
|