From b60e0118f30b39784de9255e743d08967956c905 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 21 五月 2025 10:57:47 +0800
Subject: [PATCH] 设备异常反馈
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java | 1 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcMessageApprovalMapper.xml | 6 ++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcMessageApproval.java | 6 ++++++
3 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcMessageApproval.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcMessageApproval.java
index 50f0c12..fd82bf1 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcMessageApproval.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcMessageApproval.java
@@ -42,6 +42,12 @@
@Dict(dicCode = "mdcMsgType")
private String msgType;
/**
+ * 娑堟伅鏉ユ簮
+ */
+ @Excel(name = "娑堟伅鏉ユ簮", width = 15)
+ @ApiModelProperty(value = "娑堟伅鏉ユ簮")
+ private String msgSource;
+ /**
* 鏍囬
*/
@Excel(name = "鏍囬", width = 15)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcMessageApprovalMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcMessageApprovalMapper.xml
index 4e53609..f816c08 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcMessageApprovalMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcMessageApprovalMapper.xml
@@ -16,6 +16,12 @@
<if test="mdcMessageApproval.msgStatus != null and mdcMessageApproval.msgStatus != ''">
AND msg_status = #{mdcMessageApproval.msgStatus}
</if>
+ <if test="mdcMessageApproval.msgType != null and mdcMessageApproval.msgType != ''">
+ AND msg_type = #{mdcMessageApproval.msgType}
+ </if>
+ <if test="mdcMessageApproval.msgSource != null and mdcMessageApproval.msgSource != ''">
+ AND msg_source = #{mdcMessageApproval.msgSource}
+ </if>
</where>
ORDER BY create_time DESC
</select>
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java
index d80c6a2..0365861 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java
@@ -64,6 +64,7 @@
List<String> superNameList = superList.stream().map(SysUser::getRealname).collect(Collectors.toList());
mdcMessageApproval.setApproverNames(String.join(",", superNameList));
}
+ mdcMessageApproval.setMsgSource("鎵嬪姩涓婃姤");
mdcMessageApproval.setMsgStatus(MdcConstant.MSG_STATUS_0);
return result;
}
--
Gitblit v1.9.3