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

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

@@ -106,12 +106,12 @@ public class GradePaperStructServiceImpl extends ServiceImpl<GradePaperStructMap
 
             List<ExamTask> examTaskList = examTaskService.list(new QueryWrapper<ExamTask>().lambda()
                     .eq(ExamTask::getSchoolId, schoolId)
-                    .eq(ExamTask::getExamId,examId)
+                    .eq(ExamTask::getExamId, examId)
                     .eq(ExamTask::getPaperNumber, paperNumber));
             if (Objects.isNull(examTaskList)) {
                 throw ExceptionResultEnum.ERROR.exception("没有找到试卷编号对应的命题任务");
             }
-            if (examTaskList.size() > 1){
+            if (examTaskList.size() > 1) {
                 throw ExceptionResultEnum.ERROR.exception("有多个考试任务异常");
             }
             ExamTask examTask = examTaskList.get(0);
@@ -168,7 +168,7 @@ public class GradePaperStructServiceImpl extends ServiceImpl<GradePaperStructMap
         // 验证批次分析试卷是否在计算
         gradeBatchPaperService.checkOperateAuth(schoolId, examId, paperNumber, paperType);
         // 检验结构正确性并构建分析试卷结构
-        List<GradePaperStruct> gradePaperStructList = this.checkAndBuildGradePaperStruct(datasource, paperNumber, paperType, paperName, requestUser);
+        List<GradePaperStruct> gradePaperStructList = this.checkAndBuildGradePaperStruct(datasource, examId, paperNumber, paperType, paperName, requestUser);
         // 删除旧的试卷结构
         this.remove(new QueryWrapper<GradePaperStruct>()
                 .lambda()
@@ -317,12 +317,13 @@ public class GradePaperStructServiceImpl extends ServiceImpl<GradePaperStructMap
      * @param requestUser 请求用户
      * @return 创建好的分析试卷结构
      */
-    private List<GradePaperStruct> checkAndBuildGradePaperStruct(List<GradePaperStructDatasource> datasource, String paperNumber, String paperType, String paperName, SysUser requestUser) {
+    private List<GradePaperStruct> checkAndBuildGradePaperStruct(List<GradePaperStructDatasource> datasource, Long examId, String paperNumber, String paperType, String paperName, SysUser requestUser) {
         Long schoolId = requestUser.getSchoolId();
         Long userId = requestUser.getId();
 
         return datasource.stream().flatMap(e -> {
             GradePaperStruct gradePaperStruct = new GradePaperStruct();
+            gradePaperStruct.setExamId(examId);
             gradePaperStruct.setSchoolId(schoolId);
             gradePaperStruct.setPaperNumber(paperNumber);
             gradePaperStruct.setPaperType(paperType);