1.1.0 update-20250624解决成绩下载bug

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.eds</groupId>
     <artifactId>eds-service</artifactId>
-    <version>1.0.2</version>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
 
     <properties>

src/main/java/com/qmth/eds/api/CloudMarkingScoreForeignController.java

@@ -62,8 +62,9 @@ public class CloudMarkingScoreForeignController {
     @PostMapping("/download_score")
     public void downloadScore(@RequestParam(value = "semesterId", required = false) Long semesterId,
                               @RequestParam(value = "examTypeId", required = false) Long examTypeId,
+                              @RequestParam(value = "collegeId", required = false) String collegeId,
                               @RequestParam(value = "examId", required = false) String examId,
                               HttpServletResponse response) {
-        cloudMarkingScoreForeignService.downloadScore(semesterId, examTypeId, examId, response);
+        cloudMarkingScoreForeignService.downloadScore(semesterId, examTypeId, collegeId, examId, response);
     }
 }

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

@@ -13,7 +13,7 @@ public interface CloudMarkingScoreForeignService extends IService<CloudMarkingSc
 
     IPage<CloudMarkingScoreForeign> pageData(Long semesterId, Long examTypeId, Long collegeId, String examId, String syncCourseCode, Integer pageNumber, Integer pageSize);
 
-    void downloadScore(Long semesterId, Long examTypeId, String examId, HttpServletResponse response);
+    void downloadScore(Long semesterId, Long examTypeId, String collegeId, String examId, HttpServletResponse response);
 
     void deleteByCourseCode(Long collegeId, Long semesterId, Long examTypeId, String syncCourseCode, String courseCode);
 }

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

@@ -4,7 +4,6 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -48,18 +47,20 @@ public class CloudMarkingScoreForeignServiceImpl extends ServiceImpl<CloudMarkin
     }
 
     @Override
-    public void downloadScore(Long semesterId, Long examTypeId, String examId, HttpServletResponse response) {
+    public void downloadScore(Long semesterId, Long examTypeId, String collegeId, String examId, HttpServletResponse response) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
 
         // 查询数据
         QueryWrapper<CloudMarkingScoreForeign> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CloudMarkingScoreForeign::getSchoolId, schoolId);
         if (semesterId != null) {
             queryWrapper.lambda().eq(CloudMarkingScoreForeign::getSemesterId, semesterId);
         }
         if (examTypeId != null) {
             queryWrapper.lambda().eq(CloudMarkingScoreForeign::getExamTypeId, examTypeId);
         }
+        if (StringUtils.isNotBlank(collegeId)) {
+            queryWrapper.lambda().eq(CloudMarkingScoreForeign::getSchoolId, collegeId);
+        }
         if (examId != null) {
             queryWrapper.lambda().eq(CloudMarkingScoreForeign::getExamId, examId);
         }
@@ -112,6 +113,7 @@ public class CloudMarkingScoreForeignServiceImpl extends ServiceImpl<CloudMarkin
                 file.delete();
             }
         }
+
     }
 
     @Override