"git@gitlab.ruzhoukj.com:wujipeng/relation.git" did not exist on "6202930549f6be80937e84bc396cad5784062a4d"
Commit de76a6a8 authored by wujipeng's avatar wujipeng
Browse files

优化

parent 30a948eb
...@@ -41,5 +41,13 @@ public class ScoreAdminExamVO { ...@@ -41,5 +41,13 @@ public class ScoreAdminExamVO {
@ApiModelProperty("PENDING_REVIEW/PUBLISHED") @ApiModelProperty("PENDING_REVIEW/PUBLISHED")
private String reviewStatus; private String reviewStatus;
/**
* 考试生命周期状态,根据考试时间和时长实时计算,不写入数据库。
*
* <p>该字段与成绩发布状态相互独立,前端可据此区分未开始、进行中和已结束场次。</p>
*/
@ApiModelProperty("考试生命周期状态:UPCOMING/ONGOING/ENDED")
private String examStatus;
private Boolean published; private Boolean published;
} }
...@@ -52,7 +52,7 @@ public class ScoreAdminController extends BaseController { ...@@ -52,7 +52,7 @@ public class ScoreAdminController extends BaseController {
return Result.data(scoreAdminService.tree(keyword)); return Result.data(scoreAdminService.tree(keyword));
} }
@ApiOperation("历史考试成绩分页列表") @ApiOperation("全部考试成绩分页列表")
@PostMapping("/exams/page") @PostMapping("/exams/page")
public TableDataInfo exams(@RequestBody(required = false) ScoreAdminExamQueryDTO query, public TableDataInfo exams(@RequestBody(required = false) ScoreAdminExamQueryDTO query,
HttpServletRequest request) { HttpServletRequest request) {
...@@ -63,7 +63,7 @@ public class ScoreAdminController extends BaseController { ...@@ -63,7 +63,7 @@ public class ScoreAdminController extends BaseController {
return getDataTable(scoreAdminService.exams(safeQuery)); return getDataTable(scoreAdminService.exams(safeQuery));
} }
@ApiOperation("单场考试成绩汇总") @ApiOperation("单场考试概况及成绩汇总")
@GetMapping("/exams/{examId}") @GetMapping("/exams/{examId}")
public Result<ScoreAdminExamVO> exam(@PathVariable Integer examId, public Result<ScoreAdminExamVO> exam(@PathVariable Integer examId,
HttpServletRequest request) { HttpServletRequest request) {
...@@ -71,7 +71,7 @@ public class ScoreAdminController extends BaseController { ...@@ -71,7 +71,7 @@ public class ScoreAdminController extends BaseController {
return Result.data(scoreAdminService.exam(examId)); return Result.data(scoreAdminService.exam(examId));
} }
@ApiOperation("单场考试学员成绩分页列表") @ApiOperation("单场考试应考学员及成绩分页列表")
@PostMapping("/exams/{examId}/students/page") @PostMapping("/exams/{examId}/students/page")
public TableDataInfo students(@PathVariable Integer examId, public TableDataInfo students(@PathVariable Integer examId,
@RequestBody(required = false) ScoreAdminStudentQueryDTO query, @RequestBody(required = false) ScoreAdminStudentQueryDTO query,
......
...@@ -34,6 +34,7 @@ import java.math.BigDecimal; ...@@ -34,6 +34,7 @@ import java.math.BigDecimal;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.ZonedDateTime;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
...@@ -45,8 +46,8 @@ import java.util.Set; ...@@ -45,8 +46,8 @@ import java.util.Set;
/** /**
* 管理员端学员成绩管理实现。 * 管理员端学员成绩管理实现。
* *
* <p>所有统计均在SQL层限定为正式发布成绩,服务层再负责参数边界、历史考试状态和 * <p>所有统计均在SQL层限定为正式发布成绩,服务层再负责参数边界、考试生命周期和
* 文件输出,形成双层保护,避免未完成阅卷的暂存分被误当成正式成绩。</p> * 文件输出。考试创建后即可查看概况与应考名单,但未完成阅卷的暂存分不会成为正式成绩。</p>
*/ */
@Service @Service
public class ScoreAdminServiceImpl implements ScoreAdminService { public class ScoreAdminServiceImpl implements ScoreAdminService {
...@@ -78,22 +79,32 @@ public class ScoreAdminServiceImpl implements ScoreAdminService { ...@@ -78,22 +79,32 @@ public class ScoreAdminServiceImpl implements ScoreAdminService {
public List<ScoreAdminExamVO> exams(ScoreAdminExamQueryDTO query) { public List<ScoreAdminExamVO> exams(ScoreAdminExamQueryDTO query) {
normalizeExamQuery(query); normalizeExamQuery(query);
List<ScoreAdminExamVO> result = scoreAdminMapper.queryExams(query); List<ScoreAdminExamVO> result = scoreAdminMapper.queryExams(query);
return result == null ? Collections.emptyList() : result; if (result == null || result.isEmpty()) {
return Collections.emptyList();
}
// 同一批结果使用同一个业务时刻,避免临界场次在循环中出现前后状态不一致。
Date now = businessNow();
for (ScoreAdminExamVO exam : result) {
applyExamStatus(exam, now);
}
return result;
} }
@Override @Override
@Transactional(readOnly = true) @Transactional(readOnly = true)
public ScoreAdminExamVO exam(Integer examId) { public ScoreAdminExamVO exam(Integer examId) {
ScoreAdminExamVO result = requireExam(examId); ScoreAdminExamVO result = requireExam(examId);
requireEnded(result); // 概况接口允许考前和考试中访问,正式成绩字段仍由Mapper按发布标记脱敏。
applyExamStatus(result, businessNow());
return result; return result;
} }
@Override @Override
@Transactional(readOnly = true) @Transactional(readOnly = true)
public List<ScoreAdminStudentVO> students(Integer examId, ScoreAdminStudentQueryDTO query) { public List<ScoreAdminStudentVO> students(Integer examId, ScoreAdminStudentQueryDTO query) {
ScoreAdminExamVO exam = requireExam(examId); // 先确认考试存在;未结束场次允许查看应考名单和交卷进度,但SQL不会返回未发布分数。
requireEnded(exam); requireExam(examId);
normalizeStudentQuery(query); normalizeStudentQuery(query);
List<ScoreAdminStudentVO> result = scoreAdminMapper.queryStudents(examId, query); List<ScoreAdminStudentVO> result = scoreAdminMapper.queryStudents(examId, query);
return result == null ? Collections.emptyList() : result; return result == null ? Collections.emptyList() : result;
...@@ -276,6 +287,36 @@ public class ScoreAdminServiceImpl implements ScoreAdminService { ...@@ -276,6 +287,36 @@ public class ScoreAdminServiceImpl implements ScoreAdminService {
} }
} }
/**
* 按管理端统一规则计算考试生命周期,避免前端根据本地时钟自行推断状态。
* 开始时刻计入进行中,结束时刻计入已结束;异常的负时长按零分钟处理。
*/
void applyExamStatus(ScoreAdminExamVO exam, Date now) {
if (exam == null) {
return;
}
if (exam.getExamTime() == null) {
exam.setExamStatus(ExamAdminConstants.STATUS_ENDED);
return;
}
long durationMinutes = Math.max(0L,
exam.getDuration() == null ? 0L : exam.getDuration().longValue());
long endMillis = exam.getExamTime().getTime() + durationMinutes * 60_000L;
if (now.before(exam.getExamTime())) {
exam.setExamStatus(ExamAdminConstants.STATUS_UPCOMING);
} else if (now.getTime() < endMillis) {
exam.setExamStatus(ExamAdminConstants.STATUS_ONGOING);
} else {
exam.setExamStatus(ExamAdminConstants.STATUS_ENDED);
}
}
/** 集中使用业务约定的中国标准时间,保持成绩管理与考试管理的状态口径一致。 */
Date businessNow() {
return Date.from(ZonedDateTime.now(ExamAdminConstants.BUSINESS_ZONE).toInstant());
}
private void requirePositiveId(Integer id, String field) { private void requirePositiveId(Integer id, String field) {
if (id == null || id <= 0) { if (id == null || id <= 0) {
throw new BusinessException(field + "必须为正整数"); throw new BusinessException(field + "必须为正整数");
......
...@@ -85,7 +85,10 @@ ...@@ -85,7 +85,10 @@
SELECT <include refid="examSummaryColumns"/> SELECT <include refid="examSummaryColumns"/>
<include refid="examSummaryJoins"/> <include refid="examSummaryJoins"/>
WHERE e.class_id = #{query.classId} WHERE e.class_id = #{query.classId}
AND DATE_ADD(e.exam_time, INTERVAL IFNULL(e.duration, 0) MINUTE) &lt;= NOW() <!--
成绩管理需要在考试创建后立即展示场次,因此列表不能再按结束时间过滤。
考前和考试中的统计值仍由上方发布标记 CASE 统一脱敏,不会暴露暂存成绩。
-->
<if test="query.keyword != null and query.keyword != ''"> <if test="query.keyword != null and query.keyword != ''">
AND e.name LIKE CONCAT('%', #{query.keyword}, '%') AND e.name LIKE CONCAT('%', #{query.keyword}, '%')
</if> </if>
...@@ -369,6 +372,7 @@ ...@@ -369,6 +372,7 @@
SELECT <include refid="examSummaryColumns"/> SELECT <include refid="examSummaryColumns"/>
<include refid="examSummaryJoins"/> <include refid="examSummaryJoins"/>
WHERE e.class_id = #{classId} WHERE e.class_id = #{classId}
<!-- 班级导出仍然是历史成绩口径,不能包含未开始或正在进行的考试。 -->
AND DATE_ADD(e.exam_time, INTERVAL IFNULL(e.duration, 0) MINUTE) &lt;= NOW() AND DATE_ADD(e.exam_time, INTERVAL IFNULL(e.duration, 0) MINUTE) &lt;= NOW()
<include refid="examSummaryGroup"/> <include refid="examSummaryGroup"/>
ORDER BY e.exam_time DESC, e.id DESC ORDER BY e.exam_time DESC, e.id DESC
......
...@@ -7,12 +7,15 @@ JWT解析当前用户并校验 `phone_role.role_name=管理员`。本模块只 ...@@ -7,12 +7,15 @@ JWT解析当前用户并校验 `phone_role.role_name=管理员`。本模块只
部署前依次执行已有 `sql/exam_management.sql`、`sql/exam_review.sql`,再执行 部署前依次执行已有 `sql/exam_management.sql`、`sql/exam_review.sql`,再执行
`sql/student_score_management.sql`。 `sql/student_score_management.sql`。
## 统一成绩口径 ## 统一展示与成绩口径
- 历史考试指 `考试开始时间 + 时长 <= 当前时间`。 - 考试创建成功后立即出现在成绩管理列表,`examStatus` 按时间实时返回
`UPCOMING / ONGOING / ENDED`。
- 未开始和进行中的考试允许查看考试概况、应考名单及交卷进度。
- 理论成绩必须同时满足 `exam.mark_flag=1`、`exam_student.mark_flag=1` 才是正式成绩。 - 理论成绩必须同时满足 `exam.mark_flag=1`、`exam_student.mark_flag=1` 才是正式成绩。
- 实训成绩由仿真系统整份上报后进入待复核;首席考评教师确认发布后才设置上述发布标记。 - 实训成绩由仿真系统整份上报后进入待复核;首席考评教师确认发布后才设置上述发布标记。
- 待批阅场次可返回应考、实考人数,但平均分、合格率和个人分数为 `null`。 - 待批阅场次可返回应考、实考人数,但平均分、合格率和个人分数为 `null`。
- 个人答题详情、题目统计和成绩导出仍要求对应成绩正式发布;统计和导出同时要求考试已结束。
- 合格率分母为已经实考且成绩正式发布的人数,缺考学员不计为不合格。 - 合格率分母为已经实考且成绩正式发布的人数,缺考学员不计为不合格。
## 1. 班级导航树 ## 1. 班级导航树
...@@ -21,7 +24,7 @@ JWT解析当前用户并校验 `phone_role.role_name=管理员`。本模块只 ...@@ -21,7 +24,7 @@ JWT解析当前用户并校验 `phone_role.role_name=管理员`。本模块只
返回 `OCCUPATION → YEAR → LEVEL → CLASS` 四层节点。班级叶节点的 `classId` 用于后续请求。 返回 `OCCUPATION → YEAR → LEVEL → CLASS` 四层节点。班级叶节点的 `classId` 用于后续请求。
## 2. 历史考试分页 ## 2. 全部考试分页
`POST /exam/admin/scores/exams/page` `POST /exam/admin/scores/exams/page`
...@@ -39,7 +42,8 @@ JWT解析当前用户并校验 `phone_role.role_name=管理员`。本模块只 ...@@ -39,7 +42,8 @@ JWT解析当前用户并校验 `phone_role.role_name=管理员`。本模块只
``` ```
`type` 支持 `THEORY/PRACTICE`,也兼容数据库中文值“理论/实训”;`status` 支持 `type` 支持 `THEORY/PRACTICE`,也兼容数据库中文值“理论/实训”;`status` 支持
`ALL/PENDING_REVIEW/PUBLISHED`。 `ALL/PENDING_REVIEW/PUBLISHED`。返回行中的 `examStatus` 是考试生命周期,`reviewStatus` 是
成绩发布状态,两者互不替代。
## 3. 考试汇总与学员分页 ## 3. 考试汇总与学员分页
......
package com.platform.business.mapper; package com.platform.business.mapper;
import com.platform.business.model.dto.ScoreAdminExamQueryDTO;
import org.apache.ibatis.builder.xml.XMLMapperBuilder; import org.apache.ibatis.builder.xml.XMLMapperBuilder;
import org.apache.ibatis.io.Resources; import org.apache.ibatis.io.Resources;
import org.apache.ibatis.session.Configuration; import org.apache.ibatis.session.Configuration;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.InputStream; import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
/** 在应用启动前解析成绩管理与仿真上报SQL,防止动态SQL或resultType拼写错误。 */ /** 在应用启动前解析成绩管理与仿真上报SQL,防止动态SQL或resultType拼写错误。 */
...@@ -26,6 +30,28 @@ class ScoreAdminMapperXmlTest { ...@@ -26,6 +30,28 @@ class ScoreAdminMapperXmlTest {
"com.platform.business.mapper.ScoreAdminMapper.queryPracticeStatistics")); "com.platform.business.mapper.ScoreAdminMapper.queryPracticeStatistics"));
} }
@Test
void scoreListShouldIncludeAllPhasesWhileClassExportRemainsHistorical() throws Exception {
Configuration configuration = parse("com/platform/business/mapper/ScoreAdminMapper.xml");
ScoreAdminExamQueryDTO query = new ScoreAdminExamQueryDTO();
query.setClassId(1);
Map<String, Object> parameters = new HashMap<>();
parameters.put("query", query);
// 分页列表不能包含结束时间过滤,否则刚创建的考试会在成绩管理页消失。
String listSql = normalizeSql(configuration.getMappedStatement(
"com.platform.business.mapper.ScoreAdminMapper.queryExams")
.getBoundSql(parameters).getSql());
assertFalse(listSql.contains("date_add(e.exam_time"));
assertTrue(listSql.contains("order by e.exam_time desc, e.id desc"));
// 班级导出仍需坚持历史成绩口径,避免把尚未结束的空成绩场次写入文件。
String exportSql = normalizeSql(configuration.getMappedStatement(
"com.platform.business.mapper.ScoreAdminMapper.queryClassExams")
.getBoundSql(1).getSql());
assertTrue(exportSql.contains("date_add(e.exam_time"));
}
@Test @Test
void fzGradesMapperShouldRegisterIdempotentReceiveStatements() throws Exception { void fzGradesMapperShouldRegisterIdempotentReceiveStatements() throws Exception {
Configuration configuration = parse("com/platform/business/mapper/FzGradesMapper.xml"); Configuration configuration = parse("com/platform/business/mapper/FzGradesMapper.xml");
...@@ -59,4 +85,8 @@ class ScoreAdminMapperXmlTest { ...@@ -59,4 +85,8 @@ class ScoreAdminMapperXmlTest {
} }
return configuration; return configuration;
} }
private String normalizeSql(String sql) {
return sql.replaceAll("\\s+", " ").trim().toLowerCase();
}
} }
package com.platform.business.service.impl; package com.platform.business.service.impl;
import com.platform.business.constant.ExamAdminConstants;
import com.platform.business.mapper.ScoreAdminMapper; import com.platform.business.mapper.ScoreAdminMapper;
import com.platform.business.model.dto.ScoreAdminExamQueryDTO; import com.platform.business.model.dto.ScoreAdminExamQueryDTO;
import com.platform.business.model.dto.ScoreAdminStudentQueryDTO; import com.platform.business.model.dto.ScoreAdminStudentQueryDTO;
...@@ -18,8 +19,11 @@ import org.springframework.mock.web.MockHttpServletResponse; ...@@ -18,8 +19,11 @@ import org.springframework.mock.web.MockHttpServletResponse;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertThrows;
...@@ -50,11 +54,91 @@ class ScoreAdminServiceImplTest { ...@@ -50,11 +54,91 @@ class ScoreAdminServiceImplTest {
service.exams(query); service.exams(query);
assertEquals("实训", query.getType()); assertEquals(ExamAdminConstants.TYPE_PRACTICE, query.getType());
assertEquals("PUBLISHED", query.getStatus()); assertEquals("PUBLISHED", query.getStatus());
verify(scoreAdminMapper).queryExams(query); verify(scoreAdminMapper).queryExams(query);
} }
@Test
void examListShouldExposeAllLifecycleStatuses() {
long now = System.currentTimeMillis();
ScoreAdminExamVO upcoming = examAt(new Date(now + 3_600_000L), 60);
ScoreAdminExamVO ongoing = examAt(new Date(now - 15 * 60_000L), 60);
ScoreAdminExamVO ended = examAt(new Date(now - 2 * 3_600_000L), 30);
List<ScoreAdminExamVO> allPhases = Arrays.asList(upcoming, ongoing, ended);
when(scoreAdminMapper.queryExams(org.mockito.ArgumentMatchers.any())).thenReturn(allPhases);
ScoreAdminExamQueryDTO query = new ScoreAdminExamQueryDTO();
query.setClassId(1);
List<ScoreAdminExamVO> result = service.exams(query);
assertEquals(3, result.size());
assertEquals(ExamAdminConstants.STATUS_UPCOMING, upcoming.getExamStatus());
assertEquals(ExamAdminConstants.STATUS_ONGOING, ongoing.getExamStatus());
assertEquals(ExamAdminConstants.STATUS_ENDED, ended.getExamStatus());
}
@Test
void examOverviewAndCandidateListShouldAllowUpcomingExam() {
ScoreAdminExamVO upcoming = examAt(new Date(System.currentTimeMillis() + 3_600_000L), 60);
ScoreAdminStudentVO candidate = new ScoreAdminStudentVO();
candidate.setStudentName("张三");
candidate.setPublished(false);
when(scoreAdminMapper.findExam(1)).thenReturn(upcoming);
when(scoreAdminMapper.queryStudents(
org.mockito.ArgumentMatchers.eq(1), org.mockito.ArgumentMatchers.any()))
.thenReturn(Collections.singletonList(candidate));
ScoreAdminExamVO overview = service.exam(1);
List<ScoreAdminStudentVO> students = service.students(1, new ScoreAdminStudentQueryDTO());
assertEquals(ExamAdminConstants.STATUS_UPCOMING, overview.getExamStatus());
assertEquals(1, students.size());
assertEquals(false, students.get(0).getPublished());
verify(scoreAdminMapper).queryStudents(
org.mockito.ArgumentMatchers.eq(1), org.mockito.ArgumentMatchers.any());
}
@Test
void protectedStatisticsShouldStillRejectUpcomingExam() {
ScoreAdminExamVO upcoming = examAt(new Date(System.currentTimeMillis() + 3_600_000L), 60);
upcoming.setPublished(true);
when(scoreAdminMapper.findExam(1)).thenReturn(upcoming);
BusinessException error = assertThrows(BusinessException.class,
() -> service.questionStatistics(1));
assertEquals("考试尚未结束,不能进入历史成绩管理", error.getMessage());
verify(scoreAdminMapper, never()).queryTheoryStatistics(1);
}
@Test
void upcomingExamShouldStillBeRejectedByScoreExport() {
ScoreAdminExamVO upcoming = examAt(new Date(System.currentTimeMillis() + 3_600_000L), 60);
upcoming.setPublished(true);
when(scoreAdminMapper.findExam(1)).thenReturn(upcoming);
BusinessException error = assertThrows(BusinessException.class,
() -> service.exportExam(1, new MockHttpServletResponse()));
assertEquals("考试尚未结束,不能进入历史成绩管理", error.getMessage());
verify(scoreAdminMapper, never()).queryPublishedStudents(1);
}
@Test
void lifecycleStatusShouldUseStartAndEndInstantsAsExactBoundaries() {
ScoreAdminExamVO exam = examAt(Timestamp.valueOf("2026-09-18 09:00:00"), 60);
service.applyExamStatus(exam, Timestamp.valueOf("2026-09-18 08:59:59"));
assertEquals(ExamAdminConstants.STATUS_UPCOMING, exam.getExamStatus());
service.applyExamStatus(exam, Timestamp.valueOf("2026-09-18 09:00:00"));
assertEquals(ExamAdminConstants.STATUS_ONGOING, exam.getExamStatus());
service.applyExamStatus(exam, Timestamp.valueOf("2026-09-18 10:00:00"));
assertEquals(ExamAdminConstants.STATUS_ENDED, exam.getExamStatus());
}
@Test @Test
void questionStatisticsShouldRejectUnpublishedExam() { void questionStatisticsShouldRejectUnpublishedExam() {
ScoreAdminExamVO exam = endedExam(false); ScoreAdminExamVO exam = endedExam(false);
...@@ -116,12 +200,18 @@ class ScoreAdminServiceImplTest { ...@@ -116,12 +200,18 @@ class ScoreAdminServiceImplTest {
} }
private ScoreAdminExamVO endedExam(boolean published) { private ScoreAdminExamVO endedExam(boolean published) {
ScoreAdminExamVO exam = new ScoreAdminExamVO(); ScoreAdminExamVO exam = examAt(new Date(System.currentTimeMillis() - 3_600_000L), 30);
exam.setExamId(1);
exam.setExamTime(new Date(System.currentTimeMillis() - 3_600_000L));
exam.setDuration(30);
exam.setPublished(published); exam.setPublished(published);
exam.setReviewStatus(published ? "PUBLISHED" : "PENDING_REVIEW"); exam.setReviewStatus(published ? "PUBLISHED" : "PENDING_REVIEW");
return exam; return exam;
} }
/** 构造仅包含生命周期判断所需字段的考试,减少各状态测试的重复样板。 */
private ScoreAdminExamVO examAt(Date examTime, int duration) {
ScoreAdminExamVO exam = new ScoreAdminExamVO();
exam.setExamId(1);
exam.setExamTime(examTime);
exam.setDuration(duration);
return exam;
}
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment