Merge branch 'master' of http://gogs.gisvg.com/YDM/graduate

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

@@ -298,10 +298,11 @@ public class StudentSelectSupervisorRecordController {
     public void exportStudentSelectSupervisorRecordExcel(@Valid StudentSelectSupervisorRecordPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+
         List<studentSelectSupervisorRecordDO> list = studentSelectSupervisorRecordService.getStudentSelectSupervisorRecordPage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "师生互选记录.xls", "数据", StudentSelectSupervisorRecordRespVO.class,
-                        BeanUtils.toBean(list, StudentSelectSupervisorRecordRespVO.class));
+        ExcelUtils.write(response, "师生互选记录.xls", "数据", recordExportRespVO.class,
+                        BeanUtils.toBean(list, recordExportRespVO.class));
     }
 
     //通过，

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

@@ -0,0 +1,65 @@
+package cn.iocoder.yudao.module.system.controller.admin.studentSelectSupervisorRecord.vo;
+
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 师生互选记录 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class recordExportRespVO {
+
+    @Schema(description = "项目名称")
+    private String projectName;
+
+    @Schema(description = "选择状态", example = "1")
+    @DictFormat("system_student_master_type")
+    private Long selectType;
+
+    @Schema(description = "硕士类型")
+    @DictFormat("system_student_master_type")
+    private Integer masterType;
+
+    @Schema(description = "导师审批时间")
+    @ExcelProperty("导师审批时间")
+    private LocalDateTime supervisorApproveTime;
+
+    @Schema(description = "学生年级")
+    private String studentGrade;
+
+    @Schema(description = "学生姓名")
+    @ExcelProperty("学生姓名")
+    private String studentName;
+
+    @Schema(description = "学生学号")
+    @ExcelProperty("学生学号")
+    private String major;
+
+    @Schema(description = "导师姓名")
+    @ExcelProperty("导师姓名")
+    private String supervisor;
+
+    @Schema(description = "导师类型")
+    @ExcelProperty("导师类型")
+    private String supervisorType;
+
+    @Schema(description = "学生签字日期")
+    private LocalDate studentSignDate;
+
+    @Schema(description = "导师签字日期")
+    private LocalDate supervisorSignDate;
+
+    @Schema(description = "学生电子签名")
+    @ExcelProperty("学生电子签名")
+    private String studentSignature;
+
+    @Schema(description = "导师电子签名")
+    @ExcelProperty("导师电子签名")
+    private String supervisorSignature;
+
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java

@@ -72,13 +72,10 @@ public class UserController {
 
     @PutMapping("/updateInnerSupervisor")
     @Operation(summary = "修改校内导师")
-    public CommonResult<Boolean> updateInnerSupervisor(@RequestBody Map<String, List<Map<String, Long>>> request) {
-        List<Map<String, Long>> updateVO = request.get("updateVO");
-        if (updateVO == null) {
-            return error(1,"更新失败");
-        }
-        for (Map<String, Long> re:updateVO){
-            userService.updateInnerSupervisor(re.get("studentId"),re.get("supervisorId"));
+    public CommonResult<Boolean> updateInnerSupervisor(@RequestBody List<UserSaveReqVO>  reqVOList) {
+
+        for (UserSaveReqVO re : reqVOList){
+            userService.updateInnerSupervisor(re.getId(),re.getSupervisorId());
         }
         return success(true);
     }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/studentSelectSupervisorRecord/studentSelectSupervisorRecordServiceImpl.java

@@ -180,4 +180,5 @@ public class studentSelectSupervisorRecordServiceImpl implements studentSelectSu
         studentSelectSupervisorRecordMapper.deleteRecordsByProjectId(projectId);
     }
 
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -90,7 +90,10 @@ public class AdminUserServiceImpl implements AdminUserService {
 
     @Override
     public void updateInnerSupervisor(Long studentId ,Long supervisorId){
-        userMapper.updateInnerSupervisor(studentId,supervisorId);
+        UserSaveReqVO re = new UserSaveReqVO().setId(studentId).setSupervisorId(supervisorId);
+        AdminUserDO user = BeanUtils.toBean(re, AdminUserDO.class);
+        userMapper.updateById(user);
+
     }
 
     @Override

yudao-module-system/yudao-module-system-biz/src/main/resources/Mapper/user/AdminUserMapper.xml

@@ -583,7 +583,10 @@
 
     <select id="getStudentSelectExternalSupervisorsList" resultType="cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO">
         SELECT
-            p.*, a.*, externalSupervisor.nickname AS externalSupervisor
+            p.id AS projectId,
+            p.student_grade,
+            a.*,
+            externalSupervisor.nickname AS externalSupervisor
         FROM
             supervisor_student_selection_project p
                 LEFT JOIN