From d68c61517a3a6d4ec4d47844c21bdc143f99cbab Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 17 四月 2024 22:58:05 +0800
Subject: [PATCH] 大屏接口
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/BasicDataReportingVO.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/BasicDataReportingVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/BasicDataReportingVO.java
index 21283ae..49117f9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/BasicDataReportingVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/BasicDataReportingVO.java
@@ -1,13 +1,13 @@
package com.ruoyi.system.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.enums.ReportingStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -30,12 +30,14 @@
private ReportingStatusEnum status;
@ApiModelProperty(value = "首次填报时间")
- private LocalDateTime createTime;
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+ private Date createTime;
- @ApiModelProperty(value = "填报完成时间")
- private LocalDateTime updateTime;
+ @ApiModelProperty(value = "填报完成时间",notes = "状态为已填报才展示")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+ private Date updateTime;
//1：未填报 2：数据缺失 3：已填报
- @ApiModelProperty(value = "动态字段")
- private List<FieldReportingVO> fields = new ArrayList<>();
+ @ApiModelProperty(value = "字段")
+ private List<FieldsTreeVO> fields;
}
--
Gitblit v1.7.1