From 9f70189db7df97aad6d5260b9bcf1f93d0a78863 Mon Sep 17 00:00:00 2001
From: bonus <1203338439@qq.com>
Date: Thu, 18 Sep 2025 17:14:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../clz/domain/vo/MaterialRetainedEquipmentInfo.java      | 8 +++++++-
 .../mapper/material/clz/MaterialMachineMapper.xml         | 7 +++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java
index 4553f978..956924ae 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java
@@ -245,4 +245,10 @@ public class MaterialRetainedEquipmentInfo {
     private String endTime;
 
     private String unitValue;
-}
\ No newline at end of file
+
+    @ApiModelProperty(value = "报告编码")
+    private String reportCode;
+
+    @ApiModelProperty(value = "报告路径")
+    private String reportUrl;
+}
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
index b6c79f17..5d6b38bd 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
@@ -743,6 +743,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mt.type_name AS typeModelName,
         sai.ma_id AS maId,
         mm.ma_code AS maCode,
+        mm.ex_code AS reportCode,
+        mm.ex_url AS reportUrl,
         mm.this_check_time AS thisCheckTime,
         mm.next_check_time AS nextCheckTime,
         bp.imp_unit AS impUnit,
@@ -807,7 +809,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bp.pro_name like concat('%',#{keyWord},'%') or
             mt2.type_name like concat('%',#{keyWord},'%') or
             mt.type_name like concat('%',#{keyWord},'%') or
-            mm.ma_code like concat('%',#{keyWord},'%')
+            mm.ma_code like concat('%',#{keyWord},'%') or
+            mm.ex_code like concat('%',#{keyWord},'%')
             )
         </if>
         ) AS temp  -- 子查询别名
@@ -1735,4 +1738,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         bz.ssfbdw
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>