Merge remote-tracking branch 'origin/dev_v3.4.4' into dev_v3.4.4

# Conflicts:
#	teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/ScanAnswerCardServiceImpl.java

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicExamStudentService.java

@@ -101,5 +101,5 @@ public interface BasicExamStudentService extends IService<BasicExamStudent> {
 
     String listByTeacherByExamIdAndPaperNumber(Long examId, String paperNumber);
 
-    BasicExamStudent findByExamIdAndCoursePaperIdAndStudentCode(Long examId, String coursePaperId, String studentCode);
+    BasicExamStudent findByExamIdAndCourseIdAndStudentCode(Long examId, Long courseId, String studentCode);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicExamStudentServiceImpl.java

@@ -793,10 +793,10 @@ public class BasicExamStudentServiceImpl extends ServiceImpl<BasicExamStudentMap
     }
 
     @Override
-    public BasicExamStudent findByExamIdAndCoursePaperIdAndStudentCode(Long examId, String coursePaperId, String studentCode) {
+    public BasicExamStudent findByExamIdAndCourseIdAndStudentCode(Long examId, Long courseId, String studentCode) {
         QueryWrapper<BasicExamStudent> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(BasicExamStudent::getExamId, examId)
-                .eq(BasicExamStudent::getCoursePaperId, coursePaperId)
+                .eq(BasicExamStudent::getCourseId, courseId)
                 .eq(BasicExamStudent::getStudentCode,studentCode);
         return this.getOne(queryWrapper);
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/ScanStudentController.java

@@ -134,11 +134,11 @@ public class ScanStudentController extends BaseController {
         if(markStudent != null ){
             throw new ParameterException("考生已存在");
         }
-        BasicExamStudent basicExamStudent = basicExamStudentService.findByExamIdAndCoursePaperIdAndStudentCode(examId,coursePaperId,studentCode);
+        MarkPaper markPaper = markPaperService.getByExamIdAndCoursePaperId(examId, coursePaperId);
+        BasicExamStudent basicExamStudent = basicExamStudentService.findByExamIdAndCourseIdAndStudentCode(examId,markPaper.getCourseId(),studentCode);
         if(basicExamStudent != null ){
             throw new ParameterException("基础考生已存在");
         }
-        MarkPaper markPaper = markPaperService.getByExamIdAndCoursePaperId(examId, coursePaperId);
         BasicExam basicExam = basicExamService.getById(examId);
         basicExamStudent = new BasicExamStudent();
         basicExamStudent.setId(SystemConstant.getDbUuid());
@@ -148,7 +148,7 @@ public class ScanStudentController extends BaseController {
         basicExamStudent.setCourseId(markPaper.getCourseId());
         basicExamStudent.setCourseCode(markPaper.getCourseCode());
         basicExamStudent.setCourseName(markPaper.getCourseName());
-        basicExamStudent.setCoursePaperId(coursePaperId);
+//        basicExamStudent.setCoursePaperId(coursePaperId);
         basicExamStudent.setPaperNumber(markPaper.getPaperNumber());
         basicExamStudent.setPaperType(paperType);
         basicExamStudent.setStudentCode(studentCode);

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/ScanAnswerCardServiceImpl.java

@@ -371,9 +371,9 @@ public class ScanAnswerCardServiceImpl extends ServiceImpl<ScanAnswerCardMapper,
 
     @Override
     @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("未找到卡格式信息");
         }
         if (CardSource.CLIENT.equals(old.getSource())) {
@@ -390,30 +390,15 @@ public class ScanAnswerCardServiceImpl extends ServiceImpl<ScanAnswerCardMapper,
         card.setRemark(old.getRemark());
         card.setDpi(old.getDpi());
         card.setSource(CardSource.WEB);
+        card.setSerialNumber(old.getSerialNumber());
+        card.setCardId(old.getCardId());
         card.setNumber(findMaxCardNumberByExamId(examId) + 1);
-        card.setNeedAdapte(false);
+        card.setNeedAdapte(true);
         card.setMd5(old.getMd5());
         card.setUri(old.getUri());
         card.setRemark(remark);
         this.save(card);
 
-        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);
+        return this.cardGet(examId,card.getNumber());
     }
 }