From 4295427b2ea219bc2cb3a80543850a50059d2666 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Thu, 6 Mar 2025 15:23:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/material/lease/mapper/LeaseApplyDetailsMapper.java  | 3 ++-
 .../lease/service/impl/LeaseApplyInfoServiceImpl.java         | 2 +-
 .../lease/service/impl/LeaseOutDetailsServiceImpl.java        | 2 +-
 .../mapper/material/lease/LeaseApplyDetailsMapper.xml         | 4 ++++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java
index 3dfc236a..e9151db3 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java
@@ -136,9 +136,10 @@ public interface LeaseApplyDetailsMapper {
 
     /**
      * 根据领料任务id查询领料任务详细
+     * @param keyWord
      * @param publishTask
      * @return
      */
-    List<LeaseApplyDetails> getDetailsPublish(String publishTask);
+    List<LeaseApplyDetails> getDetailsPublish(@Param("keyWord") String keyWord, @Param("publishTask") String publishTask);
 
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
index 6b69e5e9..10caf241 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
@@ -129,7 +129,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
             if (StringUtils.isNotBlank(publishTask)) {
                 LeaseApplyRequestVo info =  new LeaseApplyRequestVo();
                 // 根据领用批次查询领用详情
-                List<LeaseApplyDetails> details = leaseApplyDetailsMapper.getDetailsPublish(publishTask);
+                List<LeaseApplyDetails> details = leaseApplyDetailsMapper.getDetailsPublish(keyword,publishTask);
                 if (!CollectionUtils.isEmpty(details)) {
                     for (LeaseApplyDetails detail : details) {
                         if (detail.getOutNum().compareTo(detail.getAlNum()) == 0) {
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java
index eee7a1d8..ddadac5e 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java
@@ -351,7 +351,7 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService {
         if (StringUtils.isNotBlank(record.getPublishTask())) {
             // 根据领用批次查询领用详情
             boolean isFinished = true;
-            List<LeaseApplyDetails> details = leaseApplyDetailsMapper.getDetailsPublish(record.getPublishTask());
+            List<LeaseApplyDetails> details = leaseApplyDetailsMapper.getDetailsPublish(null, record.getPublishTask());
             if (!CollectionUtils.isEmpty(details)) {
                 for (LeaseApplyDetails bean : details) {
                     if (bean.getAlNum().compareTo(bean.getPreNum()) != 0) {
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml
index 9127dd77..92fa6ba7 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml
@@ -436,6 +436,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND lpd.publish_task = lod.publish_task
         WHERE
             lpd.publish_task = #{publishTask}
+        <if test="keyWord != null and keyWord != ''">
+            AND (mt1.type_name LIKE CONCAT(CONCAT('%', #{keyWord}), '%')
+            OR mt.type_name LIKE CONCAT(CONCAT('%', #{keyWord}), '%'))
+        </if>
         GROUP BY
             lpd.new_type
     </select>