From 84e740f362d574b942b1c9a274425841c9167de8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 15 Nov 2023 08:27:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java | 4 ++
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java | 4 ++
screen-api/src/main/java/com/moral/api/controller/DictController.java | 1
screen-api/src/main/java/com/moral/api/pojo/enums/EmphasisEnum.java | 54 +++++++++++++++++++++++++++
screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java | 5 ++
screen-api/src/main/java/com/moral/api/entity/Allocation.java | 4 ++
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java | 3 +
screen-api/src/main/resources/mapper/AllocationMapper.xml | 3 +
8 files changed, 77 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/DictController.java b/screen-api/src/main/java/com/moral/api/controller/DictController.java
index 0c7cc2a..9aaf46b 100644
--- a/screen-api/src/main/java/com/moral/api/controller/DictController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/DictController.java
@@ -32,6 +32,7 @@
.setFileTableEnum(FileTableEnum.values())
.setAllocationApproveEnum(AllocationApproveEnum.values())
.setAllocationExtensionApproveEnum(AllocationExtensionApproveEnum.values())
+ .setEmphasisEnum(EmphasisEnum.values())
;
return ResultMessage.ok(dictionaryVo);
}
diff --git a/screen-api/src/main/java/com/moral/api/entity/Allocation.java b/screen-api/src/main/java/com/moral/api/entity/Allocation.java
index 4124f6e..73e8bc5 100644
--- a/screen-api/src/main/java/com/moral/api/entity/Allocation.java
+++ b/screen-api/src/main/java/com/moral/api/entity/Allocation.java
@@ -135,6 +135,10 @@
* ������������
*/
private String invalidReason;
+ /**
+ * ������������������
+ */
+ private Integer keyPoint;
}
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
new file mode 100644
index 0000000..867a72e
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/pojo/enums/EmphasisEnum.java
@@ -0,0 +1,54 @@
+package com.moral.api.pojo.enums;
+
+
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.moral.api.exception.BusinessException;
+
+@Getter
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+public enum EmphasisEnum implements IntegerValueEnum {
+ /**
+ *������������
+ */
+ JZDLS(1, "���������������������������������������"),
+ /**
+ *������������
+ */
+ JXHGK(2, "���������������"),
+
+ ;
+
+ @EnumValue
+ public final Integer value;
+ public final String name;
+
+ EmphasisEnum(Integer value, String name) {
+ this.value = value;
+ this.name = name;
+ }
+
+ private static Map<Integer, ChangeEnum> valueMap = new HashMap<>();
+ static {
+ for (ChangeEnum v : ChangeEnum.values()) {
+ valueMap.put(v.value, v);
+ }
+ }
+ @JsonCreator
+ public static ChangeEnum getByValue(Integer value) {
+ if (value == null) {
+ return null;
+ }
+ ChangeEnum result = valueMap.get(value);
+ if (result == null) {
+ throw new BusinessException("������������������" + value);
+ }
+ return result;
+ }
+}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java
index 02375d9..f7f27d1 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java
@@ -66,6 +66,10 @@
private Integer state;
+ @ApiModelProperty(value = "������������������")
+ private Integer keyPoint;
+
+
@ApiModelProperty(value = "������������")
private List<FileVo> fileBaseList;
diff --git a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java
index 41c311b..e1ad1f5 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java
@@ -78,6 +78,10 @@
@ApiModelProperty(value = "������������")
private List<FileVo> fileBaseList;
+ @ApiModelProperty(value = "������������������")
+ private Integer keyPoint;
+
+
public Allocation convert() {
Allocation allocation = BeanConverts.convert(this, Allocation.class);
return allocation;
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java
index dacd8de..efe26ca 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java
@@ -37,6 +37,7 @@
private List<Map<String, Object>> FileTableEnum;
private List<Map<String, Object>> AllocationExtensionApproveEnum;
+ private List<Map<String, Object>> EmphasisEnum;
public static List<Map<String, Object>> enumArray2Map(Enum[] enums) {
@@ -77,5 +78,9 @@
this.AllocationExtensionApproveEnum = enumArray2Map(enumResult);
return this;
}
+ public DictionaryVo setEmphasisEnum(com.moral.api.pojo.enums.EmphasisEnum[] enumResult) {
+ this.EmphasisEnum = enumArray2Map(enumResult);
+ return this;
+ }
}
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 64c73f2..12ae337 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
@@ -136,6 +136,9 @@
@ApiModelProperty(value = "������������")
private List<ApproveTableListVo> approveList;
+ @ApiModelProperty(value = "������������������")
+ private Integer keyPoint;
+
@TableField(exist = false)
private String time;
diff --git a/screen-api/src/main/resources/mapper/AllocationMapper.xml b/screen-api/src/main/resources/mapper/AllocationMapper.xml
index 098ebda..8572d20 100644
--- a/screen-api/src/main/resources/mapper/AllocationMapper.xml
+++ b/screen-api/src/main/resources/mapper/AllocationMapper.xml
@@ -27,6 +27,7 @@
<result column="check_time" property="checkTime" />
<result column="state" property="state" />
<result column="invalid_reason" property="invalidReason" />
+ <result column="key_point" property="keyPoint" />
</resultMap>
<!-- ��������������������� -->
@@ -36,7 +37,7 @@
<!-- ��������������������� -->
<sql id="Allocation_Column_List">
- allocation.allocation_id, allocation.allocation_num, allocation.escalation_type, allocation.escalation_time, allocation.pollute_position, allocation.unit_id, allocation.pollute_type, allocation.change_type, allocation.change_day, allocation.escalation_unit_id, allocation.escalation_name, allocation.investigation_type, allocation.problem_describe, allocation.is_change, allocation.change_describe, allocation.change_name, allocation.change_time, allocation.check_score, allocation.check_describe, allocation.check_name, allocation.check_time, allocation.state, allocation.is_del, allocation.is_invalid, allocation.invalid_reason, allocation.create_id, allocation.create_name, allocation.create_time, allocation.update_id, allocation.update_name, allocation.update_time
+ allocation.allocation_id, allocation.allocation_num, allocation.escalation_type, allocation.escalation_time, allocation.pollute_position, allocation.unit_id, allocation.pollute_type, allocation.change_type, allocation.change_day, allocation.escalation_unit_id, allocation.escalation_name, allocation.investigation_type, allocation.problem_describe, allocation.is_change, allocation.change_describe, allocation.change_name, allocation.change_time, allocation.check_score, allocation.check_describe, allocation.check_name, allocation.check_time, allocation.state, allocation.is_del, allocation.is_invalid, allocation.invalid_reason, allocation.create_id, allocation.create_name, allocation.create_time, allocation.update_id, allocation.update_name, allocation.update_time,allocation.key_point
</sql>
--
Gitblit v1.8.0