From c64ca12b8679d73fc7f8109f0e08fa8c74352164 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 12:46:39 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java | 17 +++++++++++++++++
1 files changed, 17 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 39c463d..64c73f2 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,7 @@
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;
import com.moral.api.pojo.vo.file.FileVo;
@@ -37,6 +39,7 @@
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd")
private Date escalationTime;
@ApiModelProperty(value = "������������")
@@ -76,6 +79,7 @@
private String changeName;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd")
private Date changeTime;
@ApiModelProperty(value = "������������")
@@ -88,6 +92,7 @@
private String checkName;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date checkTime;
@ApiModelProperty(value = "������")
@@ -106,6 +111,7 @@
private String createName;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty(value = "���������id")
@@ -115,6 +121,7 @@
private String updateName;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty(value = "������������")
@@ -129,6 +136,16 @@
@ApiModelProperty(value = "������������")
private List<ApproveTableListVo> approveList;
+ @TableField(exist = false)
+ private String time;
+
+ @TableField(exist = false)
+ private String unitName;
+ @TableField(exist = false)
+ private String escalationUnitName;
+ @TableField(exist = false)
+ private String polluteTypeName;
+
public static AllocationVo convert(AllocationExt allocationExt) {
AllocationVo allocationVo = BeanConverts.convert(allocationExt, AllocationVo.class);
--
Gitblit v1.8.0