|
|
@@ -8,10 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.qmth.distributed.print.business.bean.dto.ExamTaskDetailDto;
|
|
|
import com.qmth.distributed.print.business.bean.params.ExamCardParams;
|
|
|
import com.qmth.distributed.print.business.bean.params.RelatePaperParam;
|
|
|
-import com.qmth.distributed.print.business.entity.ExamDetail;
|
|
|
-import com.qmth.distributed.print.business.entity.ExamDetailCourse;
|
|
|
-import com.qmth.distributed.print.business.entity.ExamTask;
|
|
|
-import com.qmth.distributed.print.business.entity.ExamTaskDetail;
|
|
|
+import com.qmth.distributed.print.business.entity.*;
|
|
|
import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
|
|
|
import com.qmth.distributed.print.business.enums.TaskTypeEnum;
|
|
|
import com.qmth.distributed.print.business.mapper.ExamTaskDetailMapper;
|
|
|
@@ -57,6 +54,9 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
|
|
|
@Resource
|
|
|
AsyncCreatePdfTempleteService asyncCreatePdfTempleteService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ TBTaskService tbTaskService;
|
|
|
+
|
|
|
@Override
|
|
|
public boolean enable(ExamTaskDetail examTaskDetail) {
|
|
|
UpdateWrapper<ExamTaskDetail> updateWrapper = new UpdateWrapper<>();
|
|
|
@@ -88,7 +88,8 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
|
|
|
// 重新生成pdf
|
|
|
List<ExamDetailCourse> examDetailCourses = examDetailCourseService.listDetailCourseByCourseCodeAndPaperNumber(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber());
|
|
|
List<Long> examDetailCourseIds = examDetailCourses.stream().map(m->m.getId()).collect(Collectors.toList());
|
|
|
- Map<String, Object> map = new HashMap<>();
|
|
|
+ SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
|
+ Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.CREATE_PDF, paperParam.getPrintPlanId(),sysUser);
|
|
|
map.computeIfAbsent("printPlanId", v -> paperParam.getPrintPlanId());
|
|
|
map.computeIfAbsent("examDetailCourseIds", v -> examDetailCourseIds);
|
|
|
map.computeIfAbsent("paperType", v -> paperParam.getRelatePaperType());
|
xiaof