From 463d5bee5a5111fa5502e2cd91fab23cd54d7d16 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Wed, 20 Mar 2024 14:14:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=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

---
 .../material/PurchaseMacodeInfoMapper.xml     | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
index 9c4c8130..ce127fcf 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
@@ -448,35 +448,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectPutinDetailsAddTypeId" resultType="com.bonus.sgzb.material.domain.PurchaseMacodeInfo">
         select pcd.production_time                           productionTime,
-               mt.type_name                                  specificationType,
-               mt1.type_name                                 typeName,
-               pmi.ma_code                                   maCode,
-               mm.assets_code                                assetsCode,
-               pmi.fix_code                                  fixCode,
-               pcd.type_id                                   typeId,
-               pcd.task_id                                   taskId,
-               mt.code                                       specsCode,
-               mt1.code                                      typeCode,
-               CASE
-                   WHEN pmi.ma_code is null THEN
-                       CASE
-                           WHEN pcd.status = 4 THEN 1
-                           WHEN pcd.status = 5 THEN 2
-                           ELSE 0
-                           END
-                   ELSE pmi.status
-                   END AS                                    status,
-               mm.qr_code                                    qrCode,
-               mm.ma_id                                      maId,
-               if(pmi.ma_code is not null, 1, pcd.check_num) checkNum
+        mt.type_name                                  specificationType,
+        mt1.type_name                                 typeName,
+        pmi.ma_code                                   maCode,
+        mm.assets_code                                assetsCode,
+        pmi.fix_code                                  fixCode,
+        pcd.type_id                                   typeId,
+        pcd.task_id                                   taskId,
+        mt.code                                       specsCode,
+        mt1.code                                      typeCode,
+        CASE
+        WHEN pmi.ma_code is null THEN
+        CASE
+        WHEN pcd.status = 4 THEN 1
+        WHEN pcd.status = 5 THEN 2
+        ELSE 0
+        END
+        ELSE pmi.status
+        END AS                                    status,
+        mm.qr_code                                    qrCode,
+        mm.ma_id                                      maId,
+        if(pmi.ma_code is not null, 1, pcd.check_num) checkNum
         from purchase_check_details pcd
-                 left join purchase_macode_info pmi on pmi.task_id = pcd.task_id and pmi.type_id = pcd.type_id
-                 left join ma_machine mm on pmi.ma_code = mm.ma_code
-                 left join ma_type mt on pcd.type_id = mt.type_id
-                 left join ma_type mt1 on mt.parent_id = mt1.type_id
-        where pcd.task_id = #{taskId} and mt.type_id #{typeId}
-          and pcd.`status`!=3 and pcd.`status`!=7
-
+        left join purchase_macode_info pmi on pmi.task_id = pcd.task_id and pmi.type_id = pcd.type_id
+        left join ma_machine mm on pmi.ma_code = mm.ma_code
+        left join ma_type mt on pcd.type_id = mt.type_id
+        left join ma_type mt1 on mt.parent_id = mt1.type_id
+        where pcd.task_id = #{taskId} and mt.type_id = #{typeId}
+        and pcd.`status`!=3 and pcd.`status`!=7
+        <if test="dictName != null and dictName != ''">
+            and (mt.type_name like concat('%',#{dictName},'%') or
+            mt1.type_name like concat('%',#{dictName},'%'))
+        </if>
         order by status
     </select>