From d73cb36a9353444026b2e2c8338cc172852a8561 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Sat, 16 Nov 2024 16:11:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/bonus/material/ma/domain/Machine.java    | 1 +
 .../src/main/resources/mapper/material/ma/MachineMapper.xml    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java
index cf76e071..dd325aa7 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java
@@ -43,6 +43,7 @@ public class Machine extends BaseEntity
 
     /** 机具状态（数据字典） */
     @Excel(name = "机具状态")
+    @ApiModelProperty(value = "机具状态")
     private String maStatus;
 
     /** 二维码 */
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
index 2a1afb2d..4cd13226 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
@@ -95,6 +95,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="typeId != null">
             and ma.type_id = #{typeId}
         </if>
+        <if test="maStatus != null and maStatus != ''">
+            and ma.ma_status = #{maStatus}
+        </if>
         <if test="materialType != null and materialType != ''">
               and mt3.type_name like concat('%', #{materialType}, '%')
         </if>