|
@@ -371,9 +371,9 @@ public class ScanAnswerCardServiceImpl extends ServiceImpl<ScanAnswerCardMapper,
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@Transactional
|
|
@Transactional
|
|
- public AnswerCardVo cardCopy(Long examId, Integer number,String remark) {
|
|
|
|
- ScanAnswerCard old = this.findByExamAndNumber(examId,number);
|
|
|
|
- if(old ==null ){
|
|
|
|
|
|
+ public AnswerCardVo cardCopy(Long examId, Integer number, String remark) {
|
|
|
|
+ ScanAnswerCard old = this.findByExamAndNumber(examId, number);
|
|
|
|
+ if (old == null) {
|
|
throw new ParameterException("未找到卡格式信息");
|
|
throw new ParameterException("未找到卡格式信息");
|
|
}
|
|
}
|
|
if (CardSource.CLIENT.equals(old.getSource())) {
|
|
if (CardSource.CLIENT.equals(old.getSource())) {
|
|
@@ -399,6 +399,23 @@ public class ScanAnswerCardServiceImpl extends ServiceImpl<ScanAnswerCardMapper,
|
|
card.setRemark(remark);
|
|
card.setRemark(remark);
|
|
this.save(card);
|
|
this.save(card);
|
|
|
|
|
|
- return this.cardGet(examId,card.getNumber());
|
|
|
|
|
|
+ return this.cardGet(examId, card.getNumber());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 根据examId和cardId以及cardSource获取扫描题卡
|
|
|
|
+ *
|
|
|
|
+ * @param examId
|
|
|
|
+ * @param cardId
|
|
|
|
+ * @param source
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ @Override
|
|
|
|
+ public ScanAnswerCard findByExamAndCardIdAndCardSource(Long examId, Long cardId, CardSource source) {
|
|
|
|
+ QueryWrapper<ScanAnswerCard> queryWrapper = new QueryWrapper<>();
|
|
|
|
+ queryWrapper.lambda().eq(ScanAnswerCard::getExamId, examId)
|
|
|
|
+ .eq(ScanAnswerCard::getCardId, cardId)
|
|
|
|
+ .eq(ScanAnswerCard::getSource, source);
|
|
|
|
+ return this.getOne(queryWrapper);
|
|
}
|
|
}
|
|
}
|
|
}
|