From fd4fa2b2047edf5fd3584fedeea28ccb0ea5c33d Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 19 Mar 2025 11:28:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E5=B0=91=E7=89=A9=E8=B5=84=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=90=9C=E7=B4=A2=E7=9A=84=E6=A8=A1=E5=9D=97=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/basic/ComplexQueryMapper.xml     |  4 +-
 .../material/ma/DirectRotationMapper.xml      | 97 ++++++++++---------
 2 files changed, 54 insertions(+), 47 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
index 498fd4ae..ab0ce088 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
+++ b/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')
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml
index e7e3a35e..97cbd34e 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml
@@ -92,54 +92,61 @@
     </select>
 
     <select id="getList" resultType="com.bonus.material.ma.domain.DirectApplyInfo">
-        SELECT DISTINCT
-        dai.create_time AS createTime,
-        su.user_name AS createName,
-        bui.unit_id AS backUnitId,
-        bui.unit_name AS backUnitName,
-        bpl.pro_id AS backProId,
-        bpl.pro_name AS backProName,
-        bui1.unit_id AS leaseUnitId,
-        bui1.unit_name AS leaseUnitName,
-        bpl1.pro_id AS leaseProId,
-        bpl1.pro_name AS leaseProName,
-        GROUP_CONCAT(DISTINCT mt2.type_name) as typeName,
-        swr.workflow_status as status
-        FROM
-        direct_apply_info dai
-        LEFT JOIN bm_agreement_info bai ON dai.back_agreement_id = bai.agreement_id
-        LEFT JOIN bm_agreement_info bai1 ON dai.lease_agreement_id = bai1.agreement_id
-        LEFT JOIN bm_project bpl ON bpl.pro_id = bai.project_id
-        LEFT JOIN bm_project bpl1 ON bpl1.pro_id = bai1.project_id
-        LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id
-        LEFT JOIN bm_unit bui1 ON bui1.unit_id = bai1.unit_id
-        LEFT JOIN direct_apply_details dad on dad.direct_id=dai.id
-        LEFT JOIN ma_type mt1 on mt1.type_id=dad.type_id
-        LEFT JOIN ma_type mt2 on mt2.type_id=mt1.parent_id
-        left join sys_user su on dai.create_by = su.user_id
-        left join sys_workflow_record swr on swr.task_id = dai.id
+        SELECT * FROM (
+            SELECT DISTINCT
+            dai.create_time AS createTime,
+            su.user_name AS createName,
+            bui.unit_id AS backUnitId,
+            bui.unit_name AS backUnitName,
+            bpl.pro_id AS backProId,
+            bpl.pro_name AS backProName,
+            bui1.unit_id AS leaseUnitId,
+            bui1.unit_name AS leaseUnitName,
+            bpl1.pro_id AS leaseProId,
+            bpl1.pro_name AS leaseProName,
+            GROUP_CONCAT(DISTINCT mt2.type_name) as typeName,
+            swr.workflow_status as status
+            FROM
+            direct_apply_info dai
+            LEFT JOIN bm_agreement_info bai ON dai.back_agreement_id = bai.agreement_id
+            LEFT JOIN bm_agreement_info bai1 ON dai.lease_agreement_id = bai1.agreement_id
+            LEFT JOIN bm_project bpl ON bpl.pro_id = bai.project_id
+            LEFT JOIN bm_project bpl1 ON bpl1.pro_id = bai1.project_id
+            LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id
+            LEFT JOIN bm_unit bui1 ON bui1.unit_id = bai1.unit_id
+            LEFT JOIN direct_apply_details dad on dad.direct_id=dai.id
+            LEFT JOIN ma_type mt1 on mt1.type_id=dad.type_id
+            LEFT JOIN ma_type mt2 on mt2.type_id=mt1.parent_id
+            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="lotId != null and lotId != ''">
+                    and bpl.pro_id = #{lotId}
+                </if>
+                <if test="unitId != null and unitId != ''">
+                    and bui.unit_id = #{unitId}
+                </if>
+                <if test="status != null and status != ''">
+                    and dai.status = #{status}
+                </if>
+                <if test="isApp != null and taskStatus==0">and dai.status = 0 </if>
+                <if test="isApp != null and taskStatus==1">and (dai.status = 1 or dai.status = 2)</if>
+            </where>
+            GROUP BY dai.id
+            order by dai.create_time desc
+       ) a
         <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 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>
-            <if test="lotId != null and lotId != ''">
-                and bpl.pro_id = #{lotId}
-            </if>
-            <if test="unitId != null and unitId != ''">
-                and bui.unit_id = #{unitId}
-            </if>
-            <if test="status != null and status != ''">
-                and dai.status = #{status}
-            </if>
-            <if test="isApp != null and taskStatus==0">and dai.status = 0 </if>
-            <if test="isApp != null and taskStatus==1">and (dai.status = 1 or dai.status = 2)</if>
+
         </where>
-        GROUP BY dai.id
-        order by dai.create_time desc
     </select>
 
     <select id="getInfoById" resultType="com.bonus.material.ma.domain.DirectApplyInfo">