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

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/GradePaperDimensionMapper.java

@@ -29,7 +29,5 @@ public interface GradePaperDimensionMapper extends BaseMapper<GradePaperDimensio
      */
     List<GradePaperDimensionResult> findGradePaperDimensionList(@Param("examId") Long examId, @Param("paperNumber") String paperNumber, @Param("paperType") String paperType, @Param("schoolId") Long schoolId);
 
-    List<PaperDimension> findBySchoolIdAndPaperNumberAndPaperType(@Param("schoolId") Long schoolId, @Param("paperNumber") String paperNumber, @Param("paperType") String paperType);
-
-
+    List<PaperDimension> findBySchoolIdAndPaperNumberAndPaperType(@Param("schoolId") Long schoolId,@Param("examId") Long examId, @Param("paperNumber") String paperNumber, @Param("paperType") String paperType);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/GradePaperStructMapper.java

@@ -28,5 +28,5 @@ public interface GradePaperStructMapper extends BaseMapper<GradePaperStruct> {
      */
     List<GradePaperStructResult> findStructByGradePaper(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("paperNumber") String paperNumber, @Param("paperType") String paperType);
 
-    List<PaperStructure> findBySchoolIdAndPaperNumberAndPaperType(@Param("schoolId") Long schoolId, @Param("paperNumber") String paperNumber, @Param("paperType") String paperType);
+    List<PaperStructure> findBySchoolIdAndPaperNumberAndPaperType(@Param("schoolId") Long schoolId,@Param("examId") Long examId, @Param("paperNumber") String paperNumber, @Param("paperType") String paperType);
 }

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

@@ -74,5 +74,5 @@ public interface GradePaperDimensionService extends IService<GradePaperDimension
      */
     void exportGradePaperDimensionTemplate(String courseCode, String courseName, DimensionEnum dimensionType) throws Exception;
 
-    List<PaperDimension> findBySchoolIdAndPaperNumberAndPaperType(Long schoolId, String paperNumber, String paperType);
+    List<PaperDimension> findBySchoolIdAndPaperNumberAndPaperType(Long schoolId,Long examId, String paperNumber, String paperType);
 }

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

@@ -61,7 +61,7 @@ public interface GradePaperStructService extends IService<GradePaperStruct> {
      */
     void exportGradePaperStructTemplate(Long examId, String paperNumber, String paperType, SysUser requestUser) throws Exception;
 
-    List<PaperStructure> findBySchoolIdAndPaperNumberAndPaperType(Long schoolId, String paperNumber, String paperType);
+    List<PaperStructure> findBySchoolIdAndPaperNumberAndPaperType(Long schoolId,Long examId, String paperNumber, String paperType);
 
     /**
      * 更新云阅卷试卷结构

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

@@ -181,8 +181,8 @@ public class GradePaperDimensionServiceImpl extends ServiceImpl<GradePaperDimens
     }
 
     @Override
-    public List<PaperDimension> findBySchoolIdAndPaperNumberAndPaperType(Long schoolId, String paperNumber, String paperType) {
-        return this.baseMapper.findBySchoolIdAndPaperNumberAndPaperType(schoolId, paperNumber, paperType);
+    public List<PaperDimension> findBySchoolIdAndPaperNumberAndPaperType(Long schoolId,Long examId, String paperNumber, String paperType) {
+        return this.baseMapper.findBySchoolIdAndPaperNumberAndPaperType(schoolId,examId, paperNumber, paperType);
     }
 
     /**

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

@@ -249,8 +249,8 @@ public class GradePaperStructServiceImpl extends ServiceImpl<GradePaperStructMap
     }
 
     @Override
-    public List<PaperStructure> findBySchoolIdAndPaperNumberAndPaperType(Long schoolId, String paperNumber, String paperType) {
-        return this.baseMapper.findBySchoolIdAndPaperNumberAndPaperType(schoolId, paperNumber, paperType);
+    public List<PaperStructure> findBySchoolIdAndPaperNumberAndPaperType(Long schoolId, Long examId, String paperNumber, String paperType) {
+        return this.baseMapper.findBySchoolIdAndPaperNumberAndPaperType(schoolId, examId, paperNumber, paperType);
     }
 
     @Transactional(rollbackFor = Exception.class)

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

@@ -80,7 +80,7 @@ public class OpenApiServiceImpl implements OpenApiService {
         if (gradeBatchPaper == null) {
             return new ArrayList<>();
         }
-        return gradePaperDimensionService.findBySchoolIdAndPaperNumberAndPaperType(gradeBatchPaper.getSchoolId(), gradeBatchPaper.getPaperNumber(), gradeBatchPaper.getPaperType());
+        return gradePaperDimensionService.findBySchoolIdAndPaperNumberAndPaperType(gradeBatchPaper.getSchoolId(),gradeBatchPaper.getExamId(), gradeBatchPaper.getPaperNumber(), gradeBatchPaper.getPaperType());
     }
 
     @Override
@@ -89,7 +89,7 @@ public class OpenApiServiceImpl implements OpenApiService {
         if (gradeBatchPaper == null) {
             return new ArrayList<>();
         }
-        return gradePaperStructService.findBySchoolIdAndPaperNumberAndPaperType(gradeBatchPaper.getSchoolId(), gradeBatchPaper.getPaperNumber(), gradeBatchPaper.getPaperType());
+        return gradePaperStructService.findBySchoolIdAndPaperNumberAndPaperType(gradeBatchPaper.getSchoolId(),gradeBatchPaper.getExamId(), gradeBatchPaper.getPaperNumber(), gradeBatchPaper.getPaperType());
     }
 
     @Override

distributed-print-business/src/main/resources/mapper/GradeBatchPaperMapper.xml

@@ -40,7 +40,7 @@
         grade_batch_paper gbp
         LEFT JOIN
         exam_task et ON gbp.school_id = et.school_id
-        AND gbp.paper_number = et.paper_number
+        AND gbp.paper_number = et.paper_number AND gbp.exam_id = et.exam_id
         LEFT JOIN
         basic_exam be ON et.school_id = be.school_id
         AND et.exam_id = be.id

distributed-print-business/src/main/resources/mapper/GradeInitializeMapper.xml

@@ -23,6 +23,7 @@
                 INNER JOIN
             (SELECT
                  school_id,
+                 exam_id,
                  paper_number,
                  paper_type,
                  MAX(paper_name) AS paper_name,
@@ -33,8 +34,9 @@
              WHERE
                  enable = TRUE
                AND status NOT IN ('SETTING_GRADE_PAPER' , 'PUSH_GRADE_BATCH')
-             GROUP BY school_id , paper_number , paper_type) pnpt ON et.school_id = pnpt.school_id
+             GROUP BY school_id ,exam_id, paper_number , paper_type) pnpt ON et.school_id = pnpt.school_id
                 AND et.paper_number = pnpt.paper_number
+                AND et.exam_id = pnpt.exam_id
                 AND LOCATE(pnpt.paper_type, etd.relate_paper_type)
                 INNER JOIN
             basic_exam be ON et.exam_id = be.id AND be.enable
@@ -42,7 +44,7 @@
             basic_semester bs ON bs.id = be.semester_id AND bs.enable
                 LEFT JOIN
             exam_paper_structure eps ON et.school_id = eps.school_id
-                AND et.paper_number = eps.paper_number AND eps.paper_type = pnpt.paper_type
+                AND et.paper_number = eps.paper_number AND eps.paper_type = pnpt.paper_type AND et.exam_id = eps.exam_id
         <where>
             <if test="schoolId != null and schoolId != ''">
                 AND et.school_id = #{schoolId}
@@ -68,7 +70,7 @@
                 </if>
             </if>
         </where>
-        ORDER BY bs.name , be.name , et.course_code , et.paper_number , pnpt.paper_type
+        ORDER BY bs.name , be.name , et.course_code ,et.exam_id, et.paper_number , pnpt.paper_type
     </select>
 
     <select id="listNeedAnalyzedPaperToWork"
@@ -78,6 +80,7 @@
         be.name AS examName,
         et.course_code AS courseCode,
         et.course_name AS courseName,
+        et.exam_id AS examId,
         et.paper_number AS paperNumber,
         pnpt.paper_type AS paperType,
         pnpt.paper_name AS paperName
@@ -88,6 +91,7 @@
         INNER JOIN
         (SELECT
         school_id,
+        exam_id,
         paper_number,
         paper_type,
         MAX(paper_name) AS paper_name
@@ -104,7 +108,8 @@
                 </otherwise>
             </choose>
         </if>
-        GROUP BY school_id , paper_number , paper_type) pnpt ON et.school_id = pnpt.school_id
+        GROUP BY school_id ,exam_id, paper_number , paper_type) pnpt ON et.school_id = pnpt.school_id
+        AND et.exam_id = pnpt.exam_id
         AND et.paper_number = pnpt.paper_number
         AND LOCATE(pnpt.paper_type, etd.relate_paper_type)
         LEFT JOIN
@@ -119,6 +124,6 @@
                 AND et.user_id = #{userId}
             </if>
         </where>
-        ORDER BY bs.name , be.name , et.course_code , et.paper_number , pnpt.paper_type
+        ORDER BY bs.name , be.name , et.course_code ,et.exam_id, et.paper_number , pnpt.paper_type
     </select>
 </mapper>

distributed-print-business/src/main/resources/mapper/GradePaperDimensionMapper.xml

@@ -17,6 +17,7 @@
             grade_paper_dimension gpd
                 LEFT JOIN
             exam_task et ON gpd.school_id = et.school_id
+                AND gpd.exam_id = et.exam_id
                 AND gpd.paper_number = et.paper_number
         <where>
             <if test="schoolId != null and schoolId != ''">
@@ -46,6 +47,7 @@
                interpretation
         FROM grade_paper_dimension
         where school_id = #{schoolId}
+          and exam_id = #{examId}
           and paper_number = #{paperNumber}
           and paper_type = #{paperType}
     </select>

distributed-print-business/src/main/resources/mapper/GradePaperStructMapper.xml

@@ -16,8 +16,10 @@
                ability_dimension     abilityDimension
         FROM grade_paper_struct
         where school_id = #{schoolId}
+          and exam_id = #{examId}
           and paper_number = #{paperNumber}
           and paper_type = #{paperType}
+
     </select>
 
     <select id="findStructByGradePaper"
@@ -40,12 +42,14 @@
                 LEFT JOIN
             (SELECT
                  school_id,
+                 exam_id,
                  paper_number,
                  MAX(course_code) AS course_code,
                  MAX(course_name) AS course_name
              FROM
                  exam_task
-             GROUP BY school_id , paper_number) et ON gps.school_id = et.school_id
+             GROUP BY school_id ,exam_id, paper_number) et ON gps.school_id = et.school_id
+                AND gps.exam_Id = et.exam_id
                 AND gps.paper_number = et.paper_number
         <where>
             <if test="schoolId != null and schoolId != ''">
@@ -61,6 +65,6 @@
                 AND gps.paper_type = #{paperType}
             </if>
         </where>
-        ORDER BY gps.paper_number,gps.paper_type,gps.number_type,gps.big_question_number,gps.small_question_number
+        ORDER BY gps.exam_id,gps.paper_number,gps.paper_type,gps.number_type,gps.big_question_number,gps.small_question_number
     </select>
 </mapper>