|
@@ -338,14 +338,9 @@ public class studentSelectionProjectController {
|
|
|
|
|
|
@GetMapping("/getProjectInnerSupervisors")
|
|
|
@Operation(summary = "获取当前项目的校内导师列表")
|
|
|
- public CommonResult<List<AdminUserDO>> getProjectInnerSupervisors() {
|
|
|
+ public CommonResult<List<AdminUserDO>> getProjectInnerSupervisors(@RequestParam("projectId")Long projectId) {
|
|
|
// 获取项目数据并转换成相应的 VO
|
|
|
- LocalDate date =LocalDate.now();
|
|
|
- Integer lastYear =date.getYear()-1 ;
|
|
|
- studentSelectionProjectSaveReqVO project =new studentSelectionProjectSaveReqVO();
|
|
|
- studentSelectionProjectSaveReqVO project1 = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProjectByYear(lastYear),studentSelectionProjectSaveReqVO.class);
|
|
|
- studentSelectionProjectSaveReqVO project2 = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProjectByYear(date.getYear()),studentSelectionProjectSaveReqVO.class);
|
|
|
- project =project1==null?project2:project1;
|
|
|
+ studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProject(projectId),studentSelectionProjectSaveReqVO.class);
|
|
|
if (project==null) {
|
|
|
return error(1,"还没有创建互选项目");
|
|
|
}
|
|
@@ -356,7 +351,6 @@ public class studentSelectionProjectController {
|
|
|
List<AdminUserDO> filteredSupervisors = supervisors.stream()
|
|
|
.filter(supervisor -> supervisor.getUserType().equals("3"))
|
|
|
.collect(Collectors.toList());
|
|
|
-
|
|
|
return success(filteredSupervisors);
|
|
|
}
|
|
|
|