From 5ceb90c34b6325aaedd1e40d7f4d4efe9a04f326 Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Thu, 5 Mar 2026 16:23:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=97=A0=E6=95=88?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/order/pojo/enums/YieldOrderEnum.java | 14 ++++++++++++++ .../order/service/impl/YieldOrderServiceImpl.java | 15 ++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldOrderEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldOrderEnum.java index 1b000fd2..ffe363c9 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldOrderEnum.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldOrderEnum.java @@ -113,4 +113,18 @@ public enum YieldOrderEnum { .orElse(null); return ObjectUtil.isEmpty(item) ? StringPool.EMPTY : item.getName(); } + + /** + * 根据值获取枚举对象 + * + * @param category + * @return BladeUserEnum + */ + public static YieldOrderEnum getEnum(int category) { + YieldOrderEnum item = Arrays.stream(YieldOrderEnum.values()) + .filter(enumItem -> enumItem.getCode() == category) + .findFirst() + .orElse(null); + return ObjectUtil.isEmpty(item) ? null : item; + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index 75d5c1da..97593db1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -86,11 +86,16 @@ public class YieldOrderServiceImpl extends BaseServiceImpl selectPageSintering(IPage page, YieldOrder entity) { List yieldTypeList = new ArrayList<>(); - yieldTypeList.add(YieldOrderEnum.YIELD_TYPE_2); - yieldTypeList.add(YieldOrderEnum.YIELD_TYPE_3); - yieldTypeList.add(YieldOrderEnum.YIELD_TYPE_4); - yieldTypeList.add(YieldOrderEnum.YIELD_TYPE_5); - yieldTypeList.add(YieldOrderEnum.YIELD_TYPE_6); + if (ObjectUtil.isEmpty(entity.getYieldType())) { + yieldTypeList.add(YieldOrderEnum.YIELD_TYPE_2); + yieldTypeList.add(YieldOrderEnum.YIELD_TYPE_3); + yieldTypeList.add(YieldOrderEnum.YIELD_TYPE_4); + yieldTypeList.add(YieldOrderEnum.YIELD_TYPE_5); + yieldTypeList.add(YieldOrderEnum.YIELD_TYPE_6); + } else { + yieldTypeList.add(YieldOrderEnum.getEnum(entity.getYieldType())); + } + List dataList = baseMapper.selectPage(page, entity, yieldTypeList); return page.setRecords(dataList); }