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); }