Browse Source

Revert "时间格式调整"

This reverts commit 47f74ac8
aqm-ops-supervision-platform
gjh 2 weeks ago
parent
commit
d1066456e8
  1. 5
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/PmDataManagementInfo.java
  2. 8
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/PmDataManagementInfoBo.java
  3. 8
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/PmDataManagementInfoVo.java

5
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/PmDataManagementInfo.java

@ -6,7 +6,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
@ -48,15 +47,11 @@ public class PmDataManagementInfo extends TenantEntity {
/** /**
* 开始时间 * 开始时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startDate; private Date startDate;
/** /**
* 结束时间 * 结束时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endDate; private Date endDate;
/** /**

8
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/PmDataManagementInfoBo.java

@ -51,16 +51,16 @@ public class PmDataManagementInfoBo extends BaseEntity {
* 开始时间 * 开始时间
*/ */
//@NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) //@NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date startDate; private Date startDate;
/** /**
* 结束时间 * 结束时间
*/ */
//@NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class }) //@NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endDate; private Date endDate;
/** /**

8
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/PmDataManagementInfoVo.java

@ -60,16 +60,16 @@ public class PmDataManagementInfoVo implements Serializable {
* 开始时间 * 开始时间
*/ */
@ExcelProperty(value = "开始时间") @ExcelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date startDate; private Date startDate;
/** /**
* 结束时间 * 结束时间
*/ */
@ExcelProperty(value = "结束时间") @ExcelProperty(value = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endDate; private Date endDate;
/** /**

Loading…
Cancel
Save