浏览代码

feat(game-event): 分组bug修改

zhou 1 月之前
父节点
当前提交
7e9c0cec1a

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

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 赛事分组对象 game_event_group
@@ -61,11 +62,13 @@ public class GameEventGroup extends TenantEntity {
     /**
      * 组别比赛开始时间
      */
+    @JsonFormat(pattern = "HH:mm")
     private Date beginTime;
 
     /**
      * 组别比赛结束时间
      */
+    @JsonFormat(pattern = "HH:mm")
     private Date endTime;
 
     /**

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

@@ -1,5 +1,6 @@
 package org.dromara.system.domain.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.system.domain.GameEventGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
@@ -74,12 +75,14 @@ public class GameEventGroupBo extends BaseEntity {
      * 组别比赛开始时间
      */
 //    @NotNull(message = "组别比赛开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "HH:mm")
     private Date beginTime;
 
     /**
      * 组别比赛结束时间
      */
 //    @NotNull(message = "组别比赛结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "HH:mm")
     private Date endTime;
 
     /**

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

@@ -1,5 +1,6 @@
 package org.dromara.system.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.system.domain.GameEventGroup;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -78,12 +79,14 @@ public class GameEventGroupVo implements Serializable {
      * 组别比赛开始时间
      */
     @ExcelProperty(value = "组开始时间")
+    @JsonFormat(pattern = "HH:mm")
     private Date beginTime;
 
     /**
      * 组别比赛结束时间
      */
     @ExcelProperty(value = "组结束时间")
+    @JsonFormat(pattern = "HH:mm")
     private Date endTime;
 
     /**