yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userAchievement/UserAchievementController.java

@@ -115,8 +115,12 @@ public class UserAchievementController {
         list = list.stream()
                 .map(userAchievement -> {
                     String sort = userAchievement.getSort();
+                    String achievementType = userAchievement.getAchievementType();
                     if (sort == null) {
-                        sort = "未知"; // 或者其他你想要的默认值
+                        sort = "未知";
+                    }
+                    if (achievementType == null) {
+                        achievementType = "未知";
                     }
                     switch (sort) {
                         case "1":
@@ -131,10 +135,31 @@ public class UserAchievementController {
                         default:
                             userAchievement.setSort("未知"); // 其他未定义的值
                     }
+                    switch (achievementType) {
+                        case "1":
+                            userAchievement.setAchievementType("北大中文核心期刊论文");
+                            break;
+                        case "2":
+                            userAchievement.setAchievementType("SCI,EI,A&HCI国际学术期刊论文");
+                            break;
+                        case "3":
+                            userAchievement.setAchievementType("SCI,EI,ISIP会议论文");
+                            break;
+                        case "4":
+                            userAchievement.setAchievementType("专利");
+                            break;
+                        case "5":
+                            userAchievement.setAchievementType("著作");
+                            break;
+                        case "6":
+                            userAchievement.setAchievementType("竞赛");
+                            break;
+                        default:
+                            userAchievement.setAchievementType("未知"); // 其他未定义的值
+                    }
                     return userAchievement;
                 })
                 .collect(Collectors.toList()); // 收集回List
-        // 导出 Excel
         ExcelUtils.write(response, "成果.xls", "数据", UserAchievementRespVO.class,
                         BeanUtils.toBean(list, UserAchievementRespVO.class));
     }
@@ -159,8 +184,12 @@ public class UserAchievementController {
         list = list.stream()
                 .map(userAchievement -> {
                     String sort = userAchievement.getSort();
+                    String achievementType = userAchievement.getAchievementType();
                     if (sort == null) {
-                        sort = "未知"; // 或者其他你想要的默认值
+                        sort = "未知";
+                    }
+                    if (achievementType == null) {
+                        achievementType = "未知";
                     }
                     switch (sort) {
                         case "1":
@@ -175,6 +204,28 @@ public class UserAchievementController {
                         default:
                             userAchievement.setSort("未知"); // 其他未定义的值
                     }
+                    switch (achievementType) {
+                        case "1":
+                            userAchievement.setAchievementType("北大中文核心期刊论文");
+                            break;
+                        case "2":
+                            userAchievement.setAchievementType("SCI,EI,A&HCI国际学术期刊论文");
+                            break;
+                        case "3":
+                            userAchievement.setAchievementType("SCI,EI,ISIP会议论文");
+                            break;
+                        case "4":
+                            userAchievement.setAchievementType("专利");
+                            break;
+                        case "5":
+                            userAchievement.setAchievementType("著作");
+                            break;
+                        case "6":
+                            userAchievement.setAchievementType("竞赛");
+                            break;
+                        default:
+                            userAchievement.setAchievementType("未知"); // 其他未定义的值
+                    }
                     return userAchievement;
                 })
                 .collect(Collectors.toList()); // 收集回List

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userAchievement/vo/UserAchievementExportVO.java

@@ -48,9 +48,8 @@ public class UserAchievementExportVO {
     private LocalDateTime createTime;
 
     @ExcelProperty("成果是否达成毕业条件")
+    @Schema(description = "0未达成，1已达成", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @DictFormat("system_student_graduate_status")
     private String isGraduate;
 
-
-
 }