Kaynağa Gözat

refactor(game-event): 重构游戏事件模块中的VO类Excel导出配置

- 移除GameAthleteVo中未使用的Date导入
- 将GameAthleteVo中队伍名称字段移动到类末尾并添加Excel导出注解
- 为GameAthleteVo中年龄和手机号字段添加Excel导出注解
- 注释掉GameAthleteVo中状态字段的Excel导出功能
- 注释掉GameRankGroupVo中状态字段的Excel导出功能
- 重新排列GameTeamVo中队伍编号、分组名和领队字段的位置
- 为GameTeamVo中团队描述字段添加Excel导出注解
- 注释掉GameTeamVo中状态和备注字段的Excel导出功能
zhou 1 hafta önce
ebeveyn
işleme
49d7c4b65f

+ 9 - 10
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/vo/GameAthleteVo.java

@@ -10,7 +10,6 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 
@@ -83,16 +82,10 @@ public class GameAthleteVo implements Serializable {
     @ExcelDictFormat(dictType = "sys_user_sex")
     private String gender;
 
-    /**
-     * 队伍名称
-     */
-    @ExcelProperty(value = "队伍")
-    private String teamName;
-
     /**
      * 年龄
      */
-//    @ExcelProperty(value = "年龄")
+    @ExcelProperty(value = "年龄")
     private Long age;
 
     /**
@@ -116,7 +109,7 @@ public class GameAthleteVo implements Serializable {
     /**
      * 手机号
      */
-//    @ExcelProperty(value = "手机号")
+    @ExcelProperty(value = "手机号")
     private String phone;
 
     /**
@@ -149,10 +142,16 @@ public class GameAthleteVo implements Serializable {
     @ExcelProperty(value = "参与项目")
     private String projectNames;
 
+    /**
+     * 队伍名称
+     */
+    @ExcelProperty(value = "队伍")
+    private String teamName;
+
     /**
      * 状态(0正常 1停用)
      */
-    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+//    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "game_event_status")
     private String status;
 

+ 1 - 1
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/vo/GameRankGroupVo.java

@@ -75,7 +75,7 @@ public class GameRankGroupVo implements Serializable {
     /**
      * 状态(0正常 1停用)
      */
-    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+//    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
     private String status;
 

+ 23 - 23
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/vo/GameTeamVo.java

@@ -41,24 +41,12 @@ public class GameTeamVo implements Serializable {
      */
     private Long rgId;
 
-    /**
-     * 排名分组名
-     */
-    @ExcelProperty(value = "分组名")
-    private String rgName;
-
     /**
      * 赛事名称
      */
     // @ExcelProperty(value = "赛事名称")
     private String eventName;
 
-    /**
-     * 队伍名称
-     */
-    @ExcelProperty(value = "队伍名称")
-    private String teamName;
-
     /**
      * 队伍编号
      */
@@ -66,10 +54,10 @@ public class GameTeamVo implements Serializable {
     private String teamCode;
 
     /**
-     * 
+     * 队伍名称
      */
-    @ExcelProperty(value = "队")
-    private String leader;
+    @ExcelProperty(value = "队伍名称")
+    private String teamName;
 
     /**
      * 队员列表
@@ -87,6 +75,24 @@ public class GameTeamVo implements Serializable {
     @ExcelProperty(value = "参与项目")
     private String projectNames;
 
+    /**
+     * 排名分组名
+     */
+    @ExcelProperty(value = "分组名")
+    private String rgName;
+
+    /**
+     * 团队描述
+     */
+    @ExcelProperty(value = "团队描述")
+    private String teamDescribe;
+
+    /**
+     * 领队
+     */
+    @ExcelProperty(value = "领队")
+    private String leader;
+
     /**
      * 人数
      */
@@ -99,23 +105,17 @@ public class GameTeamVo implements Serializable {
     @ExcelProperty(value = "号码段")
     private String numberRange;
 
-    /**
-     * 团队描述
-     */
-    @ExcelProperty(value = "团队描述")
-    private String teamDescribe;
-
     /**
      * 状态(0正常 1停用)
      */
-    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+//    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
     private String status;
 
     /**
      * 备注
      */
-    @ExcelProperty(value = "备注")
+//    @ExcelProperty(value = "备注")
     private String remark;
 
 }