Procházet zdrojové kódy

feat(game-event): 添加道数显示模式字段并优化代码格式

- 在 GameEventGroup 实体中添加 trackDisplayMode 字段
- 在 GameEventGroupBo 中添加 trackDisplayMode 字段
- 在 GameEventGroupVo 中添加 trackDisplayMode 字段
- 移除多余的空行和格式调整
- 将注释中的验证注解改为注释掉的状态
- 统一代码格式和注释位置
zhou před 1 týdnem
rodič
revize
efbae31e04

+ 10 - 6
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/GameEventGroup.java

@@ -26,7 +26,7 @@ public class GameEventGroup extends TenantEntity {
     /**
      * 组别id
      */
-    @TableId(value = "group_id",type = IdType.AUTO)
+    @TableId(value = "group_id", type = IdType.AUTO)
     private Long groupId;
 
     /**
@@ -107,15 +107,19 @@ public class GameEventGroup extends TenantEntity {
     private String status;
 
     /**
-     * 删除标志(0代表存在 1代表删除)
+     * 备注
      */
-    @TableLogic
-    private String delFlag;
+    private String remark;
 
     /**
-     * 备注
+     * 道数显示模式(0第N道 1序号N)
      */
-    private String remark;
+    private String trackDisplayMode;
 
+    /**
+     * 删除标志(0代表存在 1代表删除)
+     */
+    @TableLogic
+    private String delFlag;
 
 }

+ 17 - 12
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/bo/GameEventGroupBo.java

@@ -31,7 +31,7 @@ public class GameEventGroupBo extends BaseEntity {
     /**
      * 赛事ID
      */
-//    @NotNull(message = "赛事ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotNull(message = "赛事ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long eventId;
 
     /**
@@ -60,51 +60,51 @@ public class GameEventGroupBo extends BaseEntity {
     /**
      * 包含组数
      */
-//    @NotNull(message = "包含组数不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotNull(message = "包含组数不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long includeGroupNum;
 
-
-
     /**
      * 人数/组别
      */
-//    @NotNull(message = "人数/组别不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotNull(message = "人数/组别不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long personNum;
 
     /**
      * 组别比赛开始时间
      */
-//    @NotNull(message = "组别比赛开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotNull(message = "组别比赛开始时间不能为空", groups = { AddGroup.class, EditGroup.class
+    // })
     @JsonFormat(pattern = "HH:mm")
     private Date beginTime;
 
     /**
      * 组别比赛结束时间
      */
-//    @NotNull(message = "组别比赛结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotNull(message = "组别比赛结束时间不能为空", groups = { AddGroup.class, EditGroup.class
+    // })
     @JsonFormat(pattern = "HH:mm")
     private Date endTime;
 
     /**
      * 道数
      */
-//    @NotNull(message = "道数不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotNull(message = "道数不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long trackNum;
 
     /**
      * 场地数量
      */
-//    @NotNull(message = "场地数量不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotNull(message = "场地数量不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long fieldNum;
 
     /**
      * 每组用时
      */
-//    @NotNull(message = "每组用时不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotNull(message = "每组用时不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long duration;
 
     /**
-    * 排序字段
+     * 排序字段
      */
     private String sortOrder;
 
@@ -116,7 +116,8 @@ public class GameEventGroupBo extends BaseEntity {
     /**
      * 状态(0正常 1停用)
      */
-//    @NotBlank(message = "状态(0正常 1停用)不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotBlank(message = "状态(0正常 1停用)不能为空", groups = { AddGroup.class,
+    // EditGroup.class })
     private String status;
 
     /**
@@ -124,5 +125,9 @@ public class GameEventGroupBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 道数显示模式(0第N道 1序号N)
+     */
+    private String trackDisplayMode;
 
 }

+ 7 - 5
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/vo/GameEventGroupVo.java

@@ -13,8 +13,6 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
-
-
 /**
  * 赛事分组视图对象 game_event_group
  *
@@ -53,7 +51,7 @@ public class GameEventGroupVo implements Serializable {
     /**
      * 包含项目列表
      */
-//    @ExcelProperty(value = "包含项目列表")
+    // @ExcelProperty(value = "包含项目列表")
     private String projectList;
 
     /**
@@ -108,13 +106,13 @@ public class GameEventGroupVo implements Serializable {
     /**
      * 排序字段
      */
-//    @ExcelProperty(value = "排序字段")
+    // @ExcelProperty(value = "排序字段")
     private String sortOrder;
 
     /**
      * 排序规则(0升序1降序)
      */
-//    @ExcelProperty(value = "排序规则(0升序1降序)")
+    // @ExcelProperty(value = "排序规则(0升序1降序)")
     private Long sortRule;
 
     /**
@@ -130,5 +128,9 @@ public class GameEventGroupVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 道数显示模式(0第N道 1序号N)
+     */
+    private String trackDisplayMode;
 
 }