feat:修改导出报名记录接口signType筛选问题

This commit is contained in:
yangxinyu
2025-11-29 13:06:37 +08:00
parent d54937c416
commit a701f54a52
4 changed files with 13 additions and 8 deletions

View File

@@ -170,7 +170,7 @@ public class StudyCourseApi extends ApiBaseController{
excelHeadMap.put("姓名", "name");
excelHeadMap.put("工号", "userNo");
excelHeadMap.put("部门", "departName");
excelHeadMap.put("报名方式", "signType");
excelHeadMap.put("报名方式", "signTypeName");
excelHeadMap.put("报名时间", "signTime");
// 3. 调用Service根据筛选条件查询报名记录
List<StudySignup> signRecordList = courseSignService.querySignRecords(queryDto);
@@ -242,11 +242,11 @@ public class StudyCourseApi extends ApiBaseController{
// 4.2 格式化:报名状态(枚举值→中文描述)
Integer signStatus = studySignup.getSignType();
if (Objects.equals(signStatus, 1)) {
exportDto.setSignType("自主报名");
exportDto.setSignTypeName("自主报名");
} else if (Objects.equals(signStatus, 2)) {
exportDto.setSignType("手动加入");
exportDto.setSignTypeName("手动加入");
} else {
exportDto.setSignType("");
exportDto.setSignTypeName("");
}
// 4.3 从 UserSimpleVo 中获取工号、部门
UserSimpleVo user = userInfoMap.get(studySignup.getAid());

View File

@@ -62,7 +62,7 @@ public class StudySignupApi extends ApiBaseController{
* @param courseId 课程id
* @param name 姓名
* @param signType 报名方式
* @return
* @return 返回课程报名表的集合
*/
@PostMapping("/pagelist")
public JsonResponse<PageList<StudySignup>> findPage(Pagination pager, String courseId, String name, Integer signType) {

View File

@@ -25,7 +25,12 @@ public class CourseSignDto {
/**
* 报名状态1.自主报名 2.手动加入)
*/
private String signType;
private Integer signType;
/**
* 报名状态显示1.自主报名 2.手动加入)
*/
private String signTypeName;
/**
* 课程名称

View File

@@ -37,9 +37,9 @@ public class CourseSignServiceImpl implements ICourseSignService {
if (StringUtils.isNotBlank(queryDto.getCourseId())) {
query.addFilter(FieldFilters.eq("courseId", queryDto.getCourseId()));
}
// 3. 课程类型精确查询
//3. 课程类型精确查询
if (queryDto.getSignType() != null) {
query.addFilter(FieldFilters.eq("courseType", queryDto.getSignType()));
query.addFilter(FieldFilters.eq("signType", queryDto.getSignType()));
}
}
return coursesignDao.findList(query.builder());