修复电子卡格式解绑后未清除科目显示已上传卡格式

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/ExamSubjectService.java

@@ -66,4 +66,6 @@ public interface ExamSubjectService {
 	Boolean checkSubjectForExport(Integer examId);
 	
 	Boolean checkSubjectAbsentForExport(Integer examId);
+
+    void updateCardType(int examId);
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamSubjectServiceImpl.java

@@ -13,6 +13,10 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
+import cn.com.qmth.stmms.biz.exam.model.*;
+import cn.com.qmth.stmms.biz.exam.service.*;
+import cn.com.qmth.stmms.biz.file.enums.FormatType;
+import cn.com.qmth.stmms.common.enums.CardSource;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -26,16 +30,7 @@ import cn.com.qmth.stmms.biz.common.BaseQueryService;
 import cn.com.qmth.stmms.biz.exam.bean.SubjectSplit;
 import cn.com.qmth.stmms.biz.exam.dao.ExamStudentDao;
 import cn.com.qmth.stmms.biz.exam.dao.ExamSubjectDao;
-import cn.com.qmth.stmms.biz.exam.model.Exam;
-import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
-import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
-import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
 import cn.com.qmth.stmms.biz.exam.query.ExamStudentSearchQuery;
-import cn.com.qmth.stmms.biz.exam.service.CheckStudentService;
-import cn.com.qmth.stmms.biz.exam.service.ExamService;
-import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
-import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
-import cn.com.qmth.stmms.biz.exam.service.MarkGroupService;
 import cn.com.qmth.stmms.biz.exam.service.query.ExamSubjectSearchQuery;
 import cn.com.qmth.stmms.biz.exception.StatusException;
 import cn.com.qmth.stmms.biz.mark.model.PictureConfigItem;
@@ -68,6 +63,9 @@ public class ExamSubjectServiceImpl extends BaseQueryService<ExamSubject> implem
 	@Autowired
 	private MarkGroupService markGroupService;
 
+	@Autowired
+	private AnswerCardService answerCardService;
+
 	@Transactional
 	@Override
 	// @CachePut(value = "exam_subject_cache", key =
@@ -342,6 +340,20 @@ public class ExamSubjectServiceImpl extends BaseQueryService<ExamSubject> implem
 		}
 		return true;
 	}
+
+	@Override
+	@Transactional
+	public void updateCardType(int examId) {
+		List<ExamSubject> list = this.list(examId);
+		for (ExamSubject subject:list) {
+			AnswerCard answerCard = answerCardService.findByExamIdAndSubjectCode(examId,subject.getCode(), CardSource.WEB);
+			if(answerCard==null && FormatType.JSON.equals(subject.getCardType())){
+				subject.setCardType(null);
+				this.subjectDao.save(subject);
+			}
+		}
+	}
+
 	@Override
 	public Boolean checkSubjectForExport(Integer examId) {
 		Exam exam=examService.findById(examId);
@@ -362,7 +374,7 @@ public class ExamSubjectServiceImpl extends BaseQueryService<ExamSubject> implem
 		if (noGroupCount>0) {
 			return false;
 		}
-		
+
 		return true;
 	}
 

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/PaperController.java

@@ -957,6 +957,7 @@ public class PaperController extends BaseExamController {
                     error.add("[" + subjectCode + "] 科目代码导入失败；");
                 }
             }
+            subjectService.updateCardType(examId);
             target.delete();
         } catch (Exception e) {
             log.error("parse question excel error", e);