From 65c7979cea36562fd2bd8c79329615781f807e00 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 18 Nov 2024 15:56:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=A8=A1=E5=9D=97=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PurchaseCheckInfoServiceImpl.java       | 8 --------
 .../mapper/material/purchase/PurchaseCheckInfoMapper.xml | 9 +++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
index 77bbeb27..b815c4d1 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
@@ -120,7 +120,6 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
             purchaseCheckDetails = purchaseCheckDetails.stream().filter(o -> !(MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId().equals(o.getManageType()) &&
                     (o.getStatus().equals(PurchaseTaskStatusEnum.TO_BIND.getStatus()) || o.getStatus().equals(PurchaseTaskStatusEnum.TO_BIND_AFTER_REJECT.getStatus())))).collect(Collectors.toList());
             OptionalInt minStatus = purchaseCheckDetails.stream().mapToInt(PurchaseCheckDetails::getStatus).min();
-            //OptionalInt maxStatus = purchaseCheckDetails.stream().mapToInt(PurchaseCheckDetails::getStatus).max();
             if (isAllowPartTransfer) {
                 purchaseCheckDetails = purchaseCheckDetails.stream().filter(o -> purchaseQueryDto.getStatusList().contains(o.getStatus())).collect(Collectors.toList());
                 purchaseInfo.setPurchaseMaTypeName(purchaseCheckDetailsMapper.selectMaTypeNameByTaskAndStatusList(purchaseInfo.getTaskId(), purchaseQueryDto.getStatusList()));
@@ -148,13 +147,6 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
                 // 设置外层任务状态：入库待开始、入库进行中、入库已完成
                 TmTask tmTask = tmTaskMapper.selectTmTaskByTaskId(purchaseInfo.getTaskId());
                 purchaseInfo.setTaskStatus(tmTask.getTaskStatus());
-//                if (maxStatus.isPresent() && maxStatus.getAsInt() == PurchaseTaskStatusEnum.TO_NOTICE.getStatus()) {
-//                    purchaseInfo.setTaskStatus(PurchaseTaskStatusEnum.TASK_TO_START.getStatus()); // 外层任务待开始
-//                } else if (minStatus.isPresent() && minStatus.getAsInt() == PurchaseTaskStatusEnum.IN_STORE.getStatus()) {
-//                    purchaseInfo.setTaskStatus(PurchaseTaskStatusEnum.TASK_FINISHED.getStatus()); // 外层任务已完成
-//                } else {
-//                    purchaseInfo.setTaskStatus(PurchaseTaskStatusEnum.TASK_IN_PROGRESS.getStatus()); //外层任务进行中
-//                }
                 // 设置外层任务列表
                 if (isAllowPartTransfer) {
                     purchaseCheckInfoResult.add(purchaseInfo);
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
index 68ce8a16..d6d5e0c8 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
@@ -139,6 +139,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="purchaser != null "> and pci.purchaser = #{purchaser}</if>
             <if test="supplierId != null "> and pci.supplier_id = #{supplierId}</if>
             <if test="taxRate != null "> and pci.tax_rate = #{taxRate}</if>
+            <if test="keyWord != null  and keyWord != ''">
+                and (
+                t.code like concat('%', #{keyWord}, '%') or
+                msi.supplier like concat('%', #{keyWord}, '%') or
+                pci.create_by like concat('%', #{keyWord}, '%') or
+                pci.arrival_time like concat('%', #{keyWord}, '%') or
+                pci.create_time like concat('%', #{keyWord}, '%')
+                )
+            </if>
         </where>
     </select>