|
|
@@ -7,24 +7,23 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.qmth.boot.tools.excel.ExcelReader;
|
|
|
import com.qmth.boot.tools.excel.enums.ExcelType;
|
|
|
-import com.qmth.boot.tools.excel.model.DataMap;
|
|
|
-import com.qmth.boot.tools.models.ByteArray;
|
|
|
import com.qmth.distributed.print.business.bean.dto.BasicExamStudentDto;
|
|
|
import com.qmth.distributed.print.business.bean.params.BasicExamStudentParam;
|
|
|
import com.qmth.distributed.print.business.bean.result.BasicExamStudentResult;
|
|
|
import com.qmth.distributed.print.business.entity.BasicExamStudent;
|
|
|
import com.qmth.distributed.print.business.entity.BasicTeachClazz;
|
|
|
-import com.qmth.distributed.print.business.listener.ObjectCollector;
|
|
|
import com.qmth.distributed.print.business.mapper.BasicExamStudentMapper;
|
|
|
import com.qmth.distributed.print.business.service.BasicExamStudentService;
|
|
|
import com.qmth.distributed.print.business.service.BasicTeachClazzService;
|
|
|
import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
|
|
|
import com.qmth.teachcloud.common.contant.SystemConstant;
|
|
|
import com.qmth.teachcloud.common.entity.BasicCourse;
|
|
|
+import com.qmth.teachcloud.common.entity.BasicSchool;
|
|
|
import com.qmth.teachcloud.common.entity.SysUser;
|
|
|
import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
|
|
|
import com.qmth.teachcloud.common.service.BasicCourseService;
|
|
|
import com.qmth.teachcloud.common.service.BasicRoleDataPermissionService;
|
|
|
+import com.qmth.teachcloud.common.service.CommonCacheService;
|
|
|
import com.qmth.teachcloud.common.service.SysUserService;
|
|
|
import com.qmth.teachcloud.common.util.ConvertUtil;
|
|
|
import com.qmth.teachcloud.common.util.ExcelUtil;
|
|
|
@@ -67,6 +66,9 @@ public class BasicExamStudentServiceImpl extends ServiceImpl<BasicExamStudentMap
|
|
|
@Resource
|
|
|
private SysUserService sysUserService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private CommonCacheService commonCacheService;
|
|
|
+
|
|
|
@Override
|
|
|
public IPage<BasicExamStudentResult> page(SysUser requestUser, Long semesterId, Long examId, String courseCode,
|
|
|
String teacher, String college, String major, String teachClazz, String examStudentInfo, int pageNumber,
|
|
|
@@ -250,6 +252,8 @@ public class BasicExamStudentServiceImpl extends ServiceImpl<BasicExamStudentMap
|
|
|
}
|
|
|
|
|
|
// 校验2 试卷编号存在时，任课教师，考试时间，考点考场均必填；
|
|
|
+ BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
|
|
|
+ boolean needPaperNumber = basicSchool.getHasPaperNumber();
|
|
|
if (SystemConstant.strNotNull(paperNumber)) {
|
|
|
String hasPaperNumberError = "存在试卷编号时: ";
|
|
|
if (!SystemConstant.strNotNull(teacherCode) || !SystemConstant.strNotNull(teacherName)) {
|
|
|
@@ -264,6 +268,8 @@ public class BasicExamStudentServiceImpl extends ServiceImpl<BasicExamStudentMap
|
|
|
if (!SystemConstant.strNotNull(examRoom)) {
|
|
|
errorMsgList.add(hasPaperNumberError + "缺少考场信息");
|
|
|
}
|
|
|
+ } else if (needPaperNumber) {
|
|
|
+ errorMsgList.add("缺少试卷编号");
|
|
|
}
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(errorMsgList)) {
|
caozixuan