"...platform/git@gitlab.ruzhoukj.com:wujipeng/relation.git" did not exist on "a9230cf523e4e2002cb1bbe638a794e8050a0e41"
Commit 56d0958c authored by 王蔡翾's avatar 王蔡翾
Browse files

bug修复

parent bb7667c7
...@@ -26,7 +26,11 @@ public class EvaluationTaskVO { ...@@ -26,7 +26,11 @@ public class EvaluationTaskVO {
private String teacherName; private String teacherName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") /**
* 上课日期只精确到日;具体上课时段由 {@link #timeFrame} 单独返回,避免列表重复展示
* 无业务含义的 00:00:00。
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date courseDate; private Date courseDate;
private String timeFrame; private String timeFrame;
...@@ -47,6 +51,18 @@ public class EvaluationTaskVO { ...@@ -47,6 +51,18 @@ public class EvaluationTaskVO {
/** 已评人数 / 总人数,返回0到100之间的百分比。 */ /** 已评人数 / 总人数,返回0到100之间的百分比。 */
private Double completionRate; private Double completionRate;
/**
* 管理端列表直接展示的评议进度,固定为“已评人数/总人数”。
*
* <p>该值由已有统计字段实时计算,不额外持久化;即使数据库聚合结果为空,也会稳定
* 返回 {@code 0/0},避免前端混用 pendingCount、submittedCount 和 totalCount。</p>
*/
public String getEvaluationProgress() {
int evaluated = submittedCount == null ? 0 : submittedCount;
int total = totalCount == null ? 0 : totalCount;
return evaluated + "/" + total;
}
private String createdBy; private String createdBy;
private String creatorName; private String creatorName;
......
...@@ -7,8 +7,10 @@ import com.platform.business.model.dto.EvaluationTaskQueryDTO; ...@@ -7,8 +7,10 @@ import com.platform.business.model.dto.EvaluationTaskQueryDTO;
import com.platform.business.model.entity.UserEntity; import com.platform.business.model.entity.UserEntity;
import com.platform.business.model.vo.EvaluationTaskDetailVO; import com.platform.business.model.vo.EvaluationTaskDetailVO;
import com.platform.business.model.vo.EvaluationTaskVO; import com.platform.business.model.vo.EvaluationTaskVO;
import com.platform.business.model.vo.ClassAdminOptionVO;
import com.platform.business.model.vo.StudentEvaluationTaskVO; import com.platform.business.model.vo.StudentEvaluationTaskVO;
import com.platform.business.service.AuthenticatedUserService; import com.platform.business.service.AuthenticatedUserService;
import com.platform.business.service.ClassAdminService;
import com.platform.business.service.EvaluationService; import com.platform.business.service.EvaluationService;
import com.platform.controller.BaseController; import com.platform.controller.BaseController;
import com.platform.model.resp.Result; import com.platform.model.resp.Result;
...@@ -44,6 +46,8 @@ public class EvaluationController extends BaseController { ...@@ -44,6 +46,8 @@ public class EvaluationController extends BaseController {
private EvaluationService evaluationService; private EvaluationService evaluationService;
@Resource @Resource
private AuthenticatedUserService authenticatedUserService; private AuthenticatedUserService authenticatedUserService;
@Resource
private ClassAdminService classAdminService;
@ApiOperation("学员端-分页查询本人的待评价、已评价和已过期任务") @ApiOperation("学员端-分页查询本人的待评价、已评价和已过期任务")
@PostMapping("/student/page") @PostMapping("/student/page")
...@@ -80,6 +84,14 @@ public class EvaluationController extends BaseController { ...@@ -80,6 +84,14 @@ public class EvaluationController extends BaseController {
return Result.data(evaluationService.createTask(body, admin.getId(), admin.getNickName())); return Result.data(evaluationService.createTask(body, admin.getId(), admin.getNickName()));
} }
@ApiOperation("管理端-查询发起评价任务可选的全部职级")
@GetMapping("/admin/levels")
public Result<List<ClassAdminOptionVO>> levelOptions(HttpServletRequest request) {
requireAdmin(request);
// 不能复用班级导航树中的LEVEL节点:导航树只含已有班级,会漏掉尚未建班的职级。
return Result.data(classAdminService.levelOptions());
}
@ApiOperation("管理端-分页筛选评价任务") @ApiOperation("管理端-分页筛选评价任务")
@PostMapping("/admin/page") @PostMapping("/admin/page")
public TableDataInfo adminPage(@RequestBody(required = false) EvaluationTaskQueryDTO query, public TableDataInfo adminPage(@RequestBody(required = false) EvaluationTaskQueryDTO query,
......
...@@ -15,6 +15,11 @@ import java.util.List; ...@@ -15,6 +15,11 @@ import java.util.List;
@Mapper @Mapper
public interface EvaluationTaskMapper extends BaseMapper<EvaluationTaskEntity> { public interface EvaluationTaskMapper extends BaseMapper<EvaluationTaskEntity> {
/**
* 统计同一课次尚未撤回的任务;已撤回任务保留为历史记录,但不阻止管理员重新发起。
*/
int countNonRevokedBySubjectId(@Param("subjectId") Integer subjectId);
/** 管理端按原型筛选条件查询全部任务及实时完成进度。 */ /** 管理端按原型筛选条件查询全部任务及实时完成进度。 */
List<EvaluationTaskVO> queryAdminTasks(EvaluationTaskQueryDTO query); List<EvaluationTaskVO> queryAdminTasks(EvaluationTaskQueryDTO query);
......
...@@ -5,6 +5,7 @@ import com.platform.business.model.dto.ClassAdminSaveDTO; ...@@ -5,6 +5,7 @@ import com.platform.business.model.dto.ClassAdminSaveDTO;
import com.platform.business.model.vo.ClassAdminCardVO; import com.platform.business.model.vo.ClassAdminCardVO;
import com.platform.business.model.vo.ClassAdminDetailVO; import com.platform.business.model.vo.ClassAdminDetailVO;
import com.platform.business.model.vo.ClassAdminOptionsVO; import com.platform.business.model.vo.ClassAdminOptionsVO;
import com.platform.business.model.vo.ClassAdminOptionVO;
import com.platform.business.model.vo.ClassAdminTreeVO; import com.platform.business.model.vo.ClassAdminTreeVO;
import java.util.List; import java.util.List;
...@@ -16,6 +17,9 @@ public interface ClassAdminService { ...@@ -16,6 +17,9 @@ public interface ClassAdminService {
List<ClassAdminTreeVO> tree(String keyword); List<ClassAdminTreeVO> tree(String keyword);
/** 返回全部未隐藏职级,不受“当前是否已有班级”限制。 */
List<ClassAdminOptionVO> levelOptions();
ClassAdminOptionsVO options(); ClassAdminOptionsVO options();
ClassAdminDetailVO create(ClassAdminSaveDTO request); ClassAdminDetailVO create(ClassAdminSaveDTO request);
......
...@@ -87,7 +87,7 @@ public class ClassAdminServiceImpl implements ClassAdminService { ...@@ -87,7 +87,7 @@ public class ClassAdminServiceImpl implements ClassAdminService {
ClassAdminConstants.OCCUPATION_WASTEWATER, null, null), ClassAdminConstants.OCCUPATION_WASTEWATER, null, null),
new ClassAdminOptionVO(ClassAdminConstants.OCCUPATION_SLUDGE, new ClassAdminOptionVO(ClassAdminConstants.OCCUPATION_SLUDGE,
ClassAdminConstants.OCCUPATION_SLUDGE, null, null))); ClassAdminConstants.OCCUPATION_SLUDGE, null, null)));
result.setLevels(classMapper.selectAdminLevelOptions()); result.setLevels(levelOptions());
result.setHeadTeachers(classMapper.selectAdminHeadTeacherOptions()); result.setHeadTeachers(classMapper.selectAdminHeadTeacherOptions());
// 既保留数据库里的历史/未来年度,又始终给新建表单提供当前年度及前两年。 // 既保留数据库里的历史/未来年度,又始终给新建表单提供当前年度及前两年。
...@@ -108,6 +108,13 @@ public class ClassAdminServiceImpl implements ClassAdminService { ...@@ -108,6 +108,13 @@ public class ClassAdminServiceImpl implements ClassAdminService {
return result; return result;
} }
@Override
public List<ClassAdminOptionVO> levelOptions() {
List<ClassAdminOptionVO> levels = classMapper.selectAdminLevelOptions();
// 与班级树不同,表单职级选项来自配置表,因此尚未创建班级的职级也必须返回。
return levels == null ? Collections.emptyList() : levels;
}
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ClassAdminDetailVO create(ClassAdminSaveDTO request) { public ClassAdminDetailVO create(ClassAdminSaveDTO request) {
......
package com.platform.business.service.impl; package com.platform.business.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.platform.business.constant.EvaluationConstants; import com.platform.business.constant.EvaluationConstants;
import com.platform.business.mapper.EvaluationRecordMapper; import com.platform.business.mapper.EvaluationRecordMapper;
...@@ -107,8 +106,8 @@ public class EvaluationServiceImpl implements EvaluationService { ...@@ -107,8 +106,8 @@ public class EvaluationServiceImpl implements EvaluationService {
if (!deadline.after(courseEnd)) { if (!deadline.after(courseEnd)) {
throw new BusinessException("评价截止时间必须晚于课程结束时间"); throw new BusinessException("评价截止时间必须晚于课程结束时间");
} }
if (taskMapper.selectCount(new LambdaQueryWrapper<EvaluationTaskEntity>() // 撤回表示本次任务作废,因此只拦截仍有效或已结束的任务;撤回记录继续保留供追溯。
.eq(EvaluationTaskEntity::getSubjectId, request.getSubjectId())) > 0) { if (taskMapper.countNonRevokedBySubjectId(request.getSubjectId()) > 0) {
throw new BusinessException("该课次已经发起过评价任务,不能重复发起"); throw new BusinessException("该课次已经发起过评价任务,不能重复发起");
} }
......
...@@ -32,6 +32,12 @@ spring: ...@@ -32,6 +32,12 @@ spring:
max-file-size: 500MB max-file-size: 500MB
max-request-size: 510MB max-request-size: 510MB
# Tomcat还维护独立的表单POST上限;与multipart请求上限保持一致,避免大视频在进入Controller前
# 被Servlet容器拒绝。文件仍由MultipartFile流式落盘,不会因此整体加载到JVM内存。
server:
tomcat:
max-http-form-post-size: 510MB
# 出勤签到配置。allowed-ip-cidrs 为空时签到会安全拒绝,部署前请补充实际网段。 # 出勤签到配置。allowed-ip-cidrs 为空时签到会安全拒绝,部署前请补充实际网段。
attendance: attendance:
verification-code-valid-minutes: 15 verification-code-valid-minutes: 15
......
...@@ -47,6 +47,13 @@ ...@@ -47,6 +47,13 @@
) stat on stat.task_id = t.id ) stat on stat.task_id = t.id
</sql> </sql>
<select id="countNonRevokedBySubjectId" resultType="java.lang.Integer">
select count(*)
from evaluation_task
where subject_id = #{subjectId}
and status != 'REVOKED'
</select>
<select id="queryAdminTasks" resultType="com.platform.business.model.vo.EvaluationTaskVO"> <select id="queryAdminTasks" resultType="com.platform.business.model.vo.EvaluationTaskVO">
select <include refid="taskViewColumns"/> select <include refid="taskViewColumns"/>
from evaluation_task t from evaluation_task t
......
...@@ -72,7 +72,15 @@ ...@@ -72,7 +72,15 @@
} }
``` ```
`subjectId` 对应 `class_subject.id`。`deadline` 同时支持 `yyyy-MM-dd` 和 `yyyy-MM-dd HH:mm:ss`;只传日期时按当日 `23:59:59` 处理。服务端会校验课程存在、截止时间晚于当前时间和课程结束时间,并将课程所属班级当前未删除的学员固化为目标记录。同一课次不能重复发起。创建成功后通过消息中心向目标学员推送待评价消息。 `subjectId` 对应 `class_subject.id`。`deadline` 同时支持 `yyyy-MM-dd` 和 `yyyy-MM-dd HH:mm:ss`;只传日期时按当日 `23:59:59` 处理。服务端会校验课程存在、截止时间晚于当前时间和课程结束时间,并将课程所属班级当前未删除的学员固化为目标记录。同一课次存在未撤回任务时不能重复发起;原任务已撤回时允许重新发起一条新任务。创建成功后通过消息中心向目标学员推送待评价消息。
### 发起任务职级选项
`GET /evaluation/admin/levels`
返回 `sys_level` 中全部未隐藏的污水、污泥职级,格式为 `value/label/parentValue`。该接口不从
班级导航树推导职级,因此没有班级的职级也会返回。页面选择职级后,再按 `value`(职级ID)
筛选班级。
### 分页筛选任务 ### 分页筛选任务
...@@ -92,7 +100,10 @@ ...@@ -92,7 +100,10 @@
} }
``` ```
返回课程、班级、教师、上课时间、截止时间、总人数、待评/已评人数、完成率及任务状态。 返回课程、班级、教师、上课日期、上课时段、截止时间、总人数、待评/已评人数、完成率及任务状态。
其中 `courseDate` 固定为 `yyyy-MM-dd`;`evaluationProgress` 固定为“已评人数/总人数”,例如
`1/3`;`completionRate` 为 0~100 的数值,例如 `33.33`。列表应直接展示
`evaluationProgress`,不要自行交换 `pendingCount/submittedCount/totalCount` 的顺序。
### 查看实名详情 ### 查看实名详情
...@@ -114,6 +125,7 @@ ...@@ -114,6 +125,7 @@
``` ```
只有 `PENDING` 任务可以撤回。批量撤回最多100条,采用同一事务;其中任一任务不符合条件时整批回滚。 只有 `PENDING` 任务可以撤回。批量撤回最多100条,采用同一事务;其中任一任务不符合条件时整批回滚。
撤回记录继续保留在管理端列表中,但不再阻止该课次重新发起任务。
### 导出 ### 导出
...@@ -124,8 +136,12 @@ ...@@ -124,8 +136,12 @@
## 数据库部署 ## 数据库部署
先确保项目基础表以及消息中心表已经部署,再执行: 首次部署先确保项目基础表以及消息中心表已经部署,再执行:
`practical-business/src/main/resources/sql/evaluation.sql` `practical-business/src/main/resources/sql/evaluation.sql`
建表脚本创建 `evaluation_task` 和 `evaluation_record` 两张表,并包含唯一键、列表查询索引及关联外键。 已部署过旧版学员评议表的环境还必须执行一次可重复运行的增量脚本:
`practical-business/src/main/resources/sql/evaluation_reissue.sql`
建表脚本创建 `evaluation_task` 和 `evaluation_record` 两张表,并包含唯一键、列表查询索引及关联外键。增量脚本把“同课次唯一”调整为“同课次未撤回任务唯一”,缺少该迁移时数据库仍会拒绝撤回后的重新发起。
...@@ -4,8 +4,11 @@ ...@@ -4,8 +4,11 @@
create table if not exists evaluation_task ( create table if not exists evaluation_task (
id varchar(32) not null comment '评价任务ID(雪花算法字符串)', id varchar(32) not null comment '评价任务ID(雪花算法字符串)',
subject_id int not null comment '关联课次 class_subject.id,同一课次只允许发起一次', subject_id int not null comment '关联课次 class_subject.id',
status varchar(16) not null comment 'PENDING/COMPLETED/EXPIRED/REVOKED', status varchar(16) not null comment 'PENDING/COMPLETED/EXPIRED/REVOKED',
active_subject_id int generated always as (
case when status = 'REVOKED' then null else subject_id end
) stored comment '未撤回任务的课次ID,用于并发防重;撤回后为NULL',
deadline datetime(3) not null comment '评价截止时间', deadline datetime(3) not null comment '评价截止时间',
created_by varchar(64) not null comment '发起管理员 user.id', created_by varchar(64) not null comment '发起管理员 user.id',
created_time datetime(3) not null, created_time datetime(3) not null,
...@@ -13,7 +16,8 @@ create table if not exists evaluation_task ( ...@@ -13,7 +16,8 @@ create table if not exists evaluation_task (
revoked_at datetime(3) null comment '撤回时间', revoked_at datetime(3) null comment '撤回时间',
revoked_by varchar(64) null comment '撤回管理员 user.id', revoked_by varchar(64) null comment '撤回管理员 user.id',
primary key (id), primary key (id),
unique key uk_evaluation_task_subject (subject_id), unique key uk_evaluation_task_active_subject (active_subject_id),
key idx_evaluation_task_subject (subject_id),
key idx_evaluation_task_status_deadline (status, deadline), key idx_evaluation_task_status_deadline (status, deadline),
key idx_evaluation_task_created (created_time), key idx_evaluation_task_created (created_time),
constraint fk_evaluation_task_subject foreign key (subject_id) constraint fk_evaluation_task_subject foreign key (subject_id)
......
...@@ -10,6 +10,7 @@ import com.platform.business.model.entity.UserEntity; ...@@ -10,6 +10,7 @@ import com.platform.business.model.entity.UserEntity;
import com.platform.business.model.vo.ClassAdminCourseVO; import com.platform.business.model.vo.ClassAdminCourseVO;
import com.platform.business.model.vo.ClassAdminDetailVO; import com.platform.business.model.vo.ClassAdminDetailVO;
import com.platform.business.model.vo.ClassAdminExamVO; import com.platform.business.model.vo.ClassAdminExamVO;
import com.platform.business.model.vo.ClassAdminOptionVO;
import com.platform.business.model.vo.ClassAdminStudentVO; import com.platform.business.model.vo.ClassAdminStudentVO;
import com.platform.business.service.SysLevelService; import com.platform.business.service.SysLevelService;
import com.platform.business.service.SysPhoneRoleService; import com.platform.business.service.SysPhoneRoleService;
...@@ -27,7 +28,9 @@ import org.mockito.junit.jupiter.MockitoExtension; ...@@ -27,7 +28,9 @@ import org.mockito.junit.jupiter.MockitoExtension;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.Date; import java.sql.Date;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
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.assertNull; import static org.junit.jupiter.api.Assertions.assertNull;
...@@ -57,6 +60,16 @@ class ClassAdminServiceImplTest { ...@@ -57,6 +60,16 @@ class ClassAdminServiceImplTest {
@InjectMocks @InjectMocks
private ClassAdminServiceImpl service; private ClassAdminServiceImpl service;
@Test
void levelOptionsShouldReturnAllConfiguredVisibleLevels() {
List<ClassAdminOptionVO> levels = Arrays.asList(
new ClassAdminOptionVO("1", "污水一级", "污水", null),
new ClassAdminOptionVO("5", "污水五级", "污水", null));
when(classMapper.selectAdminLevelOptions()).thenReturn(levels);
assertEquals(levels, service.levelOptions());
}
@Test @Test
void createShouldNormalizeAndPersistEditableFields() { void createShouldNormalizeAndPersistEditableFields() {
mockValidLevel(); mockValidLevel();
......
package com.platform.business.service.impl; package com.platform.business.service.impl;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.platform.business.constant.EvaluationConstants; import com.platform.business.constant.EvaluationConstants;
import com.platform.business.mapper.EvaluationRecordMapper; import com.platform.business.mapper.EvaluationRecordMapper;
import com.platform.business.mapper.EvaluationTaskMapper; import com.platform.business.mapper.EvaluationTaskMapper;
...@@ -79,7 +80,7 @@ class EvaluationServiceImplTest { ...@@ -79,7 +80,7 @@ class EvaluationServiceImplTest {
request.setDeadline(new SimpleDateFormat("yyyy-MM-dd").format(deadline.getTime())); request.setDeadline(new SimpleDateFormat("yyyy-MM-dd").format(deadline.getTime()));
when(classSubjectService.getById(101)).thenReturn(endedSubject); when(classSubjectService.getById(101)).thenReturn(endedSubject);
when(taskMapper.selectCount(any())).thenReturn(0L); when(taskMapper.countNonRevokedBySubjectId(101)).thenReturn(0);
when(taskMapper.selectActiveStudentIdsByClassId(10)).thenReturn(Arrays.asList("S1", "S2")); when(taskMapper.selectActiveStudentIdsByClassId(10)).thenReturn(Arrays.asList("S1", "S2"));
when(taskMapper.insert(any(EvaluationTaskEntity.class))).thenReturn(1); when(taskMapper.insert(any(EvaluationTaskEntity.class))).thenReturn(1);
when(recordMapper.batchInsert(any())).thenReturn(2); when(recordMapper.batchInsert(any())).thenReturn(2);
...@@ -99,6 +100,24 @@ class EvaluationServiceImplTest { ...@@ -99,6 +100,24 @@ class EvaluationServiceImplTest {
assertEquals("EVALUATION", messageCaptor.getValue().getBusinessType()); assertEquals("EVALUATION", messageCaptor.getValue().getBusinessType());
} }
@Test
void createTaskShouldOnlyRejectNonRevokedTaskForSameSubject() {
EvaluationTaskCreateDTO request = new EvaluationTaskCreateDTO();
request.setSubjectId(101);
Calendar deadline = Calendar.getInstance();
deadline.add(Calendar.DAY_OF_MONTH, 2);
request.setDeadline(new SimpleDateFormat("yyyy-MM-dd").format(deadline.getTime()));
when(classSubjectService.getById(101)).thenReturn(endedSubject);
when(taskMapper.countNonRevokedBySubjectId(101)).thenReturn(1);
BusinessException exception = assertThrows(BusinessException.class,
() -> service.createTask(request, "A1", "管理员甲"));
assertEquals("该课次已经发起过评价任务,不能重复发起", exception.getMessage());
// Mapper只统计未撤回任务;返回0时,服务会继续为同一课次创建一条全新的任务记录。
verify(taskMapper).countNonRevokedBySubjectId(101);
}
@Test @Test
void submitShouldPersistScoresAndTryToCompleteTask() { void submitShouldPersistScoresAndTryToCompleteTask() {
EvaluationTaskEntity task = pendingTask(); EvaluationTaskEntity task = pendingTask();
...@@ -163,6 +182,21 @@ class EvaluationServiceImplTest { ...@@ -163,6 +182,21 @@ class EvaluationServiceImplTest {
assertNull(normalized.getStatus()); assertNull(normalized.getStatus());
} }
@Test
void taskViewShouldExposeDateOnlyAndUnambiguousProgress() throws Exception {
EvaluationTaskVO task = new EvaluationTaskVO();
task.setCourseDate(new SimpleDateFormat("yyyy-MM-dd").parse("2026-09-01"));
task.setSubmittedCount(1);
task.setTotalCount(3);
String json = new ObjectMapper().writeValueAsString(task);
assertEquals("1/3", task.getEvaluationProgress());
// courseDate不再携带00:00:00;evaluationProgress固定使用“已评/总人数”口径。
org.junit.jupiter.api.Assertions.assertTrue(json.contains("\"courseDate\":\"2026-09-01\""));
org.junit.jupiter.api.Assertions.assertTrue(json.contains("\"evaluationProgress\":\"1/3\""));
}
private EvaluationTaskEntity pendingTask() { private EvaluationTaskEntity pendingTask() {
Calendar deadline = Calendar.getInstance(); Calendar deadline = Calendar.getInstance();
deadline.add(Calendar.DAY_OF_MONTH, 1); deadline.add(Calendar.DAY_OF_MONTH, 1);
......
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