From 7b48893212528918f84c266a520f831c2b229ac0 Mon Sep 17 00:00:00 2001
From: "YOHO\\20373" <2037305722@qq.com>
Date: Wed, 21 May 2025 19:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mysql/question/ExamQuestionMapper.java    |  2 +-
 .../question/ExamQuestionServiceImpl.java     |  2 +-
 .../mapper/exam/EducationPaperTaskMapper.xml  | 10 +++---
 .../mapper/exam/ExamQuestionMapper.xml        |  2 +-
 .../service/browser/BrowserServericeImpl.java |  2 +-
 .../service/mysql/MysqlServericeImpl.java     | 34 +++++++++----------
 .../judgement/utils/EndStuMonitorUtils.java   |  1 +
 7 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/question/ExamQuestionMapper.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/question/ExamQuestionMapper.java
index 827e9fdc..b6acaf55 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/question/ExamQuestionMapper.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/question/ExamQuestionMapper.java
@@ -109,7 +109,7 @@ public interface ExamQuestionMapper  extends BaseMapperX<ExamQuestion>
 
     long  getSchoolNameTotal(TenantDto tenantDto);
 
-    int auditQueByIds(@Param("quIds")List<String> quIds);
+    int auditQueByIds(@Param("quIds")List<String> quIds,@Param("updater") String loginUserNickname);
 
     int noAuditQue(@Param("quIds")List<String> quIds);
 
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/question/ExamQuestionServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/question/ExamQuestionServiceImpl.java
index ce28d78b..a48653bb 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/question/ExamQuestionServiceImpl.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/question/ExamQuestionServiceImpl.java
@@ -477,7 +477,7 @@ public class ExamQuestionServiceImpl implements IExamQuestionService
     public int auditQueByIds(List<String> quIds) {
 
     examQuestionMapper.updateExamQuestionByIds(SecurityFrameworkUtils.getLoginUserNickname(),quIds);
-   return   examQuestionMapper.auditQueByIds(quIds);
+   return   examQuestionMapper.auditQueByIds(quIds,SecurityFrameworkUtils.getLoginUserNickname());
     }
 
     @Override
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperTaskMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperTaskMapper.xml
index d11939c8..7ac426ce 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperTaskMapper.xml
+++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperTaskMapper.xml
@@ -48,16 +48,18 @@
 
     </select>
     <select id="getCourseList" resultType="java.lang.String">
-        SELECT sp_name
+        SELECT  DISTINCT  sp_name
         FROM exam_specialty
         WHERE ancestors REGEXP '^[0-9]+,[0-9]+,[0-9]+$'
           and deleted='0'
 
     </select>
     <select id="getKeywords" resultType="java.lang.String">
-        SELECT DISTINCT keywords FROM exam_question
-        where deleted='0'
-
+        SELECT DISTINCT keywords
+        FROM exam_question
+        WHERE deleted = '0'
+          AND keywords IS NOT NULL
+          AND TRIM(keywords) &lt;&gt; ''
     </select>
     <select id="getPoints" resultMap="ExamSpecialtyResult">
 
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/ExamQuestionMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/ExamQuestionMapper.xml
index 1752651a..6478fd8e 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/ExamQuestionMapper.xml
+++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/ExamQuestionMapper.xml
@@ -249,7 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </foreach>
     </update>
     <update id="updateExamQuestionByIds">
-            UPDATE exam_question
+            UPDATE education_question_examine
             SET updater = #{updater},
             update_time = now()
             WHERE qu_id IN
diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/browser/BrowserServericeImpl.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/browser/BrowserServericeImpl.java
index 782e1e65..d4d4aef6 100644
--- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/browser/BrowserServericeImpl.java
+++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/browser/BrowserServericeImpl.java
@@ -130,7 +130,7 @@ public class BrowserServericeImpl implements IBrowserServerice {
                 // 计算该考点的权重得分并保留一位小数
                 double weightScore = ((double) currentScore / total) * score;
                 String formattedWeightScore = String.format("%.1f", weightScore);
-                appendToFile(answerLogPath,"✅考点"+answer.getContent() + " -> 得分权值：" + answer.getScoreRate()+"-> 得分："+weightScore);
+                appendToFile(answerLogPath,"✅考点"+answer.getContent() + " -> 得分权值：" + answer.getScoreRate()+"-> 得分："+formattedWeightScore);
             }else {
 
                 appendToFile(answerLogPath,"❌考点"+answer.getContent() + " -> 得分权值：" + answer.getScoreRate()+"-> 得分：0");
diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/mysql/MysqlServericeImpl.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/mysql/MysqlServericeImpl.java
index 1eba3ee5..3ce6cb04 100644
--- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/mysql/MysqlServericeImpl.java
+++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/mysql/MysqlServericeImpl.java
@@ -734,8 +734,8 @@ public class MysqlServericeImpl implements IMysqlServerice {
             String keywordValue = keyword.getKeyword();
             if (keywordValue != null && !keywordValue.isEmpty() && !matchedKeywords.contains(keywordValue)) {
                 // 使用正则，确保是完整单词（字段）匹配
-                String regex = "(?i)([^\\w]|^)" + Pattern.quote(keywordValue) + "([^\\w]|$)";
-                if (sql.matches(".*" + regex + ".*")) {
+                String regex = keywordValue;
+                if (sql.contains(regex)) {
                     try {
                         totalScoreRate += Integer.parseInt(keyword.getScoreRate());
 
@@ -1001,21 +1001,21 @@ public class MysqlServericeImpl implements IMysqlServerice {
      * 打印查询结果
      */
     private static void printResult(List<List<String>> result) {
-//        if (result.isEmpty()) {
-//            appendToFile(answerLogPath,"查询结果为空");
-//        } else {
-//            // 打印每一行数据
-//            for (int i = 0; i < result.size(); i++) {
-//                List<String> row = result.get(i);
-//                if (i == 0) { // 打印列名
-//                    appendToFile(answerLogPath,"列名：");
-//                }
-//                for (String value : row) {
-//                    appendToFile(answerLogPath,value + "\t");
-//                }
-//                System.out.println();
-//            }
-//        }
+        if (result.isEmpty()) {
+            appendToFile(answerLogPath,"查询结果为空");
+        } else {
+            // 打印每一行数据
+            for (int i = 0; i < result.size(); i++) {
+                List<String> row = result.get(i);
+                if (i == 0) { // 打印列名
+                    appendToFile(answerLogPath,"列名：");
+                }
+                for (String value : row) {
+                    appendToFile(answerLogPath,value + "\t");
+                }
+                System.out.println();
+            }
+        }
     }
     /**
      * 使用提供的正则表达式模式从给定的 SQL 语句中提取视图名称。
diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/EndStuMonitorUtils.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/EndStuMonitorUtils.java
index c9557876..f60c341b 100644
--- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/EndStuMonitorUtils.java
+++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/EndStuMonitorUtils.java
@@ -95,6 +95,7 @@ public class EndStuMonitorUtils {
 
 
             } catch (IOException e) {
+                //todo 抛出异常
                 System.out.println(e);
             } finally {
                 // 删除临时文件