材料站增加检查报告

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;
-}
+
+    @ApiModelProperty(value = "报告编码")
+    private String reportCode;
+
+    @ApiModelProperty(value = "报告路径")
+    private String reportUrl;
+}

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>
+</mapper>