1.0.5 优化

paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/PaperLibraryMapper.java

@@ -35,5 +35,5 @@ public interface PaperLibraryMapper extends BaseMapper<PaperLibrary> {
 
     List<String> listBatchNo(@Param("studentId") Long studentId);
 
-    int getStudentMaxSequence(@Param("paperScanTaskId") Long paperScanTaskId, @Param("studentId") Long studentId);
+    int getStudentMaxSequence(@Param("paperScanTaskId") Long paperScanTaskId,@Param("batchNo") String batchNo, @Param("studentId") Long studentId);
 }

paper-library-business/src/main/java/com/qmth/paper/library/business/service/PaperLibraryService.java

@@ -50,5 +50,5 @@ public interface PaperLibraryService extends IService<PaperLibrary> {
 
     Map<String, Object> pdfGenerate(DownLoadPaperParams params);
 
-    int getStudentMaxSequence(Long paperScanTaskId, Long studentId);
+    int getStudentMaxSequence(Long paperScanTaskId, String batchNo, Long studentId);
 }

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/ClientServiceImpl.java

@@ -130,8 +130,8 @@ public class ClientServiceImpl implements ClientService {
             }
             paperLibrary.setStudentId(examStudent.getId());
             //考生图片序号
-            int studentMaxSequence = paperLibraryService.getStudentMaxSequence(paperScanTaskId, examStudent.getId());
-            int studentSequence = studentMaxSequence + studentPaperNo;
+            int studentMaxSequence = paperLibraryService.getStudentMaxSequence(paperScanTaskId, batchNo, examStudent.getId());
+            int studentSequence = studentMaxSequence + 1;
             paperLibrary.setSequence(studentSequence);
             // 保存图片，生成路径
             PathSequenceVo pathSequenceVo = paperLibraryCommonService.saveLibraryFile(paperScanTask, examStudent, UploadFileEnum.IMAGE, studentSequence, frontFile, versoFile);

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperLibraryServiceImpl.java

@@ -467,8 +467,8 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
     }
 
     @Override
-    public int getStudentMaxSequence(Long paperScanTaskId, Long studentId) {
-        return  baseMapper.getStudentMaxSequence(paperScanTaskId, studentId);
+    public int getStudentMaxSequence(Long paperScanTaskId, String batchNo, Long studentId) {
+        return  baseMapper.getStudentMaxSequence(paperScanTaskId, batchNo, studentId);
     }
 
 }

paper-library-business/src/main/resources/mapper/PaperLibraryMapper.xml

@@ -123,7 +123,7 @@
     </select>
 
     <select id="getStudentMaxSequence" resultType="java.lang.Integer">
-        select ifnull(max(sequence),0) from paper_library where paper_scan_task_id=#{paperScanTaskId} and student_id=#{studentId}
+        select ifnull(max(sequence),0) from paper_library where paper_scan_task_id=#{paperScanTaskId} and student_id=#{studentId} and batch_no=#{batchNo}
     </select>
 
 </mapper>