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/enums/EmphasisEnum.java | 11 +++++------
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java | 5 +++++
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/enums/EmphasisEnum.java b/screen-api/src/main/java/com/moral/api/pojo/enums/EmphasisEnum.java
index 867a72e..3e9289d 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/enums/EmphasisEnum.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/enums/EmphasisEnum.java
@@ -14,13 +14,12 @@
@Getter
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum EmphasisEnum implements IntegerValueEnum {
- /**
- *������������
- */
+
+
+ NONE(0,"���"),
+
JZDLS(1, "���������������������������������������"),
- /**
- *������������
- */
+
JXHGK(2, "���������������"),
;
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 12ae337..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
@@ -11,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;
@@ -155,4 +156,8 @@
return allocationVo;
}
+ public Integer getkeyPoint() {
+ return ObjectUtils.isEmpty(keyPoint)?0:keyPoint;
+ }
+
}
--
Gitblit v1.8.0