Merge remote-tracking branch 'origin/master'

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

@@ -105,4 +105,7 @@ public class StudentProjectRespVO {
     @Schema(description = "选中的导师名称")
     private String selectSupervisor;
 
+    @Schema(description = "选中的导师类型")
+    private String supervisorType;
+
 }

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

@@ -33,6 +33,10 @@ public class studentPassedExportRespVO {
     @ExcelProperty("学生年级")
     private String grade;
 
+    @Schema(description = "专业")
+    @ExcelProperty("专业")
+    private String major;
+
     @Schema(description = "学生姓名")
     @ExcelProperty("学生姓名")
     private String nickname;
@@ -43,11 +47,11 @@ public class studentPassedExportRespVO {
 
     @Schema(description = "导师姓名")
     @ExcelProperty("导师姓名")
-    private String supervisor;
+    private String selectSupervisor;
 
-//    @Schema(description = "导师类型")
-//    @ExcelProperty("导师类型")
-//    private String supervisorType;
+    @Schema(description = "导师类型")
+    @ExcelProperty("导师类型")
+    private String supervisorType;
 
 //    @Schema(description = "学生签字日期")
 //    private LocalDate studentSignDate;

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

@@ -440,6 +440,12 @@
         ELSE NULL
         END AS recordId,
 
+        CASE
+        WHEN selectSupervisor_user.user_type = 3 THEN '校内导师'
+        WHEN selectSupervisor_user.user_type = 5 THEN '校外导师'
+        ELSE '其他类型'
+        END AS supervisorType,
+
         COALESCE(system_dept.name, "测绘学院") AS deptName,
         supervisor_user.nickname AS supervisor,
         supervisor_user.mobile AS supervisorMobile,