|
@@ -154,11 +154,14 @@ public class supervisorSelectionSettingController {
|
|
Integer agentAcademicSlots =adminUserService.countAgentStudentListBySupervisorId(project.getStudentGrade(),loginId,1);//代理学硕
|
|
Integer agentAcademicSlots =adminUserService.countAgentStudentListBySupervisorId(project.getStudentGrade(),loginId,1);//代理学硕
|
|
Integer agentProfessionalSlots =adminUserService.countAgentStudentListBySupervisorId(project.getStudentGrade(),loginId,2);//代理专硕
|
|
Integer agentProfessionalSlots =adminUserService.countAgentStudentListBySupervisorId(project.getStudentGrade(),loginId,2);//代理专硕
|
|
supervisorSelectionSettingDO settingDO = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(loginId,project.getId());
|
|
supervisorSelectionSettingDO settingDO = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(loginId,project.getId());
|
|
- settingDO.setOccupiedAcademicSlots(occupiedAcademicSlots);
|
|
|
|
- settingDO.setOccupiedAcademicSlots(occupiedProfessionalSlots);
|
|
|
|
- settingDO.setAgentAcademicSlots(agentAcademicSlots);
|
|
|
|
- settingDO.setAgentProfessionalSlots(agentProfessionalSlots);
|
|
|
|
- return success(settingDO);
|
|
|
|
|
|
+ if (settingDO!=null) {
|
|
|
|
+ settingDO.setOccupiedAcademicSlots(occupiedAcademicSlots);
|
|
|
|
+ settingDO.setOccupiedAcademicSlots(occupiedProfessionalSlots);
|
|
|
|
+ settingDO.setAgentAcademicSlots(agentAcademicSlots);
|
|
|
|
+ settingDO.setAgentProfessionalSlots(agentProfessionalSlots);
|
|
|
|
+ return success(settingDO);
|
|
|
|
+ }
|
|
|
|
+ return null;
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|