From 98ab1cc1a7148eb2d2b2d885af5de93605419f49 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 9 Mar 2026 09:53:45 +0800 Subject: [PATCH] =?UTF-8?q?fix(study):=20=E4=BF=AE=E5=A4=8D=E7=8F=AD?= =?UTF-8?q?=E7=BA=A7=E8=80=83=E8=AF=95=E4=BA=BA=E6=95=B0=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../query/study/ClassExamPaperQueryExe.java | 18 ++++++++++++++++-- .../clientobject/study/ClassExamPaperCO.java | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/study/ClassExamPaperQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/study/ClassExamPaperQueryExe.java index 2fdfa14..00d78af 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/study/ClassExamPaperQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/study/ClassExamPaperQueryExe.java @@ -2,8 +2,10 @@ package com.zcloud.edu.command.query.study; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ArrayUtil; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; +import com.sun.xml.bind.v2.TODO; import com.zcloud.edu.command.convertor.study.ClassExamPaperCoConvertor; import com.zcloud.edu.dto.clientobject.resource.QuestionCO; import com.zcloud.edu.dto.clientobject.study.ClassExamPaperCO; @@ -15,6 +17,7 @@ import com.zcloud.edu.persistence.repository.resource.QuestionRepository; import com.zcloud.edu.persistence.repository.study.ClassExamPaperRepository; import com.zcloud.edu.persistence.repository.study.ClassRepository; import com.zcloud.edu.persistence.repository.study.StudentExamRecordRepository; +import com.zcloud.edu.persistence.repository.study.StudentRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Tools; import com.zcloud.gbscommon.utils.WordToPdfUtil; @@ -28,9 +31,11 @@ import javax.servlet.http.HttpServletResponse; import java.io.OutputStream; import java.net.URLEncoder; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; /** @@ -47,6 +52,7 @@ public class ClassExamPaperQueryExe { private final QuestionRepository questionRepository; private final ClassRepository classRepository; private final StudentExamRecordRepository studentExamRecordRepository; + private final StudentRepository studentRepository; /** * 分页 @@ -89,8 +95,16 @@ public class ClassExamPaperQueryExe { classExamPaperCO.setQuestionList(questionCOList); //考试人数 - Long count = studentExamRecordRepository.getCountByClassExamPaperId(classExamPaperDO.getClassExamPaperId()); - classExamPaperCO.setClassExamPaperStudentCount( count); + + List stuCountList = studentRepository.countStudentByClass(Arrays.asList(classId)); + //判断当前登录人是否是教师 + + if (stuCountList != null && stuCountList.size() > 0){ + Map stuCountMap = stuCountList.stream().collect(Collectors.toMap(ClassDO::getClassId, classDO -> classDO)); + classExamPaperCO.setClassExamPaperStudentCount( stuCountMap.get(classId).getSignCount()); + } + + return SingleResponse.of(classExamPaperCO); } diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/study/ClassExamPaperCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/study/ClassExamPaperCO.java index b20ab23..32b6e35 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/study/ClassExamPaperCO.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/study/ClassExamPaperCO.java @@ -93,6 +93,6 @@ public class ClassExamPaperCO extends ClientObject { private String env; @ApiModelProperty(value = "班级考试人数") - private Long classExamPaperStudentCount; + private Integer classExamPaperStudentCount; }