From a7e524d62e3cd00649e21c0efa20fbef674b83d5 Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Wed, 3 Jun 2026 10:32:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9-sjx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduling/scheduling/mapper/YieldOrderMapper.xml       | 6 ++++++
 .../scheduling/service/impl/YieldOrderServiceImpl.java      | 6 ++++++
 .../springblade/scheduling/scheduling/vo/YieldOrderVO.java  | 4 ++++
 3 files changed, 16 insertions(+)

diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml
index ff40d772c..ee73af4eb 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml
@@ -89,6 +89,12 @@
             <if test="yieldOrder.cardNo != null and yieldOrder.cardNo != ''">
                 and card_no LIKE CONCAT('%', CONCAT(#{yieldOrder.cardNo}, '%'))
             </if>
+            <if test="yieldOrder.statusList !=null">
+                and status IN
+                <foreach collection="yieldOrder.statusList" item="status" index="index" open="(" close=")" separator=",">
+                    #{status}
+                </foreach>
+            </if>
         order by receive_time desc
         </where>
     </select>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/YieldOrderServiceImpl.java
index 9f536122e..e76b9af24 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/YieldOrderServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/YieldOrderServiceImpl.java
@@ -26,8 +26,10 @@
 package org.springblade.scheduling.scheduling.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
 import org.springblade.scheduling.pojo.entity.TeamSetEntity;
 import org.springblade.scheduling.pojo.entity.YieldOrderEntity;
@@ -57,6 +59,10 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 
 	@Override
 	public IPage<YieldOrderVO> selectYieldOrderPage(IPage<YieldOrderVO> page, YieldOrderVO yieldOrder) {
+		if(StringUtils.isNotEmpty(yieldOrder.getStatusStr())){
+			List<Integer> statusList = Func.toIntList(yieldOrder.getStatusStr());
+			yieldOrder.setStatusList(statusList);
+		}
 		List<YieldOrderVO> list = baseMapper.selectYieldOrderPage(page, yieldOrder);
 		for(YieldOrderVO vo : list){
 			vo.setPriorityApsStr(YieldOrderEnum.getName(vo.getPriorityAps()));
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/YieldOrderVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/YieldOrderVO.java
index e37eb0187..c771e0708 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/YieldOrderVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/YieldOrderVO.java
@@ -30,6 +30,7 @@ import lombok.EqualsAndHashCode;
 import org.springblade.scheduling.pojo.entity.YieldOrderEntity;
 
 import java.io.Serial;
+import java.util.List;
 
 /**
  * 生产订单 视图实体类
@@ -57,4 +58,7 @@ public class YieldOrderVO extends YieldOrderEntity {
 
 	private String endTime;
 
+	private String statusStr;
+
+	private List<Integer> statusList;
 }