Exam/pengchen-exam-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #72: (hyc -> master)

Browse Source 
Merge Request: 【修改】细节

Created By: @华允传
Accepted By: @华允传
URL: https://g-iswv8783.coding.net/p/education/d/pengchen-exam-java/git/merge/72?initial=true
This commit is contained in:
华允传
2025-05-21 19:14:07 +08:00
committed by Coding
parent b5f18ba897 7b48893212
commit e949dbd3fb
7 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/question/ExamQuestionMapper.java
View File

@@ -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);

2
exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/question/ExamQuestionServiceImpl.java
View File

@@ -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

10
exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperTaskMapper.xml
View File

@@ -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">

2
exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/ExamQuestionMapper.xml
View File

@@ -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

2
exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/browser/BrowserServericeImpl.java
View File

@@ -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");

34
exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/mysql/MysqlServericeImpl.java
View File

@@ -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 语句中提取视图名称。

1
exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/EndStuMonitorUtils.java
View File

@@ -95,6 +95,7 @@ public class EndStuMonitorUtils {
} catch (IOException e) {
//todo 抛出异常
System.out.println(e);
} finally {
// 删除临时文件