缺少物资名称搜索的模块添加查询

bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml

@@ -289,10 +289,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             )
         </if>
         <if test="typeName != null and typeName != ''">
-            and bs.type_name like CONCAT('%',#{typeName},'%')
+            and mt1.type_name like CONCAT('%',#{typeName},'%')
         </if>
         <if test="typeModelName != null and typeModelName != ''">
-            and bs.type_model_name like CONCAT('%',#{typeModelName},'%')
+            and mt.type_name like CONCAT('%',#{typeModelName},'%')
         </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND bs.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')

bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml

@@ -92,6 +92,7 @@
     </select>
 
     <select id="getList" resultType="com.bonus.material.ma.domain.DirectApplyInfo">
+        SELECT * FROM (
             SELECT DISTINCT
             dai.create_time AS createTime,
             su.user_name AS createName,
@@ -119,13 +120,6 @@
             left join sys_user su on dai.create_by = su.user_id
             left join sys_workflow_record swr on swr.task_id = dai.id
             <where>
-            <if test="keyWord != null and keyWord != ''">
-                and (
-                bui.unit_name like concat('%', #{keyWord}, '%') or
-                bpl.pro_name like concat('%', #{keyWord}, '%') or
-                bui1.unit_name like concat('%', #{keyWord}, '%') or
-                bpl1.pro_name like concat('%', #{keyWord}, '%'))
-            </if>
                 <if test="lotId != null and lotId != ''">
                     and bpl.pro_id = #{lotId}
                 </if>
@@ -140,6 +134,19 @@
             </where>
             GROUP BY dai.id
             order by dai.create_time desc
+       ) a
+        <where>
+            <if test="keyWord!=null and keyWord!=''">
+                AND (
+                    INSTR(a.typeName,#{keyWord}) > 0 OR
+                    INSTR(a.backUnitName,#{keyWord}) > 0 OR
+                    INSTR(a.backProName,#{keyWord}) > 0 OR
+                    INSTR(a.leaseUnitName,#{keyWord}) > 0 OR
+                    INSTR(a.leaseProName,#{keyWord}) > 0
+                )
+            </if>
+
+        </where>
     </select>
 
     <select id="getInfoById" resultType="com.bonus.material.ma.domain.DirectApplyInfo">