|
@@ -7,14 +7,17 @@ import com.keao.edu.common.dal.BaseDAO;
|
|
import com.keao.edu.common.exception.BizException;
|
|
import com.keao.edu.common.exception.BizException;
|
|
import com.keao.edu.common.page.PageInfo;
|
|
import com.keao.edu.common.page.PageInfo;
|
|
import com.keao.edu.common.service.impl.BaseServiceImpl;
|
|
import com.keao.edu.common.service.impl.BaseServiceImpl;
|
|
|
|
+import com.keao.edu.user.api.entity.ExamRoom;
|
|
import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
|
|
import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
|
|
import com.keao.edu.user.dao.ExamReviewDao;
|
|
import com.keao.edu.user.dao.ExamReviewDao;
|
|
|
|
+import com.keao.edu.user.dao.ExamRoomDao;
|
|
import com.keao.edu.user.dao.SysUserDao;
|
|
import com.keao.edu.user.dao.SysUserDao;
|
|
import com.keao.edu.user.dto.ExamReviewDto;
|
|
import com.keao.edu.user.dto.ExamReviewDto;
|
|
import com.keao.edu.user.dto.ExamReviewRecordDto;
|
|
import com.keao.edu.user.dto.ExamReviewRecordDto;
|
|
import com.keao.edu.user.entity.ExamReview;
|
|
import com.keao.edu.user.entity.ExamReview;
|
|
import com.keao.edu.user.entity.ExaminationBasic;
|
|
import com.keao.edu.user.entity.ExaminationBasic;
|
|
import com.keao.edu.user.entity.Subject;
|
|
import com.keao.edu.user.entity.Subject;
|
|
|
|
+import com.keao.edu.user.enums.ExamRoomTeaherTypeEnum;
|
|
import com.keao.edu.user.enums.YesOrNoEnum;
|
|
import com.keao.edu.user.enums.YesOrNoEnum;
|
|
import com.keao.edu.user.page.ExamReviewQueryInfo;
|
|
import com.keao.edu.user.page.ExamReviewQueryInfo;
|
|
import com.keao.edu.user.page.ExamReviewRecordQueryInfo;
|
|
import com.keao.edu.user.page.ExamReviewRecordQueryInfo;
|
|
@@ -43,6 +46,8 @@ public class ExamReviewServiceImpl extends BaseServiceImpl<Long, ExamReview> imp
|
|
private ExamRoomStudentRelationService examRoomStudentRelationService;
|
|
private ExamRoomStudentRelationService examRoomStudentRelationService;
|
|
@Autowired
|
|
@Autowired
|
|
private SysUserDao sysUserDao;
|
|
private SysUserDao sysUserDao;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ExamRoomDao examRoomDao;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public BaseDAO<Long, ExamReview> getDAO() {
|
|
public BaseDAO<Long, ExamReview> getDAO() {
|
|
@@ -109,6 +114,10 @@ public class ExamReviewServiceImpl extends BaseServiceImpl<Long, ExamReview> imp
|
|
public void add(ExamReview examReview) {
|
|
public void add(ExamReview examReview) {
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
sysUserDao.lockUser(sysUser.getId());
|
|
sysUserDao.lockUser(sysUser.getId());
|
|
|
|
+ ExamRoom examRoom = examRoomDao.get(examReview.getExamRoomId());
|
|
|
|
+ if(Objects.isNull(examRoom)){
|
|
|
|
+ throw new BizException("考场信息错误");
|
|
|
|
+ }
|
|
Long examRegistrationId = examReview.getExamRegistrationId();
|
|
Long examRegistrationId = examReview.getExamRegistrationId();
|
|
ExamReview byRegistrationId = examReviewDao.findByRegistrationId(examRegistrationId,sysUser.getId());
|
|
ExamReview byRegistrationId = examReviewDao.findByRegistrationId(examRegistrationId,sysUser.getId());
|
|
if(byRegistrationId != null){
|
|
if(byRegistrationId != null){
|
|
@@ -123,6 +132,11 @@ public class ExamReviewServiceImpl extends BaseServiceImpl<Long, ExamReview> imp
|
|
examReview.setStudentId(examRoomStudentRelation.getStudentId());
|
|
examReview.setStudentId(examRoomStudentRelation.getStudentId());
|
|
examReview.setExamRoomId(examRoomStudentRelation.getExamRoomId());
|
|
examReview.setExamRoomId(examRoomStudentRelation.getExamRoomId());
|
|
examReview.setTenantId(examRoomStudentRelation.getTenantId());
|
|
examReview.setTenantId(examRoomStudentRelation.getTenantId());
|
|
|
|
+ if(sysUser.getId().equals(examRoom.getMainTeacherUserId())){
|
|
|
|
+ examReview.setTeacherType(ExamRoomTeaherTypeEnum.MAIN);
|
|
|
|
+ }else{
|
|
|
|
+ examReview.setTeacherType(ExamRoomTeaherTypeEnum.ASSISTANT);
|
|
|
|
+ }
|
|
examReviewDao.insert(examReview);
|
|
examReviewDao.insert(examReview);
|
|
}
|
|
}
|
|
|
|
|