3.4.2 update-1219-重置考生试卷编号、卷型

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

@@ -92,5 +92,7 @@ public interface BasicExamStudentService extends IService<BasicExamStudent> {
 
     void clearPaperNumberAndPaperTypeById(List<Long> ids);
 
+    void clearPaperTypeByExamIdAndPaperNumber(Long examId, String paperNumber);
+
     void clearPaperNumberAndPaperTypeByExamIdAndPaperNumber(Long examId, String paperNumber);
 }

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

@@ -567,11 +567,21 @@ public class BasicExamStudentServiceImpl extends ServiceImpl<BasicExamStudentMap
     }
 
     @Override
-    public void clearPaperNumberAndPaperTypeByExamIdAndPaperNumber(Long examId, String paperNumber) {
+    public void clearPaperTypeByExamIdAndPaperNumber(Long examId, String paperNumber) {
         UpdateWrapper<BasicExamStudent> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().set(BasicExamStudent::getPaperType, null)
                 .eq(BasicExamStudent::getExamId, examId)
                 .eq(BasicExamStudent::getPaperNumber, paperNumber);
         this.update(updateWrapper);
     }
+
+    @Override
+    public void clearPaperNumberAndPaperTypeByExamIdAndPaperNumber(Long examId, String paperNumber) {
+        UpdateWrapper<BasicExamStudent> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.lambda().set(BasicExamStudent::getPaperNumber, null)
+                .set(BasicExamStudent::getPaperType, null)
+                .eq(BasicExamStudent::getExamId, examId)
+                .eq(BasicExamStudent::getPaperNumber, paperNumber);
+        this.update(updateWrapper);
+    }
 }

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

@@ -791,7 +791,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
                         // 清空考生管理中卷型
                         basicExamStudentService.clearPaperNumberAndPaperTypeById(examStudents.stream().filter(m -> m.getBasicStudentId() != null).map(ExamStudent::getBasicStudentId).collect(Collectors.toList()));
                     } else {
-                        basicExamStudentService.clearPaperNumberAndPaperTypeByExamIdAndPaperNumber(examDetail.getExamId(), examDetailCourse.getPaperNumber());
+                        basicExamStudentService.clearPaperTypeByExamIdAndPaperNumber(examDetail.getExamId(), examDetailCourse.getPaperNumber());
                     }
 
                 }

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

@@ -1844,6 +1844,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         examTaskPaperDataService.deleteByExamIdAndPaperNumber(examTask.getExamId(), examTask.getPaperNumber());
         // 删除考场信息
         examDetailService.deleteByExamIdAndPaperNumber(examTask.getSchoolId(), examTask.getExamId(), examTask.getPaperNumber());
+        // 清空已生成试卷编号的考生的试卷编号
+        basicExamStudentService.clearPaperNumberAndPaperTypeByExamIdAndPaperNumber(examTask.getExamId(), examTask.getPaperNumber());
     }
 
     @Override