From 287d6c9ad043327a2527dfab06bbd5171847ca23 Mon Sep 17 00:00:00 2001
From: lizhenhua <1075222162@qq.com>
Date: Wed, 25 Jun 2025 15:53:52 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=8C=AF=E5=8D=8E=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/material/ma/MachineMapper.xml      | 40 ++++++++++++++-----
 1 file changed, 30 insertions(+), 10 deletions(-)

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 1433964e..0fefc3ac 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
@@ -469,17 +469,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getByMaCode" resultType="com.bonus.material.ma.domain.Machine">
         SELECT
-            mm.ma_id as maId,
-            mt2.type_name as materialName,
-            mt.type_name as materialModel,
-            mm.ma_code as maCode
+            mi.id as maId,
+            mi.ma_name as materialName,
+            mi.ma_model as materialModel,
+            mi.ma_code as maCode,
+            mi.this_check_time as thisCheckTime,
+            mi.next_check_time as nextCheckTime,
+            mi.repair_man as repairMan,
+            mi.check_man as checkMan,
+            mi.phone,
+            mi.result,null AS reportCode,null AS reportUrl,
+            mi.type
         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_status = '2' and
-            mm.ma_code like concat('%', #{maCode}, '%')
+            ws_ma_info mi
+        WHERE mi.ma_code LIKE CONCAT('%',#{maCode},'%') and mi.is_active = 1 and DATEDIFF(mi.next_check_time,NOW()) > 0
+        UNION
+        SELECT
+            mm.ma_id AS id,
+            mt2.type_name as maName,
+            mt.type_name as maModel,
+            mm.ma_code as maCode,
+            mm.this_check_time as thisCheckTime,
+            mm.next_check_time as nextCheckTime,
+            mm.check_man as repairMan,
+            ifnull(mm.inspect_man,"高民")   as checkMan,
+            "0551-63703966" as phone,
+            "合格" as result,mm.ex_code AS reportCode,mm.ex_url AS reportUrl,
+            is_jj as type
+        FROM ma_machine mm
+                 LEFT JOIN ma_type mt on mm.type_id = mt.type_id
+                 LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
+        WHERE mm.ma_code LIKE CONCAT('%',#{maCode},'%') and mt.MANAGE_TYPE =0 and DATEDIFF(mm.next_check_time,NOW()) > 0
     </select>
 
     <delete id="deleteMachineByMaCodeAndTypeId">

From 1968012905a1dd1960ddaaebf0e9138cb950aec8 Mon Sep 17 00:00:00 2001
From: lizhenhua <1075222162@qq.com>
Date: Wed, 25 Jun 2025 15:56:07 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=8C=AF=E5=8D=8E=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/material/ma/MachineMapper.xml      | 1 +
 1 file changed, 1 insertion(+)

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 0fefc3ac..bf9ce8a2 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
@@ -500,6 +500,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  LEFT JOIN ma_type mt on mm.type_id = mt.type_id
                  LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
         WHERE mm.ma_code LIKE CONCAT('%',#{maCode},'%') and mt.MANAGE_TYPE =0 and DATEDIFF(mm.next_check_time,NOW()) > 0
+
     </select>
 
     <delete id="deleteMachineByMaCodeAndTypeId">

From 3f5d122065cb99a9028fda5b7eef5ef62e9fa6ee Mon Sep 17 00:00:00 2001
From: lizhenhua <1075222162@qq.com>
Date: Wed, 25 Jun 2025 15:57:26 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=8C=AF=E5=8D=8E=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/material/ma/MachineMapper.xml      | 1 -
 1 file changed, 1 deletion(-)

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 bf9ce8a2..0fefc3ac 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
@@ -500,7 +500,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  LEFT JOIN ma_type mt on mm.type_id = mt.type_id
                  LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
         WHERE mm.ma_code LIKE CONCAT('%',#{maCode},'%') and mt.MANAGE_TYPE =0 and DATEDIFF(mm.next_check_time,NOW()) > 0
-
     </select>
 
     <delete id="deleteMachineByMaCodeAndTypeId">

From 1bf01705f5599b5195be14bd7843686b855f15f3 Mon Sep 17 00:00:00 2001
From: lizhenhua <1075222162@qq.com>
Date: Wed, 25 Jun 2025 16:16:42 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=8C=AF=E5=8D=8E=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/material/ma/MachineMapper.xml      | 1 -
 1 file changed, 1 deletion(-)

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 0fefc3ac..c9cc606a 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
@@ -530,7 +530,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
 
-
     <select id="selectMachineByQrCode" resultType="com.bonus.material.ma.domain.Machine">
         SELECT
             mm.ma_id as maId,

From b97217a556457e713aa4b1aaacb12314cec9a4cb Mon Sep 17 00:00:00 2001
From: lizhenhua <1075222162@qq.com>
Date: Wed, 25 Jun 2025 16:35:29 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=8C=AF=E5=8D=8E=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/material/ma/MachineMapper.xml      | 1 +
 1 file changed, 1 insertion(+)

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 c9cc606a..3b97d73e 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
@@ -548,6 +548,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ma_machine mm
         WHERE
             mm.qr_code = #{qrCode}
+
     </select>
 
     <select id="getInfoByQrcode" resultMap="MachineResult">