From 905133b8102e6994b389f696bc3d06a20beb2043 Mon Sep 17 00:00:00 2001
From: "DESKTOP-932OMT8\\REN" <dla.ren@outlook.com>
Date: Thu, 5 Jun 2025 13:53:42 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=201?=
 =?UTF-8?q?=E3=80=81=E6=95=99=E5=B8=88=E5=88=86=E9=85=8D=E7=A7=91=E7=9B=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E4=B9=8B=E5=90=8EBUG=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=9B2=E3=80=81=E5=88=A4=E5=88=86=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E8=AE=B0=E5=BD=95=E6=89=80=E6=9C=89=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mysql/specialty/ExamSpecialtyMapper.java  |  7 ++++
 .../mapper/specialty/ExamSpecialtyMapper.xml  |  7 +++-
 .../auto_tools/AutoToolsServiceImpl.java      | 32 ++++++++++++-------
 .../service/user/AdminUserServiceImpl.java    | 16 ++++++++--
 4 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/specialty/ExamSpecialtyMapper.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/specialty/ExamSpecialtyMapper.java
index 601f2f8d..ea770423 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/specialty/ExamSpecialtyMapper.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/specialty/ExamSpecialtyMapper.java
@@ -25,6 +25,13 @@ public interface ExamSpecialtyMapper extends BaseMapperX<ExamSpecialty>
      * @return 数据信息
      */
     public ExamSpecialty selectExamSpecialtyBySpId(Long spId);
+    /**
+     * 查询数据parentId
+     *
+     * @param parentId 父ID
+     * @return 数据信息
+     */
+    List<SpecialtyQueryVo> selectExamSpecialtyByParentId(Long parentId);
 
     /**
      * 修改数据信息
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/specialty/ExamSpecialtyMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/specialty/ExamSpecialtyMapper.xml
index 808295d9..45016730 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/specialty/ExamSpecialtyMapper.xml
+++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/specialty/ExamSpecialtyMapper.xml
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectExamSpecialtyByids" resultType="pc.exam.pp.module.exam.controller.admin.specialty.vo.SpecialtyQueryVo">
-        SELECT sp_id AS id, sp_name AS name, parent_id, status, create_time  from exam_specialty
+        SELECT sp_id AS id, sp_name AS name, ancestors, parent_id, status, create_time  from exam_specialty
         WHERE sp_id IN
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
@@ -91,6 +91,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectExamSpecialtyVo"/>
         where sp_id = #{spId}
     </select>
+
+    <select id="selectExamSpecialtyByParentId" resultType="pc.exam.pp.module.exam.controller.admin.specialty.vo.SpecialtyQueryVo">
+        SELECT sp_id AS id, sp_name AS name, ancestors, parent_id, status, create_time  from exam_specialty
+        where parent_id = #{parentId}
+    </select>
     <select id="getRoleById" resultType="java.lang.String">
         select roles
         from exam_specialty where  sp_id =#{id};
diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/service/auto_tools/AutoToolsServiceImpl.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/service/auto_tools/AutoToolsServiceImpl.java
index 2ed4c8b5..a2efcc6a 100644
--- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/service/auto_tools/AutoToolsServiceImpl.java
+++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/service/auto_tools/AutoToolsServiceImpl.java
@@ -180,6 +180,8 @@ public class AutoToolsServiceImpl implements AutoToolsService{
      */
     @Override
     public CommonResult<BigDecimal> judgementScore(Long stuId, String paperId) throws Exception {
+        // 先删除考试明细
+        stuPaperScoreService.deleteStuPaperScore(stuId, paperId);
         // 监控管理 生成选择题文件路径
         endStuMonitorUtils.endStuMonitor(String.valueOf(stuId), paperId);
         // 获取平台文件参数
@@ -224,9 +226,10 @@ public class AutoToolsServiceImpl implements AutoToolsService{
                 // 1-1-3、进行选择题判分
                 for (ExamQuestion examQuestion : quList) {
                     if ("选择题".equals(examQuestion.getSubjectName())) {
-                        for (String key : stu.getQuestionResultMap().keySet()) {
-                            Optional<ExamQuestion> result = quList.stream().filter(quLists -> quLists.getQuId().equals(key)).findFirst();
-                            ExamQuestion examQuestions = result.get();
+                        Optional<String> result = stu.getQuestionResultMap().keySet().stream().filter(strs -> strs.equals(examQuestion.getQuId())).findFirst();
+                        if (!result.isEmpty()) {
+                            String key = result.get();
+                            String value = stu.getQuestionResultMap().get(key);
                             // 查询该题的成绩
                             StuPaperScoreDO stuPaperScoreDO = stuPaperScoreService.getStuScoreByPaperIdAndQuid(stuId, paperId, key);
                             // 判断是否做过该题
@@ -238,15 +241,22 @@ public class AutoToolsServiceImpl implements AutoToolsService{
                                 stuPaperScoreDO.setPaperId(paperId);
                                 isNull = true;
                             }
-                            if (examQuestions != null) {
-                                String value = stu.getQuestionResultMap().get(key);
-                                double selectScore = judgementChoiceService.programmingChoice(Double.parseDouble(examQuestion.getQuScores()), key, value, stuPaperScoreDO, isNull);
-                                score += selectScore;
-                            } else {
-                                // 说明学生没有答题，直接给零分
-                                double selectScore = judgementChoiceService.programmingChoice(Double.parseDouble(examQuestion.getQuScores()), key, "", stuPaperScoreDO, isNull);
-                                score += selectScore;
+                            double selectScore = judgementChoiceService.programmingChoice(Double.parseDouble(examQuestion.getQuScores()), key, value, stuPaperScoreDO, isNull);
+                            score += selectScore;
+                        } else {
+                            StuPaperScoreDO stuPaperScoreDO = stuPaperScoreService.getStuScoreByPaperIdAndQuid(stuId, paperId, examQuestion.getQuId());
+                            // 判断是否做过该题
+                            boolean isNull = false;
+                            if (stuPaperScoreDO == null) {
+                                stuPaperScoreDO = new StuPaperScoreDO();
+                                stuPaperScoreDO.setStuId(stuId);
+                                stuPaperScoreDO.setQuId(examQuestion.getQuId());
+                                stuPaperScoreDO.setPaperId(paperId);
+                                isNull = true;
                             }
+                            // 说明学生没有答题，直接给零分
+                            double selectScore = judgementChoiceService.programmingChoice(Double.parseDouble(examQuestion.getQuScores()), examQuestion.getQuId(), "", stuPaperScoreDO, isNull);
+                            score += selectScore;
                         }
                     }
                 }
diff --git a/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/service/user/AdminUserServiceImpl.java b/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/service/user/AdminUserServiceImpl.java
index a88f5cf4..e3695cb9 100644
--- a/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/service/user/AdminUserServiceImpl.java
+++ b/exam-module-system/exam-module-system-biz/src/main/java/pc/exam/pp/module/system/service/user/AdminUserServiceImpl.java
@@ -17,6 +17,7 @@ import pc.exam.pp.module.exam.controller.admin.classs.vo.ClassSaveReqVO;
 import pc.exam.pp.module.exam.controller.admin.specialty.vo.SpecialtListByUserReqVo;
 import pc.exam.pp.module.exam.controller.admin.specialty.vo.SpecialtyQueryVo;
 import pc.exam.pp.module.exam.dal.dataobject.classs.ClassDO;
+import pc.exam.pp.module.exam.dal.dataobject.specialty.ExamSpecialty;
 import pc.exam.pp.module.exam.dal.mysql.classs.ClassMapper;
 import pc.exam.pp.module.exam.dal.mysql.specialty.ExamSpecialtyMapper;
 import pc.exam.pp.module.exam.service.classs.ClassService;
@@ -829,14 +830,23 @@ public class AdminUserServiceImpl implements AdminUserService {
             // 查询所有专业数据
             specialtyQueryVos = examSpecialtyMapper.selectExamSpecialtyAll();
         } else {
-
             // 判断专业是否为空，为空的话查询所有
-            if (adminUserDO.getClassIds() != null) {
+            if (adminUserDO.getSpecialtyIds() == null) {
                 // 查询所有数据
                 specialtyQueryVos = examSpecialtyMapper.selectExamSpecialtyAll();
             } else {
                 // 查询部分数据
-                specialtyQueryVos = examSpecialtyMapper.selectExamSpecialtyByids(adminUserDO.getClassIds());
+                List<SpecialtyQueryVo> specialtyList = examSpecialtyMapper.selectExamSpecialtyByids(adminUserDO.getSpecialtyIds());
+                for (SpecialtyQueryVo specialtyQueryVo : specialtyList) {
+                    specialtyQueryVos.add(specialtyQueryVo);
+                    // 查询题型
+                    if (specialtyQueryVo.getAncestors().contains(",")) {
+                        List<SpecialtyQueryVo> specialtyLists = examSpecialtyMapper.selectExamSpecialtyByParentId(specialtyQueryVo.getId());
+                        for (SpecialtyQueryVo specialtyQueryVosInfo : specialtyLists) {
+                            specialtyQueryVos.add(specialtyQueryVosInfo);
+                        }
+                    }
+                }
             }
         }
         return specialtyQueryVos;