|
@@ -84,9 +84,6 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
@Autowired
|
|
@Autowired
|
|
private ExamDetailCourseService examDetailCourseService;
|
|
private ExamDetailCourseService examDetailCourseService;
|
|
|
|
|
|
- @Autowired
|
|
|
|
- private ExamPrintPlanService examPrintPlanService;
|
|
|
|
-
|
|
|
|
@Resource
|
|
@Resource
|
|
private ExamDetailService examDetailService;
|
|
private ExamDetailService examDetailService;
|
|
|
|
|
|
@@ -122,7 +119,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
@Override
|
|
@Override
|
|
public List<String> listPaperNumber(String param, Long printPlanId) {
|
|
public List<String> listPaperNumber(String param, Long printPlanId) {
|
|
Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
|
|
Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
|
|
- if(printPlanId == null) {
|
|
|
|
|
|
+ if (printPlanId == null) {
|
|
// 查询命题任务中的试卷编号
|
|
// 查询命题任务中的试卷编号
|
|
QueryWrapper<ExamTask> queryWrapperExamTask = new QueryWrapper<>();
|
|
QueryWrapper<ExamTask> queryWrapperExamTask = new QueryWrapper<>();
|
|
queryWrapperExamTask.lambda().eq(ExamTask::getSchoolId, schoolId);
|
|
queryWrapperExamTask.lambda().eq(ExamTask::getSchoolId, schoolId);
|
|
@@ -680,7 +677,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|
|
- private void taskAfterPass(ExamTaskReviewLog taskReviewLog, ExamTaskPaperLog examTaskPaperLog, SysUser sysUser){
|
|
|
|
|
|
+ private void taskAfterPass(ExamTaskReviewLog taskReviewLog, ExamTaskPaperLog examTaskPaperLog, SysUser sysUser) {
|
|
// 更新记录表状态
|
|
// 更新记录表状态
|
|
examTaskPaperLog.setReview(true);
|
|
examTaskPaperLog.setReview(true);
|
|
examTaskPaperLog.setReviewStatus(taskReviewLog.getReviewStatus());
|
|
examTaskPaperLog.setReviewStatus(taskReviewLog.getReviewStatus());
|
|
@@ -693,7 +690,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
String exposedPaperType = examTaskDetail.getExposedPaperType();
|
|
String exposedPaperType = examTaskDetail.getExposedPaperType();
|
|
Set<String> exposedPaperSet = StringUtils.isBlank(exposedPaperType) ? new HashSet<>() : new HashSet<>(Arrays.asList(exposedPaperType.split(",")));
|
|
Set<String> exposedPaperSet = StringUtils.isBlank(exposedPaperType) ? new HashSet<>() : new HashSet<>(Arrays.asList(exposedPaperType.split(",")));
|
|
String unexposedPaperType = examTaskPaperLog.getPaperType();
|
|
String unexposedPaperType = examTaskPaperLog.getPaperType();
|
|
- Set<String> unexposedPaperSet = StringUtils.isBlank(unexposedPaperType) ? new HashSet<>() : new HashSet<>(Arrays.asList(unexposedPaperType.split(",")));
|
|
|
|
|
|
+ Set<String> unexposedPaperSet = StringUtils.isBlank(unexposedPaperType) ? new HashSet<>() : new HashSet<>(Arrays.asList(unexposedPaperType.split(",")));
|
|
String newUnexposedPaperType;
|
|
String newUnexposedPaperType;
|
|
//未曝光类型
|
|
//未曝光类型
|
|
if (!exposedPaperSet.isEmpty()) {
|
|
if (!exposedPaperSet.isEmpty()) {
|
|
@@ -701,7 +698,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
unexposedPaperSet.remove(exposedPaper);
|
|
unexposedPaperSet.remove(exposedPaper);
|
|
}
|
|
}
|
|
newUnexposedPaperType = String.join(",", unexposedPaperSet);
|
|
newUnexposedPaperType = String.join(",", unexposedPaperSet);
|
|
- } else{
|
|
|
|
|
|
+ } else {
|
|
newUnexposedPaperType = unexposedPaperType;
|
|
newUnexposedPaperType = unexposedPaperType;
|
|
}
|
|
}
|
|
// 通过,更新正式表数据
|
|
// 通过,更新正式表数据
|
|
@@ -720,7 +717,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
// 查询用户角色是否包含命题老师
|
|
// 查询用户角色是否包含命题老师
|
|
List<SysRole> list = sysUserRoleService.listRoleByUserId(sysUser.getId());
|
|
List<SysRole> list = sysUserRoleService.listRoleByUserId(sysUser.getId());
|
|
- boolean containsQuestionTeacher = list.stream().filter(m-> RoleTypeEnum.QUESTION_TEACHER.equals(m.getType())).count() > 0;
|
|
|
|
|
|
+ boolean containsQuestionTeacher = list.stream().filter(m -> RoleTypeEnum.QUESTION_TEACHER.equals(m.getType())).count() > 0;
|
|
Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
|
|
Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
|
|
Set<Long> orgIds = commonService.listSubOrgIds(null);
|
|
Set<Long> orgIds = commonService.listSubOrgIds(null);
|
|
Page<ExamTaskDetailDto> page = new Page<>(pageNumber, pageSize);
|
|
Page<ExamTaskDetailDto> page = new Page<>(pageNumber, pageSize);
|
|
@@ -1052,11 +1049,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (judge) {
|
|
if (judge) {
|
|
- Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.CREATE_PDF, examDetail.getPrintPlanId(), user);
|
|
|
|
- if (Objects.nonNull(examDetail.getId())) {
|
|
|
|
- map.computeIfAbsent("examDetailId", v -> examDetail.getId());
|
|
|
|
- }
|
|
|
|
- map.computeIfAbsent("schoolId", v -> examDetail.getSchoolId());
|
|
|
|
|
|
+ Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.CREATE_PDF, examDetail.getPrintPlanId(), user, examDetail.getId());
|
|
asyncCreatePdfTempleteService.createPdf(map, null);
|
|
asyncCreatePdfTempleteService.createPdf(map, null);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1069,7 +1062,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
@Override
|
|
@Override
|
|
public ReviewSampleDto findReviewSampleInfoByExamTaskId(Long examTaskId) {
|
|
public ReviewSampleDto findReviewSampleInfoByExamTaskId(Long examTaskId) {
|
|
List<ReviewSampleDto> reviewSampleDtoList = examTaskMapper.listReviewSampleInfoByExamTaskId(examTaskId);
|
|
List<ReviewSampleDto> reviewSampleDtoList = examTaskMapper.listReviewSampleInfoByExamTaskId(examTaskId);
|
|
- if (reviewSampleDtoList.size() != 1){
|
|
|
|
|
|
+ if (reviewSampleDtoList.size() != 1) {
|
|
throw ExceptionResultEnum.ERROR.exception("不能找到所选命题任务[" + examTaskId + "]的审核样本信息");
|
|
throw ExceptionResultEnum.ERROR.exception("不能找到所选命题任务[" + examTaskId + "]的审核样本信息");
|
|
}
|
|
}
|
|
return reviewSampleDtoList.get(0);
|
|
return reviewSampleDtoList.get(0);
|