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 a7a36c3..1b62d90 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 @@ -58,7 +58,7 @@ - select * from MES_YIELD_ORDER is_deleted = 0 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 206d16d..24fa763 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 @@ -25,6 +25,7 @@ */ package org.springblade.scheduling.scheduling.service.impl; +import org.springblade.desk.order.pojo.enums.YieldOrderEnum; import org.springblade.scheduling.scheduling.entity.YieldOrderEntity; import org.springblade.scheduling.scheduling.vo.YieldOrderVO; import org.springblade.scheduling.scheduling.excel.YieldOrderExcel; @@ -47,7 +48,11 @@ public class YieldOrderServiceImpl extends BaseServiceImpl selectYieldOrderPage(IPage page, YieldOrderVO yieldOrder) { - return page.setRecords(baseMapper.selectYieldOrderPage(page, yieldOrder)); + List list = baseMapper.selectYieldOrderPage(page, yieldOrder); + for(YieldOrderVO vo : list){ + vo.setPriorityApsStr(YieldOrderEnum.getName(vo.getPriorityAps())); + } + return page.setRecords(list); } 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 f786a51..068e3d0 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 @@ -25,6 +25,7 @@ */ package org.springblade.scheduling.scheduling.vo; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.scheduling.scheduling.entity.YieldOrderEntity; @@ -43,4 +44,9 @@ public class YieldOrderVO extends YieldOrderEntity { @Serial private static final long serialVersionUID = 1L; + /** + * 优先级-排产 + */ + private String priorityApsStr; + }