1.1.0 update-20250110赋分导出问题

src/main/java/com/qmth/eds/mapper/CloudMarkingScoreMapper.java

@@ -31,7 +31,7 @@ public interface CloudMarkingScoreMapper extends BaseMapper<CloudMarkingScore> {
                                              @Param("openCollege") String openCollege,
                                              @Param("courseCode") String courseCode);
 
-    List<ScoreDownloadDto> listScoreBySemesterIdAndExamTypeIdAndCollegeIdAndCourseCodeAndOpenCollege(@Param("semesterId") Long semesterId, @Param("examTypeId") Long examTypeId, @Param("collegeId") Long collegeId, @Param("courseCode") String courseCode, @Param("openCollege") String openCollege);
+    List<ScoreDownloadDto> listScoreBySemesterIdAndExamTypeIdAndCollegeIdAndCourseCodeAndOpenCollege(@Param("semesterId") Long semesterId, @Param("examTypeId") Long examTypeId, @Param("collegeId") Long collegeId, @Param("courseCode") String courseCode, @Param("syncCourseCode") String syncCourseCode, @Param("openCollege") String openCollege);
 
     List<CourseResult> conditionCourseQuery(@Param("semesterId") Long semesterId, @Param("examTypeId") Long examTypeId, @Param("collegeId") Long collegeId);
 }

src/main/java/com/qmth/eds/service/CloudMarkingScoreService.java

@@ -37,7 +37,7 @@ public interface CloudMarkingScoreService extends IService<CloudMarkingScore> {
                                              String openCollege,
                                              String courseCode);
 
-    List<ScoreDownloadDto> listScoreBySemesterIdAndExamTypeIdAndCollegeIdAndCourseCodeAndOpenCollege(Long semesterId, Long examTypeId, Long collegeId, String courseCode, String openCollege);
+    List<ScoreDownloadDto> listScoreBySemesterIdAndExamTypeIdAndCollegeIdAndCourseCodeAndOpenCollege(Long semesterId, Long examTypeId, Long collegeId, String courseCode, String syncCourseCode, String openCollege);
 
     List<CloudMarkingScore> listByCollegeIdAndSemesterIdAndExamTypeIdAndSubjectCodeAndOpenCollege(Long collegeId, Long semesterId, Long examTypeId, String courseCode, String syncCourseCode, String openCollege);
 

src/main/java/com/qmth/eds/service/impl/CloudMarkingScoreServiceImpl.java

@@ -60,8 +60,8 @@ public class CloudMarkingScoreServiceImpl extends ServiceImpl<CloudMarkingScoreM
     }
 
     @Override
-    public List<ScoreDownloadDto> listScoreBySemesterIdAndExamTypeIdAndCollegeIdAndCourseCodeAndOpenCollege(Long semesterId, Long examTypeId, Long collegeId, String courseCode, String openCollege) {
-        return this.baseMapper.listScoreBySemesterIdAndExamTypeIdAndCollegeIdAndCourseCodeAndOpenCollege(semesterId, examTypeId, collegeId, courseCode, openCollege);
+    public List<ScoreDownloadDto> listScoreBySemesterIdAndExamTypeIdAndCollegeIdAndCourseCodeAndOpenCollege(Long semesterId, Long examTypeId, Long collegeId, String courseCode, String syncCourseCode, String openCollege) {
+        return this.baseMapper.listScoreBySemesterIdAndExamTypeIdAndCollegeIdAndCourseCodeAndOpenCollege(semesterId, examTypeId, collegeId, courseCode, syncCourseCode, openCollege);
     }
 
     @Override

src/main/java/com/qmth/eds/service/impl/ExamAssignServiceImpl.java

@@ -272,15 +272,17 @@ public class ExamAssignServiceImpl extends ServiceImpl<ExamAssignMapper, ExamAss
     @Override
     public void download(Long id, Long semesterId, Long examTypeId, Long collegeId, String courseCode, String openCollege, HttpServletResponse response) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        String syncCourseCode = null;
         try {
             String fileNamePrefix = "批量导出" + System.currentTimeMillis();
             if (id != null) {
                 ExamAssign examAssign = this.getById(id);
                 if (examAssign != null) {
                     fileNamePrefix = examAssign.getCourseName() + "(" + examAssign.getCourseCode() + ")";
+                    syncCourseCode = examAssign.getSyncCourseCode();
                 }
             }
-            List<ScoreDownloadDto> scoreDownloadDtoList = cloudMarkingScoreService.listScoreBySemesterIdAndExamTypeIdAndCollegeIdAndCourseCodeAndOpenCollege(semesterId, examTypeId, collegeId, courseCode, openCollege);
+            List<ScoreDownloadDto> scoreDownloadDtoList = cloudMarkingScoreService.listScoreBySemesterIdAndExamTypeIdAndCollegeIdAndCourseCodeAndOpenCollege(semesterId, examTypeId, collegeId, courseCode, syncCourseCode, openCollege);
             response.setHeader("Content-Disposition",
                     "inline;filename=" + URLEncoder.encode(fileNamePrefix, SystemConstant.CHARSET_NAME) + ".xlsx");
             response.setContentType("application/vnd.ms-excel");

src/main/resources/mapper/CloudMarkingScoreMapper.xml

@@ -165,6 +165,9 @@
             <if test="collegeId != null">
                 and cms.school_id = #{collegeId}
             </if>
+            <if test="syncCourseCode != null">
+                and cms.sync_course_code = #{syncCourseCode}
+            </if>
             <if test="courseCode != null">
                 and cms.subject_code = #{courseCode}
             </if>