From 3f667355c7013b459f3ab5ec0c1bc035d7e2d5aa Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Wed, 31 Jan 2024 10:57:28 +0800
Subject: [PATCH] fix：sql查询时间调整
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
index 5dfca31..1f0a8a8 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
@@ -1,5 +1,6 @@
package com.moral.api.pojo.vo.allocation;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.moral.api.pojo.ext.allocation.AllocationExt;
import com.moral.api.pojo.vo.approvetable.ApproveTableListVo;
@@ -10,6 +11,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.springframework.util.ObjectUtils;
import java.io.Serializable;
import java.util.Date;
@@ -135,10 +137,38 @@
@ApiModelProperty(value = "������������")
private List<ApproveTableListVo> approveList;
+ @ApiModelProperty(value = "������������������")
+ private Integer keyPoint;
+
+ @TableField(exist = false)
+ private String time;
+
+ @TableField(exist = false)
+ private String unitName;
+ @TableField(exist = false)
+ private String escalationUnitName;
+ @TableField(exist = false)
+ private String polluteTypeName;
+
+ @ApiModelProperty(value = "������")
+ private String latitude;
+
+ @ApiModelProperty(value = "������")
+ private String longitude;
+
+ @ApiModelProperty(value = "���������������")
+ private String address;
+
+ @ApiModelProperty(value = "������������")
+ private String name;
public static AllocationVo convert(AllocationExt allocationExt) {
AllocationVo allocationVo = BeanConverts.convert(allocationExt, AllocationVo.class);
return allocationVo;
}
+ public Integer getkeyPoint() {
+ return ObjectUtils.isEmpty(keyPoint)?0:keyPoint;
+ }
+
}
--
Gitblit v1.8.0