Merge branch 'refs/heads/dev' into wk-dev-8-13

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * 赛事分组对象 game_event_group
@@ -22,7 +23,7 @@ public class GameEventGroup extends TenantEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 主键
+     * 组别id
      */
     @TableId(value = "group_id",type = IdType.AUTO)
     private Long groupId;
@@ -32,6 +33,11 @@ public class GameEventGroup extends TenantEntity {
      */
     private Long eventId;
 
+    /**
+     * 项目id
+     */
+    private Long projectId;
+
     /**
      * 项目组名称
      */
@@ -42,6 +48,41 @@ public class GameEventGroup extends TenantEntity {
      */
     private String projectList;
 
+    /**
+     * 包含组数
+     */
+    private Long includeGroupNum;
+
+    /**
+     * 人数/组别
+     */
+    private Long personNum;
+
+    /**
+     * 组别比赛开始时间
+     */
+    private Date beginTime;
+
+    /**
+     * 组别比赛结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 道数
+     */
+    private Long trackNum;
+
+    /**
+     * 场地数量
+     */
+    private Long fieldNum;
+
+    /**
+     * 每组用时
+     */
+    private Long duration;
+
     /**
      * 成员性别（0不分男女 1男 2女）
      */

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

@@ -9,6 +9,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
+import java.util.Date;
+
 /**
  * 赛事分组业务对象 game_event_group
  *
@@ -28,9 +30,14 @@ 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;
 
+    /**
+     * 项目id
+     */
+    @NotNull(message = "项目id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long projectId;
 
     /**
      * 项目组名称
@@ -50,7 +57,51 @@ public class GameEventGroupBo extends BaseEntity {
     private String memberGender;
 
     /**
-     * 排序字段
+     * 包含组数
+     */
+//    @NotNull(message = "包含组数不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long includeGroupNum;
+
+
+
+    /**
+     * 人数/组别
+     */
+//    @NotNull(message = "人数/组别不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long personNum;
+
+    /**
+     * 组别比赛开始时间
+     */
+//    @NotNull(message = "组别比赛开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date beginTime;
+
+    /**
+     * 组别比赛结束时间
+     */
+//    @NotNull(message = "组别比赛结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date endTime;
+
+    /**
+     * 道数
+     */
+//    @NotNull(message = "道数不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long trackNum;
+
+    /**
+     * 场地数量
+     */
+//    @NotNull(message = "场地数量不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long fieldNum;
+
+    /**
+     * 每组用时
+     */
+//    @NotNull(message = "每组用时不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long duration;
+
+    /**
+    * 排序字段
      */
     private String sortOrder;
 

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/bo/GameEventProjectBo.java

@@ -34,7 +34,7 @@ public class GameEventProjectBo extends BaseEntity {
     /**
      * 赛事ID
      */
-    @NotNull(message = "赛事ID不能为空", groups = {AddGroup.class, EditGroup.class})
+//    @NotNull(message = "赛事ID不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long eventId;
 
     /**

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/bo/GameTeamBo.java

@@ -24,13 +24,13 @@ public class GameTeamBo extends BaseEntity {
     /**
      * 主键
      */
-    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
+//    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
     private Long teamId;
 
     /**
      * 赛事ID
      */
-    @NotNull(message = "赛事ID不能为空", groups = {AddGroup.class, EditGroup.class})
+//    @NotNull(message = "赛事ID不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long eventId;
 
     /**

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

@@ -37,6 +37,12 @@ public class GameEventGroupVo implements Serializable {
     @ExcelProperty(value = "赛事ID")
     private Long eventId;
 
+    /**
+     * 项目id
+     */
+    @ExcelProperty(value = "项目id")
+    private Long projectId;
+
     /**
      * 项目组名称
      */
@@ -56,6 +62,48 @@ public class GameEventGroupVo implements Serializable {
     @ExcelDictFormat(readConverterExp = "0=不分男女,1=男,2=女")
     private String memberGender;
 
+    /**
+     * 包含组数
+     */
+    @ExcelProperty(value = "包含组数")
+    private Long includeGroupNum;
+
+    /**
+     * 人数/组别
+     */
+    @ExcelProperty(value = "人数/组别")
+    private Long personNum;
+
+    /**
+     * 组别比赛开始时间
+     */
+    @ExcelProperty(value = "组别比赛开始时间")
+    private Date beginTime;
+
+    /**
+     * 组别比赛结束时间
+     */
+    @ExcelProperty(value = "组别比赛结束时间")
+    private Date endTime;
+
+    /**
+     * 道数
+     */
+    @ExcelProperty(value = "道数")
+    private Long trackNum;
+
+    /**
+     * 场地数量
+     */
+    @ExcelProperty(value = "场地数量")
+    private Long fieldNum;
+
+    /**
+     * 每组用时
+     */
+    @ExcelProperty(value = "每组用时")
+    private Long duration;
+
     /**
      * 排序字段
      */

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameEventGroupServiceImpl.java

@@ -124,6 +124,14 @@ public class GameEventGroupServiceImpl implements IGameEventGroupService {
         lqw.eq(StringUtils.isNotBlank(bo.getSortOrder()), GameEventGroup::getSortOrder, bo.getSortOrder());
         lqw.eq(bo.getSortRule() != null, GameEventGroup::getSortRule, bo.getSortRule());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), GameEventGroup::getStatus, bo.getStatus());
+        lqw.eq(bo.getIncludeGroupNum() != null, GameEventGroup::getIncludeGroupNum, bo.getIncludeGroupNum());
+        lqw.eq(bo.getProjectId() != null, GameEventGroup::getProjectId, bo.getProjectId());
+        lqw.eq(bo.getPersonNum() != null, GameEventGroup::getPersonNum, bo.getPersonNum());
+        lqw.eq(bo.getBeginTime() != null, GameEventGroup::getBeginTime, bo.getBeginTime());
+        lqw.eq(bo.getEndTime() != null, GameEventGroup::getEndTime, bo.getEndTime());
+        lqw.eq(bo.getTrackNum() != null, GameEventGroup::getTrackNum, bo.getTrackNum());
+        lqw.eq(bo.getFieldNum() != null, GameEventGroup::getFieldNum, bo.getFieldNum());
+        lqw.eq(bo.getDuration() != null, GameEventGroup::getDuration, bo.getDuration());
         return lqw;
     }