diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index 4f537551..2863ea58 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java @@ -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 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()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudySignupApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudySignupApi.java index 6abdfe1b..02e9cfef 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudySignupApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudySignupApi.java @@ -62,7 +62,7 @@ public class StudySignupApi extends ApiBaseController{ * @param courseId 课程id * @param name 姓名 * @param signType 报名方式 - * @return + * @return 返回课程报名表的集合 */ @PostMapping("/pagelist") public JsonResponse> findPage(Pagination pager, String courseId, String name, Integer signType) { diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/dto/CourseSignDto.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/dto/CourseSignDto.java index 522819c9..36242d19 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/dto/CourseSignDto.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/dto/CourseSignDto.java @@ -25,7 +25,12 @@ public class CourseSignDto { /** * 报名状态(1.自主报名 2.手动加入) */ - private String signType; + private Integer signType; + + /** + * 报名状态显示(1.自主报名 2.手动加入) + */ + private String signTypeName; /** * 课程名称 diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/CourseSignServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/CourseSignServiceImpl.java index 6d7b6f58..53bd041d 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/CourseSignServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/CourseSignServiceImpl.java @@ -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());