Commit 4c14341dec246a17fc3eabc7d7ca6bc320a3dcd2
1 parent
5ba46b21
feat: 申请列表-订单信息展示
Showing
2 changed files
with
7 additions
and
0 deletions
src/main/java/com/order/erp/domain/vo/order/OrderFieldLockApplyQueryVO.java
@@ -53,5 +53,11 @@ public class OrderFieldLockApplyQueryVO extends BasePageVO implements Serializab | @@ -53,5 +53,11 @@ public class OrderFieldLockApplyQueryVO extends BasePageVO implements Serializab | ||
53 | private List<Integer> statusList; | 53 | private List<Integer> statusList; |
54 | 54 | ||
55 | 55 | ||
56 | + /** | ||
57 | + * 申请类型:枚举类ApplyTypeEnum | ||
58 | + */ | ||
59 | + private Integer type; | ||
60 | + | ||
61 | + | ||
56 | } | 62 | } |
57 | 63 |
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
@@ -292,6 +292,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl<OrderFieldLockAp | @@ -292,6 +292,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl<OrderFieldLockAp | ||
292 | .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) | 292 | .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) |
293 | .eq(Objects.nonNull(queryVO.getApplyUserId()), OrderFieldLockApplyDO::getApplyUserId, queryVO.getApplyUserId()) | 293 | .eq(Objects.nonNull(queryVO.getApplyUserId()), OrderFieldLockApplyDO::getApplyUserId, queryVO.getApplyUserId()) |
294 | .eq(Objects.nonNull(queryVO.getStatus()), OrderFieldLockApplyDO::getStatus, queryVO.getStatus()) | 294 | .eq(Objects.nonNull(queryVO.getStatus()), OrderFieldLockApplyDO::getStatus, queryVO.getStatus()) |
295 | + .eq(Objects.nonNull(queryVO.getType()), OrderFieldLockApplyDO::getType, queryVO.getType()) | ||
295 | .in(CollectionUtils.isNotEmpty(queryVO.getStatusList()), OrderFieldLockApplyDO::getStatus, queryVO.getStatusList()); | 296 | .in(CollectionUtils.isNotEmpty(queryVO.getStatusList()), OrderFieldLockApplyDO::getStatus, queryVO.getStatusList()); |
296 | } | 297 | } |
297 | 298 |