|
|
@@ -1,16 +1,17 @@
|
|
|
package com.qmth.teachcloud.task.service.impl;
|
|
|
|
|
|
-import ch.qos.logback.classic.turbo.TurboFilter;
|
|
|
import com.qmth.distributed.print.business.bean.dto.initMarkData.ExamDetailCourseInitMarkDto;
|
|
|
import com.qmth.distributed.print.business.entity.ExamCard;
|
|
|
import com.qmth.distributed.print.business.entity.ExamStudent;
|
|
|
import com.qmth.distributed.print.business.entity.ExamTaskDetail;
|
|
|
+import com.qmth.distributed.print.business.enums.CardTypeEnum;
|
|
|
import com.qmth.distributed.print.business.service.ExamCardService;
|
|
|
import com.qmth.distributed.print.business.service.ExamStudentService;
|
|
|
import com.qmth.distributed.print.business.service.ExamTaskDetailService;
|
|
|
import com.qmth.teachcloud.common.bean.vo.PaperInfoVo;
|
|
|
import com.qmth.teachcloud.common.contant.SystemConstant;
|
|
|
import com.qmth.teachcloud.common.entity.MarkQuestion;
|
|
|
+import com.qmth.teachcloud.common.enums.CardCreateMethodEnum;
|
|
|
import com.qmth.teachcloud.common.enums.UploadFileEnum;
|
|
|
import com.qmth.teachcloud.common.util.ExamTaskUtil;
|
|
|
import com.qmth.teachcloud.mark.bean.vo.parseCard.Struct;
|
|
|
@@ -132,10 +133,13 @@ public class PrintFinishServiceImpl implements PrintFinishService {
|
|
|
for (PaperInfoVo paperInfoVo : paperInfoVoList) {
|
|
|
ExamCard examCard = examCardService.getById(paperInfoVo.getCardId());
|
|
|
if (examCard != null) {
|
|
|
+ // 上传通卡，不同步卡格式
|
|
|
+ if (CardTypeEnum.GENERIC.equals(examCard.getType()) && CardCreateMethodEnum.UPLOAD.equals(examCard.getCreateMethod())) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
// 解析卡格式中试卷结构并保存
|
|
|
this.insertMarkQuestion(dto.getExamId(), dto.getPaperNumber(), examCard.getContent());
|
|
|
-
|
|
|
- // 保存卡格式
|
|
|
+ // 生成并保存卡格式文件（后缀为.json）
|
|
|
this.insertScanAnswerCard(dto, paperInfoVo, examCard.getContent());
|
|
|
}
|
|
|
}
|
xiaofei