|
@@ -56,7 +56,13 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
|
|
wrapper.and(q -> q.like(StockWaitDetails::getQuantity, dto.getKeyword()).or().like(StockWaitDetailsVo::getBusinessCode, dto.getKeyword()));
|
|
wrapper.and(q -> q.like(StockWaitDetails::getQuantity, dto.getKeyword()).or().like(StockWaitDetailsVo::getBusinessCode, dto.getKeyword()));
|
|
}
|
|
}
|
|
wrapper.eq("sw", StockWait::getBusinessType, dto.getBusinessType());
|
|
wrapper.eq("sw", StockWait::getBusinessType, dto.getBusinessType());
|
|
- wrapper.eq("sw", StockWait::getStatus, dto.getStatus());
|
|
|
|
|
|
+
|
|
|
|
+ if (ObjectUtil.isEmpty(dto.getStatus())) {
|
|
|
|
+ wrapper.in("sw", StockWait::getStatus, 0, 1);
|
|
|
|
+ } else {
|
|
|
|
+ wrapper.eq("sw", StockWait::getStatus, dto.getStatus());
|
|
|
|
+ }
|
|
|
|
+
|
|
Page<StockWaitDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
Page<StockWaitDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
List<StockWaitDetailsVo> records = page.getRecords();
|
|
List<StockWaitDetailsVo> records = page.getRecords();
|
|
for (StockWaitDetailsVo record : records) {
|
|
for (StockWaitDetailsVo record : records) {
|