1.3互选项目

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentSelectSupervisorRecord/StudentSelectSupervisorRecordController.java

@@ -174,15 +174,18 @@ public class StudentSelectSupervisorRecordController {
 
         UserSaveReqVO saveReqVO =new UserSaveReqVO();
         saveReqVO.setId(record.getStudentId());
-        AdminUserDO supervisor =adminUserService.getUser(updateReqVO.getSupervisorId());
-        if (supervisor!=null) {
-            if (supervisor.getUserType().equals("3")) {
-                saveReqVO.setSupervisorId(updateReqVO.getSupervisorId());
-            } else if (supervisor.getUserType().equals("5")) {
-                saveReqVO.setExternalSupervisorId(updateReqVO.getSupervisorId());
+        System.out.println(updateReqVO.getSupervisorId());
+        if (updateReqVO.getSupervisorId()!=null) {
+            AdminUserDO supervisor = adminUserService.getUser(updateReqVO.getSupervisorId());
+            if (supervisor != null) {
+                if (supervisor.getUserType().equals("3")) {
+                    saveReqVO.setSupervisorId(updateReqVO.getSupervisorId());
+                } else if (supervisor.getUserType().equals("5")) {
+                    saveReqVO.setExternalSupervisorId(updateReqVO.getSupervisorId());
 //                //校外导师的合作导师
-                if (supervisor.getSupervisorId()!=null&&supervisor.getSupervisorId()!=0) {
-                    saveReqVO.setSupervisorId(supervisor.getSupervisorId());
+                    if (supervisor.getSupervisorId() != null && supervisor.getSupervisorId() != 0) {
+                        saveReqVO.setSupervisorId(supervisor.getSupervisorId());
+                    }
                 }
             }
         }
@@ -192,7 +195,7 @@ public class StudentSelectSupervisorRecordController {
         }else if (record.getSelectType()==2){//同意了的
             //初始化记录里面的签名
             updateReqVO.setStudentSignature("");//学生签名
-            updateReqVO.setSupervisorApproveTime(null);
+            updateReqVO.setSupervisorApproveTime(LocalDateTime.now());//TODO 这个审批时间
             updateReqVO.setSupervisorSignature("");
         }
         adminUserService.updateUser(saveReqVO);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentSelectSupervisorRecord/vo/StudentSelectSupervisorRecordSaveReqVO.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.system.controller.admin.studentSelectSupervisorRecord.vo;
 
 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -31,6 +33,7 @@ public class StudentSelectSupervisorRecordSaveReqVO {
     private String studentSignature;
 
     @Schema(description = "导师审批时间")
+    @TableField(fill = FieldFill.UPDATE)//可以插入null值
     private LocalDateTime supervisorApproveTime;
 
     @Schema(description = "导师电子签名")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentSelectionProject/studentSelectionProjectController.java

@@ -2,7 +2,9 @@ package cn.iocoder.yudao.module.system.controller.admin.studentSelectionProject;
 
 import cn.iocoder.yudao.module.system.controller.admin.supervisorSelectionSetting.vo.supervisorSelectionSettingSaveReqVO;
 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.service.supervisorSelectionSetting.supervisorSelectionSettingService;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -18,6 +20,7 @@ import javax.servlet.http.*;
 import java.time.LocalDate;
 import java.util.*;
 import java.io.IOException;
+import java.util.stream.Collectors;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -46,6 +49,8 @@ public class studentSelectionProjectController {
     private studentSelectionProjectService studentSelectionProjectService;
     @Resource
     private supervisorSelectionSettingService supervisorSelectionSettingService;
+    @Resource
+    private AdminUserService adminUserService;
 
     @PostMapping("/create")
     @Operation(summary = "创建师生互选项目")
@@ -175,4 +180,16 @@ public class studentSelectionProjectController {
         return success(BeanUtils.toBean(result, studentSelectionProjectRespVO.class));
     }
 
+    @GetMapping("/getProjectSupervisors")
+    @Operation(summary = "获取所有项目")
+    public CommonResult<List<AdminUserDO>> getProjectSupervisors(@RequestParam("projectId") Integer projectId) {
+        // 获取项目数据并转换成相应的 VO
+        studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProject(projectId), studentSelectionProjectSaveReqVO.class);
+        List<Long> supervisorIds = project.getSupervisorIds();
+        Set<Long> newSupervisorIds = new HashSet<>(supervisorIds);
+        List<AdminUserDO> supervisors = adminUserService.getUserList(newSupervisorIds);
+
+        return success(supervisors);
+    }
+
 }