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 @@ and card_no LIKE CONCAT('%', CONCAT(#{yieldOrder.cardNo}, '%')) + + and status IN + + #{status} + + order by receive_time desc 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 selectYieldOrderPage(IPage page, YieldOrderVO yieldOrder) { + if(StringUtils.isNotEmpty(yieldOrder.getStatusStr())){ + List statusList = Func.toIntList(yieldOrder.getStatusStr()); + yieldOrder.setStatusList(statusList); + } List 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 statusList; }