From 81e5a11d1f8cc8eaeb7875bdafe36a86379d6231 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 12 九月 2024 11:21:18 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java | 6 ++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 3 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentVo.java | 1 +
3 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
index eb934e8..3b57b05 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
@@ -174,4 +174,10 @@
@Dict(dicCode = "device_importance_level")
@ApiModelProperty(value = "閲嶈绋嬪害")
private Integer deviceImportanceLevel;
+ /**
+ * 璁惧寮傚父鐘舵��
+ */
+ @Dict(dicCode = "device_abnormal_status")
+ @ApiModelProperty(value = "璁惧寮傚父鐘舵��")
+ private Integer deviceAbnormalStatus;
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
index 4f47d99..d8a0819 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -217,6 +217,9 @@
<if test="mdcEquipment.deviceCategory != null and mdcEquipment.deviceCategory != '' ">
AND t1.device_category = #{mdcEquipment.deviceCategory}
</if>
+ <if test="mdcEquipment.deviceAbnormalStatus != null and mdcEquipment.deviceAbnormalStatus != '' ">
+ AND t1.device_abnormal_status = #{mdcEquipment.deviceAbnormalStatus}
+ </if>
<if test="mdcEquipment.productionIds != null and mdcEquipment.productionIds.size() > 0 ">
AND t3.id IN
<foreach collection="mdcEquipment.productionIds" index="index" item="id" open="(" separator="," close=")">
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentVo.java
index 0f79ecb..7cfbfcf 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentVo.java
@@ -20,5 +20,6 @@
private String deviceCategory;
private String driveType;
private String productionName;
+ private Integer deviceAbnormalStatus;
private List<String> productionIds;
}
--
Gitblit v1.9.3