|
|
@@ -3,6 +3,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.QueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.update.Update;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
@@ -96,6 +97,9 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
|
|
|
@Autowired
|
|
|
BasicCampusService basicCampusService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ ExamTaskService examTaskService;
|
|
|
+
|
|
|
@Resource
|
|
|
RedisUtil redisUtil;
|
|
|
|
|
|
@@ -393,6 +397,14 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
|
|
|
examDetailCourseQueryWrapper.lambda().eq(ExamDetailCourse::getExamDetailId, detail.getId());
|
|
|
List<ExamDetailCourse> examDetailCourses = examDetailCourseService.list(examDetailCourseQueryWrapper);
|
|
|
for (ExamDetailCourse examDetailCours : examDetailCourses) {
|
|
|
+ // 清空审核表附件ID
|
|
|
+ UpdateWrapper<ExamTask> examTaskUpdateWrapper = new UpdateWrapper<>();
|
|
|
+ examTaskUpdateWrapper.lambda().set(ExamTask::getApproveFormAttachmentId, null)
|
|
|
+ .eq(ExamTask::getSchoolId, examDetailCours.getSchoolId())
|
|
|
+ .eq(ExamTask::getCourseCode, examDetailCours.getCourseCode())
|
|
|
+ .eq(ExamTask::getPaperNumber, examDetailCours.getPaperNumber());
|
|
|
+ examTaskService.update(examTaskUpdateWrapper);
|
|
|
+
|
|
|
List<ExamDetail> examDetailList = this.listByPrintPlanIdAndCourseCodeAndPaperNumber(detail.getSchoolId(), detail.getPrintPlanId(), examDetailCours.getCourseCode(), examDetailCours.getPaperNumber());
|
|
|
long count = examDetailList.stream().filter(m -> !m.getStatus().name().equals(ExamDetailStatusEnum.NEW.name()) && !m.getStatus().name().equals(ExamDetailStatusEnum.READY.name())).count();
|
|
|
if (count == 0) {
|
xiaof