fix 试卷编号更改 教研分析部分

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

@@ -58,14 +58,15 @@ public class GradePaperDimensionServiceImpl extends ServiceImpl<GradePaperDimens
         List<GradePaperDimensionDatasource> datasource = gradePaperDimensionParam.getDatasource();
 
         gradeBatchPaperService.checkOperateAuth(schoolId, examId, paperNumber, paperType);
-        List<GradePaperDimension> gradePaperDimensionList = this.checkAndBuildGradePaperDimensionList(datasource, paperNumber, paperType, paperName, dimensionType, requestUser);
+        List<GradePaperDimension> gradePaperDimensionList = this.checkAndBuildGradePaperDimensionList(datasource,examId, paperNumber, paperType, paperName, dimensionType, requestUser);
         this.remove(new QueryWrapper<GradePaperDimension>().lambda()
                 .eq(GradePaperDimension::getSchoolId, requestUser.getSchoolId())
+                .eq(GradePaperDimension::getExamId,examId)
                 .eq(GradePaperDimension::getPaperNumber, paperNumber)
                 .eq(GradePaperDimension::getPaperType, paperType)
                 .eq(GradePaperDimension::getDimensionType, dimensionType));
         this.saveBatch(gradePaperDimensionList);
-        gradeBatchPaperService.updatePaperAndBatchStatus(examId, schoolId, paperNumber, paperType);
+        gradeBatchPaperService.updatePaperAndBatchStatus(schoolId,examId , paperNumber, paperType);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -202,7 +203,7 @@ public class GradePaperDimensionServiceImpl extends ServiceImpl<GradePaperDimens
      * @param requestUser                       请求用户
      * @return 构建好的维度预新增对象集合
      */
-    private List<GradePaperDimension> checkAndBuildGradePaperDimensionList(List<GradePaperDimensionDatasource> gradePaperDimensionDatasourceList, String paperNumber, String paperType, String paperName, DimensionEnum dimensionType, SysUser requestUser) {
+    private List<GradePaperDimension> checkAndBuildGradePaperDimensionList(List<GradePaperDimensionDatasource> gradePaperDimensionDatasourceList,Long examId, String paperNumber, String paperType, String paperName, DimensionEnum dimensionType, SysUser requestUser) {
         // TODO: 2022/6/15 校验如果试卷结构不为空，判断试卷结构中是不是存在
         Map<String, String> checkPrimaryCodeNameMap = new HashMap<>();
         List<GradePaperDimension> gradePaperDimensionList = new ArrayList<>();
@@ -214,7 +215,7 @@ public class GradePaperDimensionServiceImpl extends ServiceImpl<GradePaperDimens
             String nameSecond = gradePaperDimensionDatasource.getNameSecond();
             String interpretation = gradePaperDimensionDatasource.getInterpretation();
 
-            if (SystemConstant.isOneNull(paperNumber, paperType, dimensionType, codePrimary, namePrimary)) {
+            if (SystemConstant.isOneNull(examId,paperNumber, paperType, dimensionType, codePrimary, namePrimary)) {
                 throw ExceptionResultEnum.PARAMS_ERROR.exception();
             }
 
@@ -239,6 +240,7 @@ public class GradePaperDimensionServiceImpl extends ServiceImpl<GradePaperDimens
             }
             GradePaperDimension gradePaperDimension = new GradePaperDimension();
             gradePaperDimension.setSchoolId(requestUser.getSchoolId());
+            gradePaperDimension.setExamId(examId);
             gradePaperDimension.setPaperNumber(paperNumber);
             gradePaperDimension.setPaperType(paperType);
             gradePaperDimension.setPaperName(paperName);