From d8c7b812d8a2d9c779c73545fb32a78897fe0c1d Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Tue, 17 Jun 2025 18:14:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/controller/BmQrBoxController.java   |  6 ++--
 .../material/basic/mapper/BmQrBoxMapper.java  |  5 +++
 .../basic/service/BmQrBoxService.java         |  2 +-
 .../service/impl/BmQrBoxServiceImpl.java      |  6 ++--
 .../mapper/material/basic/BmQrBoxMapper.xml   | 33 +++++++++++++++----
 5 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmQrBoxController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmQrBoxController.java
index 4be1525b..0f0a7c07 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmQrBoxController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmQrBoxController.java
@@ -65,13 +65,13 @@ public class BmQrBoxController extends BaseController {
 
     /**
      * APP -- 查询二维码标准箱绑定列表 -- 不分页
-     * @param boxId 标准箱ID
+     * @param
      */
     @ApiOperation(value = "APP -- 查询二维码标准箱绑定列表")
     //@RequiresPermissions("basic:qrBox:list")
     @GetMapping("/app_box_bind_list")
-    public AjaxResult getBoxBindList(Long boxId) {
-        return AjaxResult.success(getDataTable(qrBoxService.getBoxBindList(boxId)));
+    public AjaxResult getBoxBindList(BmQrBoxInfo bean) {
+        return AjaxResult.success(getDataTable(qrBoxService.getBoxBindList(bean)));
     }
 
     /**
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java
index 386f8629..a3d2086f 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java
@@ -95,6 +95,11 @@ public interface BmQrBoxMapper {
      */
     List<BmQrBoxInfo> getBoxBindList(Long boxId);
 
+    /**
+     * 根据二维码标准箱编码查询绑定详情
+     */
+    List<BmQrBoxInfo> getBoxBindLists(BmQrBoxInfo bean);
+
     /**
      * 根据二维码标准箱编码查询绑定详情
      * @param bmQrBoxInfo
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/BmQrBoxService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/BmQrBoxService.java
index b5f82c64..fcf7612d 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/BmQrBoxService.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/BmQrBoxService.java
@@ -80,7 +80,7 @@ public interface BmQrBoxService {
     /**
      * APP - 获取绑定物资列表
      */
-    List<BmQrBoxInfo> getBoxBindList(Long boxId);
+    List<BmQrBoxInfo> getBoxBindList(BmQrBoxInfo bean);
 
     /**
      * 删除二维码标准箱管理
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java
index e111d473..e29be700 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java
@@ -472,11 +472,11 @@ public class BmQrBoxServiceImpl implements BmQrBoxService {
     /**
      * 获取绑定物资列表
      *
-     * @param boxId 标准箱ID
+     * @param bean
      */
     @Override
-    public List<BmQrBoxInfo> getBoxBindList(Long boxId) {
-        return bmQrBoxMapper.getBoxBindList(boxId);
+    public List<BmQrBoxInfo> getBoxBindList(BmQrBoxInfo bean) {
+        return bmQrBoxMapper.getBoxBindLists(bean);
     }
 
     /**
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml
index 4f9d48ed..5c65b930 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml
@@ -186,13 +186,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getBoxBindList" resultType="com.bonus.material.basic.domain.BmQrBoxInfo">
         SELECT
-            qb.id as id, qb.box_id as boxId, qb.create_by as createBy, qb.create_time,
-            mt1.type_name as typeName,
-            mt.type_name as typeModelName,
-            mm.ma_id as maId,mm.ma_code as maCode,mm.type_id as maTypeId,
-            sdd.dict_label as maStatus
+        qb.id as id, qb.box_id as boxId, qb.create_by as createBy, qb.create_time,
+        mt1.type_name as typeName,
+        mt.type_name as typeModelName,
+        mm.ma_id as maId,mm.ma_code as maCode,mm.type_id as maTypeId,
+        sdd.dict_label as maStatus
         FROM
-            bm_qrcode_box_bind qb
+        bm_qrcode_box_bind qb
         LEFT JOIN ma_machine mm ON qb.ma_id = mm.ma_id
         LEFT JOIN sys_dict_data sdd ON sdd.dict_type = 'ma_machine_status' and sdd.dict_value = mm.ma_status
         LEFT JOIN ma_type mt ON mm.type_id = mt.type_id AND mt.del_flag = '0'
@@ -202,6 +202,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="getBoxBindLists" resultType="com.bonus.material.basic.domain.BmQrBoxInfo">
+        SELECT
+        qb.id as id, qb.box_id as boxId, qb.create_by as createBy, qb.create_time,
+        mt1.type_name as typeName,
+        mt.type_name as typeModelName,
+        mm.ma_id as maId,mm.ma_code as maCode,mm.type_id as maTypeId,
+        sdd.dict_label as maStatus
+        FROM
+        bm_qrcode_box_bind qb
+        LEFT JOIN ma_machine mm ON qb.ma_id = mm.ma_id
+        LEFT JOIN sys_dict_data sdd ON sdd.dict_type = 'ma_machine_status' and sdd.dict_value = mm.ma_status
+        LEFT JOIN ma_type mt ON mm.type_id = mt.type_id AND mt.del_flag = '0'
+        LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id AND mt1.del_flag = '0'
+        <where>
+            qb.box_id = #{boxId}
+            <if test="keyWord != null and keyWord !=''">
+                and mm.ma_code LIKE concat('%',#{keyWord},'%')
+            </if>
+        </where>
+    </select>
+
     <select id="getBoxBindListByCode" resultType="com.bonus.material.basic.domain.BmQrBoxInfo">
         SELECT qb.id         as id,
                qb.box_id     as boxId,