|
@@ -244,9 +244,13 @@ public class studentSelectSupervisorRecordController {
|
|
|
@PreAuthorize("@ss.hasPermission('system:student-select-supervisor-record:getSelection')")
|
|
|
public CommonResult<selectionBookRespVO> getSelectionBook(@Param("id") Integer recordId) {
|
|
|
studentSelectSupervisorRecordDO record = studentSelectSupervisorRecordService.getStudentSelectSupervisorRecord(recordId);
|
|
|
+
|
|
|
+ LocalDate date =LocalDate.now();
|
|
|
+ studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProjectByYear(date.getYear()),studentSelectionProjectSaveReqVO.class);
|
|
|
+
|
|
|
AdminUserDO student =adminUserService.getUser(record.getStudentId());
|
|
|
AdminUserDO supervisor =adminUserService.getUser(record.getSupervisorId());
|
|
|
- supervisorSelectionSettingDO superVisorSetting = supervisorSelectionSettingService.getSettingBySupervisorId(record.getSupervisorId());
|
|
|
+ supervisorSelectionSettingDO superVisorSetting = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(record.getSupervisorId(),project.getId());
|
|
|
selectionBookRespVO result = new selectionBookRespVO();
|
|
|
result =BeanUtils.toBean(record,selectionBookRespVO.class);
|
|
|
//学生
|
|
@@ -274,6 +278,9 @@ public class studentSelectSupervisorRecordController {
|
|
|
public CommonResult<String> updateSelectionBook(@RequestBody selectionBookRespVO updateVo) {
|
|
|
Long loginId =SecurityFrameworkUtils.getLoginUserId();
|
|
|
Set<Long> roleIds =permissionService.getUserRoleIdListByUserId(loginId);
|
|
|
+
|
|
|
+ LocalDate date =LocalDate.now();
|
|
|
+ studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProjectByYear(date.getYear()),studentSelectionProjectSaveReqVO.class);
|
|
|
//填写简介
|
|
|
UserSaveReqVO userSaveReqVO = new UserSaveReqVO();
|
|
|
userSaveReqVO.setId(loginId);
|
|
@@ -303,14 +310,15 @@ public class studentSelectSupervisorRecordController {
|
|
|
userSaveReqVO.setTitle(updateVo.getTitle());
|
|
|
}
|
|
|
//学生成果要求,和名额填写
|
|
|
- supervisorSelectionSettingDO setting = supervisorSelectionSettingService.getSettingBySupervisorId(loginId);
|
|
|
+ // TODO 项目id
|
|
|
+ supervisorSelectionSettingDO setting = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(loginId,project.getId());
|
|
|
if (updateVo.getStudentAchievementRequirement()!=null&&!updateVo.getStudentAchievementRequirement().isEmpty()){
|
|
|
setting.setStudentAchievementRequirement(updateVo.getStudentAchievementRequirement());
|
|
|
}
|
|
|
- if (updateVo.getProfessionalSlots()!=null||updateVo.getAcademicSlots()!=null){
|
|
|
- setting.setAcademicSlots(updateVo.getProfessionalSlots());
|
|
|
- setting.setProfessionalSlots(updateVo.getProfessionalSlots());
|
|
|
- }
|
|
|
+// if (updateVo.getProfessionalSlots()!=null||updateVo.getAcademicSlots()!=null){
|
|
|
+// setting.setAcademicSlots(updateVo.getProfessionalSlots());
|
|
|
+// setting.setProfessionalSlots(updateVo.getProfessionalSlots());
|
|
|
+// }
|
|
|
supervisorSelectionSettingService.updateSupervisorSelectionSetting(BeanUtils.toBean(setting, supervisorSelectionSettingSaveReqVO.class));
|
|
|
}
|
|
|
userSaveReqVO.setIsSelectionInformation(1);//已经填写了信息
|