From 926dcfa888dd5dd57d357ae1fdcd1f1447434ff4 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 15 Nov 2023 09:37:44 +0800
Subject: [PATCH] chore:重要任务类型补充提交
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java | 25 +++++++++++++++++++++++++
1 files changed, 25 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..556d88e 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;
@@ -9,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;
@@ -37,6 +40,7 @@
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd")
private Date escalationTime;
@ApiModelProperty(value = "������������")
@@ -76,6 +80,7 @@
private String changeName;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd")
private Date changeTime;
@ApiModelProperty(value = "������������")
@@ -88,6 +93,7 @@
private String checkName;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date checkTime;
@ApiModelProperty(value = "������")
@@ -106,6 +112,7 @@
private String createName;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty(value = "���������id")
@@ -115,6 +122,7 @@
private String updateName;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty(value = "������������")
@@ -129,10 +137,27 @@
@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;
+
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