|
@@ -16,12 +16,14 @@ import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*;
|
|
|
|
|
|
import cn.iocoder.yudao.module.system.convert.user.UserConvert;
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
|
|
|
+import cn.iocoder.yudao.module.system.dal.dataobject.supervisorSelectionSetting.supervisorSelectionSettingDO;
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.user.PopDo;
|
|
|
import cn.iocoder.yudao.module.system.enums.common.SexEnum;
|
|
|
import cn.iocoder.yudao.module.system.service.dept.DeptService;
|
|
|
import cn.iocoder.yudao.module.system.service.permission.PermissionService;
|
|
|
import cn.iocoder.yudao.module.system.service.studentSelectionProject.studentSelectionProjectService;
|
|
|
+import cn.iocoder.yudao.module.system.service.supervisorSelectionSetting.supervisorSelectionSettingService;
|
|
|
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
|
|
|
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
@@ -63,6 +65,8 @@ public class UserController {
|
|
|
private PermissionService permissionService;
|
|
|
@Resource
|
|
|
private studentSelectionProjectService studentSelectionProjectService;
|
|
|
+ @Resource
|
|
|
+ private supervisorSelectionSettingService supervisorSelectionSettingService;
|
|
|
|
|
|
@PostMapping("/create")
|
|
|
@Operation(summary = "新增用户")
|
|
@@ -368,6 +372,12 @@ public class UserController {
|
|
|
if ((user.getGrade() != null && !user.getGrade().isEmpty()) && user.getGrade().equals(project.getStudentGrade())) {
|
|
|
user.setSelectStatus(userService.getUserSelectStatus(id, project.getId()));
|
|
|
}
|
|
|
+ if (user.getUserType().equals("3")||user.getUserType().equals("5")){
|
|
|
+ //导师学生成果要求
|
|
|
+ supervisorSelectionSettingDO settingDO = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(id,project.getId());
|
|
|
+ user.setStudentAchievementRequirement(settingDO.getStudentAchievementRequirement());
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
// 拼接数据
|