From d4d20747ff533ae8e5a5b4ca2ee48bd887b5dca5 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 20 Nov 2024 17:44:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E5=8C=85=E6=9C=89=E9=87=8F=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/material/StorageStatusMapper.xml   | 34 ++++++++++---------
 .../src/views/stquery/deviceStatusRecord.vue  |  8 +++--
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml
index e7982487..db1d6573 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml
@@ -280,22 +280,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             rid.ma_id
     </select>
     <select id="getAllRecords" resultType="com.bonus.sgzb.base.api.domain.MaType">
-        SELECT
-        mm.ma_code,
-        mt2.type_name typeName,
-        mt.type_name modelName
-        FROM
-        ma_machine mm
-        LEFT JOIN ma_type mt ON mt.type_id = mm.type_id
-        LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
-        WHERE
-        mm.ma_id IN
-        <foreach collection="ids" item="maId" open="(" separator="," close=")">
-            #{maId}
-        </foreach>
-        <if test="bean.maCode != null and bean.maCode != ''">
-            and mm.ma_code like concat('%',#{bean.maCode},'%')
-        </if>
+            SELECT
+            mm.ma_code,
+            mt2.type_name AS typeName,
+            mt.type_name AS modelName
+            FROM
+            ma_machine mm
+            LEFT JOIN ma_type mt ON mt.type_id = mm.type_id
+            LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
+            WHERE
+            mm.ma_id IN
+            <foreach collection="ids" item="maId" open="(" separator="," close=")">
+                #{maId}
+            </foreach>
+            <if test="bean != null">
+                <if test="bean.maCode != null and bean.maCode != ''">
+                    AND mm.ma_code LIKE CONCAT('%', #{bean.maCode}, '%')
+                </if>
+            </if>
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
index 961221b3..66dd412e 100644
--- a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
+++ b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
@@ -351,7 +351,7 @@
               clearable
               :maxlength="30"
               style="width: 240px"
-              @keyup.enter.native="handleDialogQuery"
+              @keyup.enter.native="handleDialogAllQuery"
             />
           </el-form-item>
 
@@ -360,7 +360,7 @@
               type="primary"
               icon="el-icon-search"
               size="mini"
-              @click="handleDialogQuery"
+              @click="handleDialogAllQuery"
             >查询</el-button>
           </el-form-item>
         </el-form>
@@ -644,6 +644,10 @@ export default {
             this.queryParams.pageNum = 1
             this.getUseMaCodeList()
         },
+        handleDialogAllQuery() {
+            this.queryParams.pageNum = 1
+            this.getAllRecords()
+        },
         /** 重置按钮操作 */
         resetQuery() {
             this.queryParams.time = []